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 From 33943b54e9470dc8830e94270e6521524acb2954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Fri, 1 Jun 2018 23:48:46 +0300 Subject: Refactor accepted CI configurations Change-Id: I7baa695fe4100e15b108e4eb7df15c6af7db2cbe Reviewed-by: Alexandru Croitor --- coin_build_instructions.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'coin_build_instructions.py') diff --git a/coin_build_instructions.py b/coin_build_instructions.py index f9f8d4d17..82841a320 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 @@ -121,14 +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() - # 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") + 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 -- cgit v1.2.3 From a861552bdaddd384749aca3359b9f9da61735a29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Thu, 7 Jun 2018 13:23:39 +0300 Subject: Skip building on Windows for Python2 Change-Id: Ie6970361748f5b7dab52a401f6e3cf7995015ee7 Reviewed-by: Alexandru Croitor --- coin_build_instructions.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'coin_build_instructions.py') diff --git a/coin_build_instructions.py b/coin_build_instructions.py index c48f5e3b2..df70d52ee 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -132,7 +132,9 @@ def run_build_instructions(): exit() # Uses default python, hopefully we have python2 installed on all hosts - call_setup("") + # Skip building using Python 2 on Windows, because of different MSVC C runtimes (VS2008 vs VS2015+) + if CI_HOST_OS != "Windows": + call_setup("") # In case of packaging build, we have to build also python3 wheel if CI_RELEASE_CONF and CI_HOST_OS_VER not in ["RHEL_6_6"]: -- cgit v1.2.3 From 87942459a27465439eb85d083545bfe0fddf2ff4 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 21 Jun 2018 21:09:25 +0200 Subject: Don't package OpenSSL libraries on Windows Coin builds This is due to http://doc.qt.io/qt-5/ssl.html#import-and-export-restrictions A user may still pass --openssl option if they wish to package the libraries for their own local build. Task-number: PYSIDE-715 Change-Id: Iadade188ffa13decf03bc21b016718176f6ead6e Reviewed-by: Friedemann Kleint Reviewed-by: Alex Blasche Reviewed-by: Cristian Maureira-Fredes --- coin_build_instructions.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'coin_build_instructions.py') diff --git a/coin_build_instructions.py b/coin_build_instructions.py index 65e198be4..c9d59a0a6 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -107,8 +107,7 @@ def call_setup(python_ver): cmd += ["--qmake=" + CI_ENV_INSTALL_DIR + "/bin/qmake"] elif CI_HOST_OS == "Windows": - cmd += ["--qmake=" + CI_ENV_INSTALL_DIR + "\\bin\\qmake.exe", - "--openssl=C:\\openssl\\bin"] + cmd += ["--qmake=" + CI_ENV_INSTALL_DIR + "\\bin\\qmake.exe"] else: cmd += ["--qmake=" + CI_ENV_INSTALL_DIR + "/bin/qmake"] cmd += ["--build-tests", -- cgit v1.2.3 From f3b87fead2d4cb2a790f0709080551e252d5a46c Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 21 Jun 2018 21:36:20 +0200 Subject: Associate Coin snapshot builds with Coin integration IDs This change adds a new setup.py option called --package-timestamp which allows setting the "dev" part of the version number of a snapshot package. It also modifies coin_build_instructions.py to set the package timestamp to the value of the Coin integration ID. This has a couple of benefits: 1) We can look up the build and test logs of a specific package on testresults.qt.io. This can also be looked up for non-snapshot builds, the "timestamp = Coin integration ID" can also be found in the generated __init__.py file. 2) All the different platform packages within one integration will have the same timestamp, which allows pinning snapshot packages inside a pipenv Pipfile. 3) It's easier to figure out which packages were built as part of the same Coin integration. Task-number: PYSIDE-680 Change-Id: Idb2f2d2313cee213a5d742f88b60315a4e505250 Reviewed-by: Qt CI Bot Reviewed-by: Friedemann Kleint Reviewed-by: Cristian Maureira-Fredes --- coin_build_instructions.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'coin_build_instructions.py') diff --git a/coin_build_instructions.py b/coin_build_instructions.py index c9d59a0a6..aee0bf265 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -55,6 +55,7 @@ CI_HOST_OS_VER = option_value("osVer") CI_ENV_INSTALL_DIR = option_value("instdir") CI_ENV_AGENT_DIR = option_value("agentdir") CI_COMPILER = option_value("compiler") +CI_INTEGRATION_ID = option_value("coinIntegrationId") CI_FEATURES = [] _ci_features = option_value("features") if _ci_features is not None: @@ -118,6 +119,8 @@ def call_setup(python_ver): if is_snapshot_build(): cmd += ["--snapshot-build"] + cmd += ["--package-timestamp=" + CI_INTEGRATION_ID] + run_instruction(cmd, "Failed to run setup.py") def run_build_instructions(): -- cgit v1.2.3