diff options
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rwxr-xr-x | .gitlab-ci/scons-build.sh | 4 | ||||
| -rw-r--r-- | SConstruct | 14 | ||||
| -rw-r--r-- | common.py | 1 |
4 files changed, 19 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f8c16dc0f51..a08a33f60f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -377,9 +377,9 @@ scons: extends: .scons-build variables: SCONS_TARGET: "llvm=1" - SCONS_CHECK_COMMAND: "scons llvm=1 check" + SCONS_CHECK_COMMAND: "scons llvm=1 force_scons=1 check" script: - - SCONS_TARGET="" SCONS_CHECK_COMMAND="scons check" .gitlab-ci/scons-build.sh + - SCONS_TARGET="" SCONS_CHECK_COMMAND="scons check force_scons=1" .gitlab-ci/scons-build.sh - LLVM_VERSION=6.0 .gitlab-ci/scons-build.sh - LLVM_VERSION=7 .gitlab-ci/scons-build.sh - LLVM_VERSION=8 .gitlab-ci/scons-build.sh diff --git a/.gitlab-ci/scons-build.sh b/.gitlab-ci/scons-build.sh index 30e93c2bb38..ac62b2cbeba 100755 --- a/.gitlab-ci/scons-build.sh +++ b/.gitlab-ci/scons-build.sh @@ -8,5 +8,5 @@ if test -n "$LLVM_VERSION"; then fi rm -rf build -scons $SCONS_TARGET -eval $SCONS_CHECK_COMMAND +scons $SCONS_TARGET force_scons=on +eval $SCONS_CHECK_COMMAND diff --git a/SConstruct b/SConstruct index 207794c3eb3..aeb1309d464 100644 --- a/SConstruct +++ b/SConstruct @@ -67,6 +67,20 @@ else: Help(opts.GenerateHelpText(env)) + +####################################################################### +# Print a deprecation warning for using scons on non-windows + +if common.host_platform != 'windows': + force = ARGUMENTS['force_scons'] + if force.lower() not in {'false', 'off', 'none', '0', 'n'}: + print("WARNING: Scons is deprecated for non-windows platforms (including cygwin) " + "please use meson instead.", file=sys.stderr) + else: + print("ERROR: Scons is deprecated for non-windows platforms (including cygwin) " + "please use meson instead. If you really need to use scons you " + "can add `force_scons=1` to the scons command line.", file=sys.stderr) + sys.exit(1) ####################################################################### # Environment setup diff --git a/common.py b/common.py index 51dba9c3ca0..b7762cb4e94 100644 --- a/common.py +++ b/common.py @@ -112,6 +112,7 @@ def AddOptions(opts): opts.Add(BoolOption('asan', 'enable Address Sanitizer', 'no')) opts.Add('toolchain', 'compiler toolchain', default_toolchain) opts.Add(BoolOption('llvm', 'use LLVM', default_llvm)) + opts.Add(BoolOption('force_scons', 'Force enable scons on deprecated platforms', 'false')) opts.Add(BoolOption('openmp', 'EXPERIMENTAL: compile with openmp (swrast)', 'no')) opts.Add(BoolOption('debug', 'DEPRECATED: debug build', 'yes')) |