suyu/Yucom
25
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: Get rid of runtime selection options.

Browse source 
Those were first added when we were working on using the new
pressure-vessel based runtime but have basically no use during current
development.
This commit is contained in:
Arkadiusz Hiler 2023-01-12 14:51:57 +02:00
parent 10a240c341
commit bc63dbbf2a
3 changed files with 1 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile.in
View file

@ -41,7 +41,6 @@ else # (Rest of the file is the else)
# SRCDIR - Path to source # SRCDIR - Path to source
# BUILD_NAME - Name of the build for manifests etc. # BUILD_NAME - Name of the build for manifests etc.
# STEAMRT_IMAGE - Name of the docker image to use for building # STEAMRT_IMAGE - Name of the docker image to use for building
# STEAMRT_NAME - Name of the steam runtime to build against (scout / soldier)
ifeq ($(SRCDIR),) ifeq ($(SRCDIR),)
foo := $(error SRCDIR not set, do not include Makefile.in directly, run ./configure.sh to generate Makefile) foo := $(error SRCDIR not set, do not include Makefile.in directly, run ./configure.sh to generate Makefile)
@ -82,12 +81,7 @@ DOCKER_BASE = $(CONTAINER_ENGINE) run --rm -v $(SRC):$(SRC)$(CONTAINER_MOUNT_OPT
-w $(OBJ) -e MAKEFLAGS \ -w $(OBJ) -e MAKEFLAGS \
$(DOCKER_OPTS) $(STEAMRT_IMAGE) $(DOCKER_OPTS) $(STEAMRT_IMAGE)
STEAMRT_NAME ?= soldier
ifeq ($(STEAMRT_NAME),soldier)
TOOLMANIFEST_VDF_SRC := toolmanifest_runtime.vdf TOOLMANIFEST_VDF_SRC := toolmanifest_runtime.vdf
else
TOOLMANIFEST_VDF_SRC := toolmanifest_noruntime.vdf
endif
ifneq ($(STEAMRT_IMAGE),) ifneq ($(STEAMRT_IMAGE),)
CONTAINER_SHELL := $(DOCKER_BASE) /bin/bash CONTAINER_SHELL := $(DOCKER_BASE) /bin/bash

18
configure.sh
View file

@ -95,7 +95,6 @@ function escape_for_make() {
function configure() { function configure() {
local steamrt_image="$1" local steamrt_image="$1"
local steamrt_name="$2"
local srcdir local srcdir
srcdir="$(dirname "$0")" srcdir="$(dirname "$0")"
@ -153,7 +152,6 @@ function configure() {
echo "BUILD_NAME := $(escape_for_make "$build_name")" echo "BUILD_NAME := $(escape_for_make "$build_name")"
# SteamRT # SteamRT
echo "STEAMRT_NAME := $(escape_for_make "$steamrt_name")"
echo "STEAMRT_IMAGE := $(escape_for_make "$steamrt_image")" echo "STEAMRT_IMAGE := $(escape_for_make "$steamrt_image")"
echo "ROOTLESS_CONTAINER := $ROOTLESS_CONTAINER" echo "ROOTLESS_CONTAINER := $ROOTLESS_CONTAINER"
@ -181,9 +179,7 @@ function configure() {
# Parse arguments # Parse arguments
# #
arg_steamrt="soldier"
arg_protonsdk_image="registry.gitlab.steamos.cloud/proton/soldier/sdk:0.20220601.0-4" arg_protonsdk_image="registry.gitlab.steamos.cloud/proton/soldier/sdk:0.20220601.0-4"
arg_no_protonsdk=""
arg_build_name="" arg_build_name=""
arg_container_engine="" arg_container_engine=""
arg_docker_opts="" arg_docker_opts=""
@ -238,11 +234,6 @@ function parse_args() {
elif [[ $arg = --proton-sdk-image ]]; then elif [[ $arg = --proton-sdk-image ]]; then
val_used=1 val_used=1
arg_protonsdk_image="$val" arg_protonsdk_image="$val"
elif [[ $arg = --steam-runtime ]]; then
val_used=1
arg_steamrt="$val"
elif [[ $arg = --no-proton-sdk ]]; then
arg_no_protonsdk=1
else else
err "Unrecognized option $arg" err "Unrecognized option $arg"
return 1 return 1
@ -313,11 +304,4 @@ usage() {
parse_args "$@" || usage err parse_args "$@" || usage err
[[ -z $arg_help ]] || usage info [[ -z $arg_help ]] || usage info
# Sanity check arguments configure "$arg_protonsdk_image"
if [[ -n $arg_no_protonsdk && -n $arg_protonsdk_image ]]; then
die "Cannot specify --proton-sdk-image as well as --no-proton-sdk"
elif [[ -z $arg_no_protonsdk && -z $arg_protonsdk_image ]]; then
die "Must specify either --no-proton-sdk or --proton-sdk-image"
fi
configure "$arg_protonsdk_image" "$arg_steamrt"

5
toolmanifest_noruntime.vdf
View file

@ -1,5 +0,0 @@
"manifest"
{
"version" "2"
"commandline" "/proton %verb%"
}