Skip to content

Commit

Permalink
Merge pull request #1912 from Kazzz-S/0.29.8-mac1
Browse files Browse the repository at this point in the history
Minor update of the macOS build system to suppress some deprecation warnings
  • Loading branch information
klayoutmatthias authored Oct 28, 2024
2 parents 10bf400 + f00ede7 commit 63dd591
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion macbuild/build4mac_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 4 additions & 2 deletions macbuild/makeDMG4mac.py
Original file line number Diff line number Diff line change
Expand Up @@ -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" )
Expand Down Expand Up @@ -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)

Expand Down

0 comments on commit 63dd591

Please sign in to comment.