Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2024-12-27 07:05:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

configure: Rename --steam-runtime-image to --proton-sdk-image.

Browse Source
This commit is contained in:
Rémi Bernon 2021-04-19 15:32:32 +02:00
parent ecca62efa8
commit 9d5b7eb0cc
No known key found for this signature in database
GPG Key ID: 38D0E5827B54E5C9
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -43,7 +43,7 @@ endif
protonsdk_version := 0.20210126.1-1 protonsdk_version := 0.20210126.1-1
CONFIGURE_CMD := ../proton/configure.sh \ CONFIGURE_CMD := ../proton/configure.sh \
--steam-runtime-image=registry.gitlab.steamos.cloud/proton/soldier/sdk:$(protonsdk_version) \ --proton-sdk-image=registry.gitlab.steamos.cloud/proton/soldier/sdk:$(protonsdk_version) \
--build-name="$(_build_name)" --build-name="$(_build_name)"

2
README.md
View File

@ -177,7 +177,7 @@ protonsdk_version value to use):
mkdir build/ mkdir build/
cd build cd build
../proton/configure.sh --steam-runtime-image=registry.gitlab.steamos.cloud/proton/soldier/sdk:$(protonsdk_version) ../proton/configure.sh --proton-sdk-image=registry.gitlab.steamos.cloud/proton/soldier/sdk:$(protonsdk_version)
Or, if you are building without the Steam runtime, then instead use: Or, if you are building without the Steam runtime, then instead use:

20
configure.sh
View File

@ -97,7 +97,7 @@ function configure() {
# #
arg_steamrt="soldier" arg_steamrt="soldier"
arg_steamrt_image="" arg_protonsdk_image=""
arg_no_steamrt="" arg_no_steamrt=""
arg_build_name="" arg_build_name=""
arg_docker_opts="" arg_docker_opts=""
@ -140,9 +140,9 @@ function parse_args() {
elif [[ $arg = --docker-opts ]]; then elif [[ $arg = --docker-opts ]]; then
arg_docker_opts="$val" arg_docker_opts="$val"
val_used=1 val_used=1
elif [[ $arg = --steam-runtime-image ]]; then elif [[ $arg = --proton-sdk-image ]]; then
val_used=1 val_used=1
arg_steamrt_image="$val" arg_protonsdk_image="$val"
elif [[ $arg = --steam-runtime ]]; then elif [[ $arg = --steam-runtime ]]; then
val_used=1 val_used=1
arg_steamrt="$val" arg_steamrt="$val"
@ -182,7 +182,7 @@ function parse_args() {
} }
usage() { usage() {
"$1" "Usage: $0 { --no-steam-runtime | --steam-runtime-image=<image> --steam-runtime=<name> }" "$1" "Usage: $0 { --no-steam-runtime | --proton-sdk-image=<image> --steam-runtime=<name> }"
"$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" ""
@ -197,7 +197,7 @@ usage() {
"$1" " Proton builds that are to be installed & run under the steam client must be built with" "$1" " Proton builds that are to be installed & run under the steam client must be built with"
"$1" " the Steam Runtime SDK to ensure compatibility. See README.md for more information." "$1" " the Steam Runtime SDK to ensure compatibility. See README.md for more information."
"$1" "" "$1" ""
"$1" " --steam-runtime-image=<image> Automatically invoke the Steam Runtime SDK in <image>" "$1" " --proton-sdk-image=<image> Automatically invoke the Steam Runtime SDK in <image>"
"$1" " for build steps that must be run in an SDK" "$1" " for build steps that must be run in an SDK"
"$1" " environment. See README.md for instructions to" "$1" " environment. See README.md for instructions to"
"$1" " create this image." "$1" " create this image."
@ -213,10 +213,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_steamrt_image ]]; then if [[ -n $arg_no_steamrt && -n $arg_protonsdk_image ]]; then
die "Cannot specify --steam-runtime-image as well as --no-steam-runtime" die "Cannot specify --proton-sdk-image as well as --no-steam-runtime"
elif [[ -z $arg_no_steamrt && -z $arg_steamrt_image ]]; then elif [[ -z $arg_no_steamrt && -z $arg_protonsdk_image ]]; then
die "Must specify either --no-steam-runtime or --steam-runtime-image" die "Must specify either --no-steam-runtime or --proton-sdk-image"
fi fi
configure "$arg_steamrt_image" "$arg_steamrt" configure "$arg_protonsdk_image" "$arg_steamrt"