diff options
Diffstat (limited to 'coin_build_instructions.py')
| -rw-r--r-- | coin_build_instructions.py | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py index df70d52ee..65e198be4 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -43,6 +43,7 @@ from build_scripts.utils import get_qtci_virtualEnv from build_scripts.utils import run_instruction from build_scripts.utils import rmtree from build_scripts.utils import get_python_dict +from build_scripts.utils import acceptCITestConfiguration import os # Values must match COIN thrift @@ -98,9 +99,7 @@ def call_setup(python_ver): run_instruction(["virtualenv", "-p", _pExe, _env], "Failed to create virtualenv") install_pip_dependencies(env_pip, ["six", "wheel"]) cmd = [env_python, "setup.py"] - # With 5.11 CI will create two sets of release binaries, one with msvc 2015 and one with msvc 2017 - # we shouldn't release the 2015 version. - if CI_RELEASE_CONF and CI_COMPILER not in ["MSVC2017"]: + if CI_RELEASE_CONF: cmd += ["bdist_wheel", "--standalone"] else: cmd += ["build"] @@ -123,12 +122,7 @@ def call_setup(python_ver): run_instruction(cmd, "Failed to run setup.py") def run_build_instructions(): - # Disable unsupported configs for now - if CI_HOST_OS_VER in ["WinRT_10"]: - print("Disabled " + CI_HOST_OS_VER + " from Coin configuration") - exit() - if CI_HOST_ARCH == "X86_64" and CI_TARGET_ARCH == "X86": - print("Disabled 32 bit build on 64 bit from Coin configuration, until toolchains provisioned") + if not acceptCITestConfiguration(CI_HOST_OS, CI_HOST_OS_VER, CI_TARGET_ARCH, CI_COMPILER): exit() # Uses default python, hopefully we have python2 installed on all hosts |