From b221b59dbc109e7860a8a962e60d03de02a9c2bb Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Tue, 18 Jan 2011 14:24:31 +0000
Subject: [PATCH] Different Info.plist for official releases.

---
 Info.plist.in                 | 29 +++++++++++++++++++++++++++++
 hudson_mac_package_release.rb | 12 +++++++-----
 2 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 Info.plist.in

diff --git a/Info.plist.in b/Info.plist.in
new file mode 100644
index 0000000..5fdd5d4
--- /dev/null
+++ b/Info.plist.in
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleIconFile</key>
+	<string>FlightGear.icns</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleGetInfoString</key>
+	<string>FlightGear nightly build</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleExecutable</key>
+	<string>FlightGear</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.flightgear.FlightGear</string>
+	<key>CFBundleVersion</key>
+	<string><%= fgVersion %></string>
+	<key>CFBundleShortVersionString</key>
+	<string><%= fgVersion %></string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.5.0</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>
+
diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb
index 7cd2de0..11a7744 100755
--- a/hudson_mac_package_release.rb
+++ b/hudson_mac_package_release.rb
@@ -51,11 +51,12 @@ macosDir=contents + "/MacOS"
 frameworksDir=contents +"/Frameworks"
 resourcesDir=contents+"/Resources"
 osgPluginsDir=contents+"/PlugIns/osgPlugins-#{osgVersion}"
-volName="\"FlightGear #{VERSION}\""
 
-VERSION = File.read("#{srcDir}/version").strip
 
-dmgPath = Dir.pwd + "/fg_mac_#{VERSION}.dmg"
+fgVersion = File.read("#{srcDir}/version").strip
+volName="\"FlightGear #{fgVersion}\""
+
+dmgPath = Dir.pwd + "/fg_mac_#{fgVersion}.dmg"
 
 puts "Creating directory structure"
 `mkdir -p #{macosDir}`
@@ -92,10 +93,11 @@ end
 `ditto #{$alutSourcePath} #{frameworksDir}/ALUT.framework`
 
 # Macflightgear launcher
-
+puts "Copying Macflightgear launcher files"
+`rsync -a --exclude=\".svn\" macflightgear/* #{resourcesDir}`
 
 # Info.plist
-template = File.read("#{srcDir}/package/mac/nightly.plist.in")
+template = File.read("Info.plist.in")
 output = ERB.new(template).result(binding)
 
 File.open("#{contents}/Info.plist", 'w') { |f|