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

configure: Remove no longer needed steam-runtime argument

Browse source
This commit is contained in:
Andrew Eikum 2020-09-17 10:13:38 -05:00
parent 87570998f1
commit 26e8db3d6f
4 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -42,7 +42,6 @@ endif
CONFIGURE_CMD := ../proton/configure.sh \ CONFIGURE_CMD := ../proton/configure.sh \
--steam-runtime64=docker:steam-proton-dev --steam-runtime32=docker:steam-proton-dev \ --steam-runtime64=docker:steam-proton-dev --steam-runtime32=docker:steam-proton-dev \
--steam-runtime="$$HOME"/proton/steamrt/ \
--build-name="$(_build_name)" --build-name="$(_build_name)"
# make doesn't handle spaces well... replace them with underscores in paths # make doesn't handle spaces well... replace them with underscores in paths

2
README.md
View file

@ -177,7 +177,7 @@ course use whatever paths you like.
mkdir build/ mkdir build/
cd build cd build
../proton/configure.sh --steam-runtime64=docker:steam-proton-dev --steam-runtime32=docker:steam-proton-dev --steam-runtime=$HOME/steam-runtime/runtime/ ../proton/configure.sh --steam-runtime64=docker:steam-proton-dev --steam-runtime32=docker:steam-proton-dev
If you are building without the Steam runtime, then instead use: If you are building without the Steam runtime, then instead use:

1
build/makefile_base.mak
View file

@ -30,7 +30,6 @@ else # (Rest of the file is the else)
# STEAMRT64_IMAGE - Name of the image if mode is set # STEAMRT64_IMAGE - Name of the image if mode is set
# STEAMRT32_MODE - Same as above for 32-bit container (can be different type) # STEAMRT32_MODE - Same as above for 32-bit container (can be different type)
# STEAMRT32_IMAGE - Same as above for 32-bit container # STEAMRT32_IMAGE - Same as above for 32-bit container
# STEAMRT_PATH - Path to built runtime which contains run.sh
ifeq ($(SRCDIR),) ifeq ($(SRCDIR),)
foo := $(error SRCDIR not set, do not include makefile_base directly, run ./configure.sh to generate Makefile) foo := $(error SRCDIR not set, do not include makefile_base directly, run ./configure.sh to generate Makefile)

20
configure.sh
View file

@ -71,7 +71,6 @@ function configure() {
local steamrt64_name="${1#*:}" local steamrt64_name="${1#*:}"
local steamrt32_type="${2%:*}" local steamrt32_type="${2%:*}"
local steamrt32_name="${2#*:}" local steamrt32_name="${2#*:}"
local steamrt_path="${3}"
check_steamrt_image "$steamrt64_type" "$steamrt64_name" check_steamrt_image "$steamrt64_type" "$steamrt64_name"
check_steamrt_image "$steamrt32_type" "$steamrt32_name" check_steamrt_image "$steamrt32_type" "$steamrt32_name"
@ -109,7 +108,6 @@ function configure() {
echo "STEAMRT64_IMAGE := $(escape_for_make "$steamrt64_name")" echo "STEAMRT64_IMAGE := $(escape_for_make "$steamrt64_name")"
echo "STEAMRT32_MODE := $(escape_for_make "$steamrt32_type")" echo "STEAMRT32_MODE := $(escape_for_make "$steamrt32_type")"
echo "STEAMRT32_IMAGE := $(escape_for_make "$steamrt32_name")" echo "STEAMRT32_IMAGE := $(escape_for_make "$steamrt32_name")"
echo "STEAMRT_PATH := $(escape_for_make "$steamrt_path")"
if [[ -n "$arg_docker_opts" ]]; then if [[ -n "$arg_docker_opts" ]]; then
echo "DOCKER_OPTS := $arg_docker_opts" echo "DOCKER_OPTS := $arg_docker_opts"
@ -130,7 +128,6 @@ function configure() {
arg_steamrt32="" arg_steamrt32=""
arg_steamrt64="" arg_steamrt64=""
arg_steamrt=""
arg_no_steamrt="" arg_no_steamrt=""
arg_ffmpeg="" arg_ffmpeg=""
arg_build_name="" arg_build_name=""
@ -182,9 +179,6 @@ function parse_args() {
elif [[ $arg = --steam-runtime64 ]]; then elif [[ $arg = --steam-runtime64 ]]; then
val_used=1 val_used=1
arg_steamrt64="$val" arg_steamrt64="$val"
elif [[ $arg = --steam-runtime ]]; then
val_used=1
arg_steamrt="$val"
elif [[ $arg = --no-steam-runtime ]]; then elif [[ $arg = --no-steam-runtime ]]; then
arg_no_steamrt=1 arg_no_steamrt=1
else else
@ -221,7 +215,7 @@ function parse_args() {
} }
usage() { usage() {
"$1" "Usage: $0 { --no-steam-runtime | --steam-runtime32=<image> --steam-runtime64=<image> --steam-runtime=<path> }" "$1" "Usage: $0 { --no-steam-runtime | --steam-runtime32=<image> --steam-runtime64=<image> }"
"$1" " Generate a Makefile for building Proton. May be run from another directory to create" "$1" " Generate a Makefile for building Proton. May be run from another directory to create"
"$1" " out-of-tree build directories (e.g. mkdir mybuild && cd mybuild && ../configure.sh)" "$1" " out-of-tree build directories (e.g. mkdir mybuild && cd mybuild && ../configure.sh)"
"$1" "" "$1" ""
@ -246,10 +240,6 @@ usage() {
"$1" " --steam-runtime32=docker:<image> The 32-bit docker image to use for steps that require" "$1" " --steam-runtime32=docker:<image> The 32-bit docker image to use for steps that require"
"$1" " a 32-bit environment. See --steam-runtime64." "$1" " a 32-bit environment. See --steam-runtime64."
"$1" "" "$1" ""
"$1" " --steam-runtime=<path> Path to the runtime built for the host (i.e. the output"
"$1" " directory given to steam-runtime/build-runtime.py). Should"
"$1" " contain run.sh."
"$1" ""
"$1" " --no-steam-runtime Do not automatically invoke any runtime SDK as part of the build." "$1" " --no-steam-runtime Do not automatically invoke any runtime SDK as part of the build."
"$1" " Build steps may still be manually run in a runtime environment." "$1" " Build steps may still be manually run in a runtime environment."
exit 1; exit 1;
@ -260,10 +250,10 @@ parse_args "$@" || usage err
[[ -z $arg_help ]] || usage info [[ -z $arg_help ]] || usage info
# Sanity check arguments # Sanity check arguments
if [[ -n $arg_no_steamrt && (-n $arg_steamrt32 || -n $arg_steamrt64 || -n $arg_steamrt) ]]; then if [[ -n $arg_no_steamrt && ( -n $arg_steamrt32 || -n $arg_steamrt64 ) ]]; then
die "Cannot specify a Steam Runtime SDK as well as --no-steam-runtime" die "Cannot specify a Steam Runtime SDK as well as --no-steam-runtime"
elif [[ -z $arg_no_steamrt && ( -z $arg_steamrt32 || -z $arg_steamrt64 || -z $arg_steamrt ) ]]; then elif [[ -z $arg_no_steamrt && ( -z $arg_steamrt32 || -z $arg_steamrt64 ) ]]; then
die "Must specify either --no-steam-runtime or all of --steam-runtime32, --steam-runtime64, and --steam-runtime" die "Must specify either --no-steam-runtime or all of --steam-runtime32 and --steam-runtime64"
fi fi
configure "$arg_steamrt64" "$arg_steamrt32" "$arg_steamrt" configure "$arg_steamrt64" "$arg_steamrt32"