From 11322d4aba41aef022d7242057340b159cccaf53 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 22 Aug 2019 17:56:24 +0200 Subject: Fix Xcode sdk value embedded into PySide2 binaries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously when building on the Coin VMs, the incorrect Xcode sdk value of "10.0" was embedded into all the built shiboken and PySide2 binaries. This causes issues when trying to notarize a PySide2 app. The reason why this happens is described as a long investigation on the respective bug report. The fix is to ask xcrun to report an SDK path which contains the version number in the SDK path (/path/to/MacOSX10.14.sdk vs just /path/to/MacOSX.sdk). Change-Id: I3f02510953e2f54032c19a48cb8a7162814bf9e7 Fixes: PYSIDE-1066 Reviewed-by: Qt CI Bot Reviewed-by: Simo Fält --- build_scripts/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build_scripts') diff --git a/build_scripts/main.py b/build_scripts/main.py index 4d9f95b14..05e9b0f72 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -1056,7 +1056,7 @@ class PysideBuild(_build): OPTION_MACOS_SYSROOT)) else: latest_sdk_path = run_process_output(['xcrun', - '--show-sdk-path']) + '--sdk', 'macosx', '--show-sdk-path']) if latest_sdk_path: latest_sdk_path = latest_sdk_path[0] cmake_cmd.append("-DCMAKE_OSX_SYSROOT={}".format( -- cgit v1.2.3 From ffecd65abe4519bcaad29e0c59dc9a8353f6f68d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Mon, 19 Aug 2019 12:53:22 +0300 Subject: Add Proprietary License to be show in metadata Adding Proprietary License to METADATA to indicate possibility for commercial licencing. License will be shown in pypi.org with LGPL possibility. Change-Id: Ic389adc2a867b9ea1118574fdf627e78acb02ba2 Reviewed-by: Friedemann Kleint Reviewed-by: Cristian Maureira-Fredes --- build_scripts/config.py | 1 + 1 file changed, 1 insertion(+) (limited to 'build_scripts') diff --git a/build_scripts/config.py b/build_scripts/config.py index cad4e2f57..25036a65f 100644 --- a/build_scripts/config.py +++ b/build_scripts/config.py @@ -174,6 +174,7 @@ class Config(object): 'Environment :: Win32 (MS Windows)', 'Intended Audience :: Developers', 'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)', + 'License :: Other/Proprietary License', 'Operating System :: MacOS :: MacOS X', 'Operating System :: POSIX', 'Operating System :: POSIX :: Linux', -- cgit v1.2.3