Update of the macOS development environment for Big Sur (#711)

* In the MacPorts environment, Ruby 2.7 is used.

* Updated the build tools for Mac supporting Qt-5.15.2 from MacPorts.

* Updated the Ruby environment for BigSur and Catalina.

* To update the Mac DMG maker to support Big Sur.

* Updated the resource files for Mac DMGs.
This commit is contained in:
Kazunari Sekigawa 2021-01-27 20:43:48 +09:00 committed by Matthias Koefferlein
parent 1ba4394c2a
commit a9c47b460f
8 changed files with 7 additions and 6 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 205 KiB

After

Width:  |  Height:  |  Size: 214 KiB

View File

@ -121,7 +121,7 @@ CatalinaSDK = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.p
RubyCatalina = { 'exe': '/System/Library/Frameworks/Ruby.framework/Versions/2.6/usr/bin/ruby',
'inc': '%s/System/Library/Frameworks/Ruby.framework/Headers' % CatalinaSDK,
'inc2': '%s/System/Library/Frameworks/Ruby.framework/Headers/ruby' % CatalinaSDK,
'lib': '/System/Library/Frameworks/Ruby.framework/Versions/2.6/usr/lib/libruby.dylib'
'lib': '%s/System/Library/Frameworks/Ruby.framework/Versions/2.6/usr/lib/libruby.tbd' % CatalinaSDK
}
# Bundled with Big Sur (11.0)
@ -131,7 +131,7 @@ BigSurSDK = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.p
RubyBigSur = { 'exe': '/System/Library/Frameworks/Ruby.framework/Versions/2.6/usr/bin/ruby',
'inc': '%s/System/Library/Frameworks/Ruby.framework/Headers' % BigSurSDK,
'inc2': '%s/System/Library/Frameworks/Ruby.framework/Headers/ruby' % BigSurSDK,
'lib': '/System/Library/Frameworks/Ruby.framework/Versions/2.6/usr/lib/libruby.dylib'
'lib': '%s/System/Library/Frameworks/Ruby.framework/Versions/2.6/usr/lib/libruby.tbd' % BigSurSDK
}
# Ruby 2.7 from MacPorts (https://www.macports.org/) *+*+*+ EXPERIMENTAL *+*+*+

View File

@ -108,6 +108,7 @@ def SetGlobals():
if release == 20:
GenOSName = "macOS"
Platform = "BigSur"
LatestOS = Platform
elif release == 19:
GenOSName = "macOS"
Platform = "Catalina"

View File

@ -37,8 +37,8 @@ def Get_Build_Options( targetDic ):
buildOp = dict()
for key in targetDic.keys():
target = targetDic[key]
if target == "std": # use 'Qt5Brew' that provides Qt 5.15.1 to run on "Big Sur", too
buildOp["std"] = [ '-q', 'Qt5Brew', '-r', 'sys', '-p', 'sys' ]
if target == "std": # use 'Qt5MacPorts' that provides Qt 5.15.2 to run on "Big Sur", too
buildOp["std"] = [ '-q', 'Qt5MacPorts', '-r', 'sys', '-p', 'sys' ]
elif target == "ports":
buildOp["ports"] = [ '-q', 'Qt5MacPorts', '-r', 'MP27', '-p', 'MP38' ]
elif target == "brew":
@ -65,7 +65,7 @@ def Get_QAT_Directory( targetDic ):
for key in targetDic.keys():
target = targetDic[key]
if target == "std":
dirQAT["std"] = 'qt5Brew.build.macos-Catalina-release-RsysPsys.macQAT'
dirQAT["std"] = 'qt5MP.build.macos-Catalina-release-RsysPsys.macQAT'
elif target == "ports":
dirQAT["ports"] = 'qt5MP.build.macos-Catalina-release-Rmp27Pmp38.macQAT'
elif target == "brew":
@ -99,7 +99,7 @@ def Get_Package_Options( targetDic, srlDMG, makeflag ):
for key in targetDic.keys():
target = targetDic[key]
if target == "std":
packOp["std"] = [ '-p', 'ST-qt5Brew.pkg.macos-Catalina-release-RsysPsys', '-s', '%d' % srlDMG, '%s' % flag ]
packOp["std"] = [ '-p', 'ST-qt5MP.pkg.macos-Catalina-release-RsysPsys', '-s', '%d' % srlDMG, '%s' % flag ]
elif target == "ports":
packOp["ports"] = [ '-p', 'LW-qt5MP.pkg.macos-Catalina-release-Rmp27Pmp38', '-s', '%d' % srlDMG, '%s' % flag ]
elif target == "brew":