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

Merge pull request #1912 from Kazzz-S/0.29.8-mac1 

Minor update of the macOS build system to suppress some deprecation warnings
This commit is contained in:
Matthias Köfferlein 2024-10-28 18:37:51 +01:00 committed by GitHub
parent 10bf40085b f00ede729d
commit 63dd591e51
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
macbuild/build4mac_util.py
View File

@ -499,7 +499,7 @@ def GetKLayoutVersionFrom( verfile='version.h' ):
except Exception as e:
return version
verReg = re.compile( u'(KLAYOUT_VERSION=\")([0-9A-Z_a-z\.]+)(\")' )
verReg = re.compile( r'(KLAYOUT_VERSION=\")([0-9A-Z_a-z\.]+)(\")' )
for line in contents:
m = verReg.match(line)
if m:

6
macbuild/makeDMG4mac.py
View File

@ -279,7 +279,7 @@ def CheckPkgDirectory():
# * LW-qt6MP.pkg.macos-Sonoma-release-Rmp33Pmp312
#-----------------------------------------------------------------------------------------------
# 0 1 2 3 4 5 6 7
patQRP = u'(ST|LW|HW|EX)([-])([qt5|qt6][0-9A-Za-z]+)([.]pkg[.])([A-Za-z]+[-][A-Za-z]+[-])(release|debug)([-])([0-9A-Za-z]+)'
patQRP = r'(ST|LW|HW|EX)([-])([qt5|qt6][0-9A-Za-z]+)([.]pkg[.])([A-Za-z]+[-][A-Za-z]+[-])(release|debug)([-])([0-9A-Za-z]+)'
regQRP = re.compile(patQRP)
if not regQRP.match(PkgDir):
print( "! Cannot identify (Qt, Ruby, Python) from the package directory name" )
@ -721,7 +721,9 @@ def MakeTargetDMGFile(msg=""):
# The folder will open on mount.
#--------------------------------------------------------
print( ">>> (10) Setting volume bootability and startup disk options..." )
command = "bless --folder %s --openfolder %s" % (MountDir, MountDir)
#command = "bless --folder %s --openfolder %s" % (MountDir, MountDir)
#bless: The 'openfolder' option is deprecated
command = "bless --folder %s" % MountDir
os.system(command)
sleep(2)