From c8c2da1b788490f9906664f72182aedcfa7ad256 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Tue, 6 Jan 2015 21:59:06 +0000
Subject: [PATCH] Mac nightly can use new launcher.

---
 CMakeModules/FlightGearBundleInfo.plist.in | 13 +++++++---
 package/mac/build-mac-nightly-dmg.rb       | 30 ++++++++--------------
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/CMakeModules/FlightGearBundleInfo.plist.in b/CMakeModules/FlightGearBundleInfo.plist.in
index 068d6f902..d5e26c177 100644
--- a/CMakeModules/FlightGearBundleInfo.plist.in
+++ b/CMakeModules/FlightGearBundleInfo.plist.in
@@ -26,17 +26,24 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
-	
+
     <key>LSMinimumSystemVersion</key>
     <string>10.6.0</string>
-	
+
     <key>NSHumanReadableCopyright</key>
 	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
-    
+
     <!-- needed for FlightGear launch to function -->
     <key>NSMainNibFile</key>
     <string>MainMenu</string>
     <key>NSPrincipalClass</key>
     <string>NSApplication</string>
+
+    <!-- when launched via LaunchServices, run the launcher GUI -->
+    <key>LSEnvironment</key>
+    <dict>
+        <key>FG_LAUNCHER</key>
+        <string>1</string>
+    </dict>
 </dict>
 </plist>
diff --git a/package/mac/build-mac-nightly-dmg.rb b/package/mac/build-mac-nightly-dmg.rb
index 0b27eb5cb..a13a19dba 100755
--- a/package/mac/build-mac-nightly-dmg.rb
+++ b/package/mac/build-mac-nightly-dmg.rb
@@ -23,13 +23,13 @@ puts "osgVersion=#{osgVersion}, so-number=#{$osgSoVersion}"
 
 def fix_install_names(object)
   puts "fixing install names for #{object}"
-  
+
   $osgLibs.each do |l|
     oldName = "lib#{l}.#{$osgSoVersion}.dylib"
-    newName = "@executable_path/../Frameworks/#{oldName}"    
+    newName = "@executable_path/../Frameworks/#{oldName}"
     `install_name_tool -change #{oldName} #{newName} #{object}`
   end
-  
+
   oldName = "libOpenThreads.#{$openThreadsSoVersion}.dylib"
   newName= "@executable_path/../Frameworks/#{oldName}"
   `install_name_tool -change #{oldName} #{newName} #{object}`
@@ -44,6 +44,11 @@ puts "Erasing previous image dir"
 
 bundle=dmgDir + "/FlightGear.app"
 
+# run macdeployt before we rename the bundle, otherwise it
+# can't find the bundle executable
+puts "Running macdeployqt on the bundle to copy Qt libraries"
+`macdeployqt #{$prefixDir}/fgfs.app`
+
 puts "Moving & renaming app bundle"
 `mkdir -p #{dmgDir}`
 `mv #{$prefixDir}/fgfs.app #{bundle}`
@@ -78,7 +83,7 @@ bins.each do |b|
   if !File.exist?("#{$prefixDir}/bin/#{b}")
     next
   end
-  
+
   outPath = "#{macosDir}/#{b}"
   `cp #{$prefixDir}/bin/#{b} #{outPath}`
   fix_install_names(outPath)
@@ -105,27 +110,12 @@ end
 `cp #{srcDir}/package/mac/FlightGear.icns #{resourcesDir}/FlightGear.icns`
 `cp #{srcDir}/COPYING #{dmgDir}`
 
-# Macflightgear launcher
-if File.exist?("FlightGearOSX")
-  puts "Copying Macflightgear launcher files"
-  Dir.chdir "FlightGearOSX" do
-    `cp FlightGear #{macosDir}`
-    `rsync -a *.rb *.lproj *.sh *.tiff #{resourcesDir}`
-  end
-  
-  # change CFBundleExecutable in to the Info.plist
-  puts "Adjusting CFBundle executable - needs Ruby plist gem installed"
-  plist = Plist::parse_xml("#{contents}/Info.plist")
-  plist["CFBundleExecutable"] = "FlightGear"
-  plist.save_plist("#{contents}/Info.plist")
-end
-
 if File.exist?("#{$prefixDir}/share/flightgear")
   puts "Copying FGCom data files"
   `ditto #{$prefixDir}/share/flightgear #{resourcesDir}`
 end
 
-# code sign all executables in MacOS dir. Do this last since reource
+# code sign all executables in MacOS dir. Do this last since resource
 # changes will invalidate the signature!
 Dir.foreach(macosDir) do |b|
     if b == '.' or b == '..' then
-- 
2.39.2