FGFS-4.1/fgmeta
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macOS: Use different bundle identifiers for nightly builds

Browse Source 
Also switch so nightly builds are always ‘lite’ (not full) to save
bandwidth / computational load on Jenkins
This commit is contained in:
James Turner 2020-04-02 22:21:20 +01:00
parent 0ddf75b382
commit 9effd91f62
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Info.plist.in
View File

@ -15,7 +15,7 @@
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>fgfs</string> <string>fgfs</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>org.flightgear.FlightGear</string> <string><%= fgBundleIdentifier %></string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string><%= fgVersion %></string> <string><%= fgVersion %></string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>

17
hudson_mac_package_release.rb
View File

@ -43,7 +43,6 @@ $prefixDir=Dir.pwd + "/dist"
dmgDir=Dir.pwd + "/image" dmgDir=Dir.pwd + "/image"
srcDir=Dir.pwd + "/flightgear" srcDir=Dir.pwd + "/flightgear"
qmlDir=srcDir + "/src/GUI/qml" qmlDir=srcDir + "/src/GUI/qml"
puts "Erasing previous image dir" puts "Erasing previous image dir"
`rm -rf #{dmgDir}` `rm -rf #{dmgDir}`
@ -69,6 +68,7 @@ osgPluginsDir=contents+"/PlugIns/osgPlugins"
# for writing copyright year to Info.plist # for writing copyright year to Info.plist
t = Time.new t = Time.new
fgCurrentYear = t.year fgCurrentYear = t.year
fgBundleIdentifier = "org.flightgear.mac"
fgVersion = File.read("#{srcDir}/version").strip fgVersion = File.read("#{srcDir}/version").strip
volName="\"FlightGear #{fgVersion}\"" volName="\"FlightGear #{fgVersion}\""
@ -79,6 +79,7 @@ if $isRelease
else else
dmgPath = Dir.pwd + "/output/FlightGear-#{fgVersion}-nightly.dmg" dmgPath = Dir.pwd + "/output/FlightGear-#{fgVersion}-nightly.dmg"
dmgFullPath = Dir.pwd + "/output/FlightGear-#{fgVersion}-nightly-full.dmg" dmgFullPath = Dir.pwd + "/output/FlightGear-#{fgVersion}-nightly-full.dmg"
fgBundleIdentifier = "org.flightgear.mac-nightly"
end end
puts "Creating directory structure" puts "Creating directory structure"
@ -159,18 +160,19 @@ if !$isRelease
puts "Notarizing DMG #{dmgPath}" puts "Notarizing DMG #{dmgPath}"
`xcrun altool --notarize-app \ `xcrun altool --notarize-app \
--primary-bundle-id "org.flightgear.mac" \ --primary-bundle-id "#{fgBundleIdentifier}" \
--username "zakalawe@mac.com" \ --username "zakalawe@mac.com" \
--password "@keychain:FlightGearAppStoreConnectUserName" \ --password "@keychain:FlightGearAppStoreConnectUserName" \
--file #{dmgPath}` --file #{dmgPath}`
end
else
puts "Creating full image with data" puts "Creating full image with data"
`rsync -a fgdata/ #{resourcesDir}/data` `rsync -a fgdata/ #{resourcesDir}/data`
# re-sign the entire bundle # sign the entire bundle
puts "Re-signing full app: #{bundle}" puts "Signing full app: #{bundle}"
`codesign --force #{codeSignArgs} --keychain #{$keychain} -s "#{$codeSignIdentity}" #{bundle}` `codesign --force #{codeSignArgs} --keychain #{$keychain} -s "#{$codeSignIdentity}" #{bundle}`
`rm -f #{dmgFullPath}` `rm -f #{dmgFullPath}`
@ -179,10 +181,13 @@ puts "Re-signing full app: #{bundle}"
puts "Notarizing DMG #{dmgFullPath}" puts "Notarizing DMG #{dmgFullPath}"
`xcrun altool --notarize-app \ `xcrun altool --notarize-app \
--primary-bundle-id "org.flightgear.mac" \ --primary-bundle-id "#{fgBundleIdentifier}" \
--username "zakalawe@mac.com" \ --username "zakalawe@mac.com" \
--password "@keychain:FlightGearAppStoreConnectUserName" \ --password "@keychain:FlightGearAppStoreConnectUserName" \
--file #{dmgFullPath}` --file #{dmgFullPath}`
end
puts "Packaging complete" puts "Packaging complete"