luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #968 from Kazzz-S/qt6-mac 

Updated the build system for Mac.
This commit is contained in:
Matthias Köfferlein 2022-01-17 23:50:57 +01:00 committed by GitHub
parent 4820207cd3 709466bd54
commit cdd2042da4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
macbuild/build4mac.py
View File

@ -147,29 +147,36 @@ def Get_Default_Config():
Usage, ModuleSet = GenerateUsage(Platform) Usage, ModuleSet = GenerateUsage(Platform)
# Set the default modules # Set the default modules
ModuleQt = "Qt5MacPorts"
if Platform == "Monterey": if Platform == "Monterey":
ModuleQt = "Qt6Brew"
ModuleRuby = "RubyMonterey" ModuleRuby = "RubyMonterey"
ModulePython = "PythonMonterey" ModulePython = "PythonMonterey"
elif Platform == "BigSur": elif Platform == "BigSur":
ModuleQt = "Qt6Brew"
ModuleRuby = "RubyBigSur" ModuleRuby = "RubyBigSur"
ModulePython = "PythonBigSur" ModulePython = "PythonBigSur"
elif Platform == "Catalina": elif Platform == "Catalina":
ModuleQt = "Qt6Brew"
ModuleRuby = "RubyCatalina" ModuleRuby = "RubyCatalina"
ModulePython = "PythonCatalina" ModulePython = "PythonCatalina"
elif Platform == "Mojave": elif Platform == "Mojave":
ModuleQt = "Qt6Brew"
ModuleRuby = "RubyMojave" ModuleRuby = "RubyMojave"
ModulePython = "PythonMojave" ModulePython = "PythonMojave"
elif Platform == "HighSierra": elif Platform == "HighSierra":
ModuleQt = "Qt6Brew"
ModuleRuby = "RubyHighSierra" ModuleRuby = "RubyHighSierra"
ModulePython = "PythonHighSierra" ModulePython = "PythonHighSierra"
elif Platform == "Sierra": elif Platform == "Sierra":
ModuleQt = "Qt6Brew"
ModuleRuby = "RubySierra" ModuleRuby = "RubySierra"
ModulePython = "PythonSierra" ModulePython = "PythonSierra"
elif Platform == "ElCapitan": elif Platform == "ElCapitan":
ModuleQt = "Qt6Brew"
ModuleRuby = "RubyElCapitan" ModuleRuby = "RubyElCapitan"
ModulePython = "PythonElCapitan" ModulePython = "PythonElCapitan"
else: else:
ModuleQt = "Qt6Brew"
ModuleRuby = "nil" ModuleRuby = "nil"
ModulePython = "nil" ModulePython = "nil"
@ -243,7 +250,6 @@ def Parse_CLI_Args(config):
PackagePrefix = config['PackagePrefix'] PackagePrefix = config['PackagePrefix']
DeployVerbose = config['DeployVerbose'] DeployVerbose = config['DeployVerbose']
ModuleSet = config['ModuleSet'] ModuleSet = config['ModuleSet']
qt, ruby, python = ModuleSet
#----------------------------------------------------- #-----------------------------------------------------
# [2] Parse the CLI arguments # [2] Parse the CLI arguments
@ -311,7 +317,21 @@ def Parse_CLI_Args(config):
default=False, default=False,
help='check usage' ) help='check usage' )
p.set_defaults( type_qt = "%s" % qt, if Platform.upper() in [ "MONTEREY", "BIGSUR" ]: # with Xcode [13.1 .. ]
p.set_defaults( type_qt = "qt6brew",
type_ruby = "hb27",
type_python = "hb38",
no_qt_binding = False,
no_qt_uitools = False,
make_option = "--jobs=4",
debug_build = False,
check_command = False,
deploy_full = False,
deploy_partial = False,
deploy_verbose = "1",
checkusage = False )
else: # with Xcode [ .. 12.4]
p.set_defaults( type_qt = "qt6brew",
type_ruby = "sys", type_ruby = "sys",
type_python = "sys", type_python = "sys",
no_qt_binding = False, no_qt_binding = False,
@ -578,7 +598,7 @@ def Get_Build_Parameters(config):
mode = "release" mode = "release"
# (B) Modules # (B) Modules
(qt, ruby, python) = ModuleSet # ( 'qt6MP', 'Sys', 'Sys' ) (qt, ruby, python) = ModuleSet # ( 'qt6Brew', 'Sys', 'Sys' )
ruby_python = "R%sP%s" % ( ruby.lower(), python.lower() ) ruby_python = "R%sP%s" % ( ruby.lower(), python.lower() )
# (C) Target directories and files # (C) Target directories and files