Merge branch 'issue5699-unified-installers' into v1.8.6
This commit is contained in:
commit
265cc5c687
|
@ -41,7 +41,7 @@ class Toolchain:
|
|||
cmd_opt_dict = {
|
||||
'about' : ['', []],
|
||||
'setup' : ['g:', ['generator=']],
|
||||
'configure' : ['g:dr', ['generator=', 'debug', 'release', 'mac-sdk=', 'mac-identity=']],
|
||||
'configure' : ['g:dr', ['generator=', 'debug', 'release', 'mac-sdk=', 'mac-deploy=', 'mac-identity=']],
|
||||
'build' : ['dr', ['debug', 'release']],
|
||||
'clean' : ['dr', ['debug', 'release']],
|
||||
'update' : ['', []],
|
||||
|
@ -244,6 +244,9 @@ class InternalCommands:
|
|||
# by default, unknown
|
||||
macSdk = None
|
||||
|
||||
# by default, unknown
|
||||
macDeploy = None
|
||||
|
||||
# by default, unknown
|
||||
macIdentity = None
|
||||
|
||||
|
@ -374,6 +377,11 @@ class InternalCommands:
|
|||
elif config.has_option("hm", "macSdk"):
|
||||
self.macSdk = config.get('hm', 'macSdk')
|
||||
|
||||
if self.macDeploy:
|
||||
config.set('hm', 'macDeploy', self.macDeploy)
|
||||
elif config.has_option("hm", "macDeploy"):
|
||||
self.macSdk = config.get('hm', 'macDeploy')
|
||||
|
||||
if self.macIdentity:
|
||||
config.set('hm', 'macIdentity', self.macIdentity)
|
||||
elif config.has_option("hm", "macIdentity"):
|
||||
|
@ -384,6 +392,9 @@ class InternalCommands:
|
|||
if not self.macSdk:
|
||||
raise Exception("Arg missing: --mac-sdk <version>");
|
||||
|
||||
if not self.macDeploy:
|
||||
self.macDeploy = self.macSdk
|
||||
|
||||
if not self.macIdentity:
|
||||
raise Exception("Arg missing: --mac-identity <name>");
|
||||
|
||||
|
@ -438,7 +449,7 @@ class InternalCommands:
|
|||
if generator.cmakeName.find('Unix Makefiles') == -1:
|
||||
sdkDir = self.getMacSdkDir()
|
||||
cmake_args += " -DCMAKE_OSX_SYSROOT=" + sdkDir
|
||||
cmake_args += " -DCMAKE_OSX_DEPLOYMENT_TARGET=" + self.macSdk
|
||||
cmake_args += " -DCMAKE_OSX_DEPLOYMENT_TARGET=" + self.macDeploy
|
||||
|
||||
cmake_args += " -DOSX_TARGET_MAJOR=" + macSdkMatch.group(1)
|
||||
cmake_args += " -DOSX_TARGET_MINOR=" + macSdkMatch.group(2)
|
||||
|
@ -499,7 +510,7 @@ class InternalCommands:
|
|||
shortForm = "macosx" + self.macSdk
|
||||
version = str(major) + "." + str(minor)
|
||||
|
||||
qmake_cmd_string += " QMAKE_MACOSX_DEPLOYMENT_TARGET=" + version
|
||||
qmake_cmd_string += " QMAKE_MACOSX_DEPLOYMENT_TARGET=" + self.macDeploy
|
||||
|
||||
(qMajor, qMinor, qRev) = self.getQmakeVersion()
|
||||
if qMajor <= 4:
|
||||
|
@ -657,6 +668,9 @@ class InternalCommands:
|
|||
if config.has_option("hm", "macSdk"):
|
||||
self.macSdk = config.get("hm", "macSdk")
|
||||
|
||||
if config.has_option("hm", "macDeploy"):
|
||||
self.macDeploy = config.get("hm", "macDeploy")
|
||||
|
||||
if config.has_option("hm", "macIdentity"):
|
||||
self.macIdentity = config.get("hm", "macIdentity")
|
||||
|
||||
|
@ -1843,7 +1857,10 @@ class InternalCommands:
|
|||
# version is major and minor with no dots (e.g. 106)
|
||||
version = str(major) + str(minor)
|
||||
|
||||
return "MacOSX%s-%s" % (version, arch)
|
||||
if (self.macDeploy == self.macSdk):
|
||||
return "MacOSX%s-%s" % (version, arch)
|
||||
else:
|
||||
return "MacOSX-%s" % arch
|
||||
|
||||
def reset(self):
|
||||
if os.path.exists('build'):
|
||||
|
@ -1898,6 +1915,8 @@ class CommandHandler:
|
|||
self.qtDir = a
|
||||
elif o == '--mac-sdk':
|
||||
self.ic.macSdk = a
|
||||
elif o == '--mac-deploy':
|
||||
self.ic.macDeploy = a
|
||||
elif o == '--mac-identity':
|
||||
self.ic.macIdentity = a
|
||||
|
||||
|
|
Loading…
Reference in New Issue