Include Macflightgear files, and the build helper.

diff --git a/package/mac/build-mac-nightly-dmg.rb b/package/mac/build-mac-nightly-dmg.rb
index 2930ab305160aa9f1a13f6325eb16014da797189..39f170aa8d3aebd28f356f723d0c1ff47f2b0e02 100755 (executable)
--- a/package/mac/build-mac-nightly-dmg.rb
+++ b/package/mac/build-mac-nightly-dmg.rb
@@ -53,7 +53,7 @@ resourcesDir=contents+"/Resources"
 osgPluginsDir=contents+"/PlugIns/osgPlugins-#{osgVersion}"
 volName="\"FlightGear Nightly Build\""
 
-VERSION = File.read("#{srcDir}/version").strip
+fgVersion = File.read("#{srcDir}/version").strip
 
 dmgPath = Dir.pwd + "/fg_mac_nightly_#{VERSION}.dmg"
 
@@ -103,6 +103,14 @@ File.open("#{contents}/Info.plist", 'w') { |f|
 `cp #{srcDir}/package/mac/FlightGear.icns #{resourcesDir}/FlightGear.icns`
 `cp #{srcDir}/COPYING #{dmgDir}`
 
+# Macflightgear launcher
+puts "Copying Macflightgear launcher files"
+
+Dir.chdir "macflightgear" do
+  `cp FlightGear #{macosDir}`
+  `rsync -a --exclude=\".svn\" *.rb *.lproj *.sh *.tiff #{resourcesDir}`
+end
+
 puts "Creating DMG"
 
 createArgs = "-format UDBZ -imagekey bzip2-level=9 -quiet -volname #{volName}"

diff --git a/package/mac/hudson_mac_build_launcher.sh b/package/mac/hudson_mac_build_launcher.sh
new file mode 100755 (executable)
index 0000000..4cf8e54
--- /dev/null
+++ b/package/mac/hudson_mac_build_launcher.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+SDK_PATH="/Developer/SDKs/MacOSX10.5.sdk"
+OSX_TARGET="10.5"
+
+svn co https://macflightgear.svn.sourceforge.net/svnroot/macflightgear/trunk/FlightGearOSX  macflightgear
+
+pushd macflightgear
+
+# compile the stub executable
+gcc -o FlightGear -mmacosx-version-min=$OSX_TARGET -isysroot $SDK_PATH -arch i386 main.m \
+    -framework Cocoa -framework RubyCocoa -framework Foundation -framework AppKit
+
+popd
+

diff --git a/package/mac/nightly.plist.in b/package/mac/nightly.plist.in
index 0565abe93f0e771f28c3dcb70c63532849ff04f8..fd9fe1892fc214845b6ecfc9d1a254aecf77ea85 100644 (file)
--- a/package/mac/nightly.plist.in
+++ b/package/mac/nightly.plist.in
@@ -15,7 +15,7 @@
        <key>CFBundleIdentifier</key>
        <string>org.flightgear.FlightGear</string>
        <key>CFBundleVersion</key>
-       <string><%= VERSION %></string>
+       <string><%= fgVersion %></string>
        <key>CFBundleShortVersionString</key>
        <string>unstable nightly build</string>
        <key>LSMinimumSystemVersion</key>