From a50f4de8d5116f032609d97a986801888b1008f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Fri, 1 Jun 2018 23:14:31 +0300 Subject: Enable 32 bit windows build Task-number: PYSIDE-646 Change-Id: I783f4e91d37aeb0200f4546b49abdfe80a09afbf Reviewed-by: Qt CI Bot Reviewed-by: Cristian Maureira-Fredes Reviewed-by: Alexandru Croitor --- coin_build_instructions.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'coin_build_instructions.py') diff --git a/coin_build_instructions.py b/coin_build_instructions.py index 91a900518..f9f8d4d17 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -98,9 +98,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 ["MSVC2015"]: + if CI_RELEASE_CONF: cmd += ["bdist_wheel", "--standalone"] else: cmd += ["build"] @@ -127,8 +125,10 @@ def run_build_instructions(): 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") + # 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. BUT, 32 bit build is done only on msvc 2015... + if CI_COMPILER in ["MSVC2015"] and CI_TARGET_ARCH in ["X86_64"]: + print("Disabled " + CI_HOST_OS_VER + " from Coin configuration") exit() # Uses default python, hopefully we have python2 installed on all hosts -- cgit v1.2.3