From e7011cab66009e2189eb55b9fd6773730989786b Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Tue, 31 Jul 2012 19:02:26 +0100
Subject: [PATCH] Updates for Mac packaging.

Note this is currently hard-coding a source path for rsync which only works on my machine - which is the Mac jenkins slave. This will be updated shortly.
---
 base-package.rules            | 38 +++++++++++++++++++++++++++++++++++
 hudson_mac_build_release.sh   |  8 +++-----
 hudson_mac_package_release.rb | 11 +++++-----
 3 files changed, 47 insertions(+), 10 deletions(-)
 create mode 100644 base-package.rules

diff --git a/base-package.rules b/base-package.rules
new file mode 100644
index 0000000..488a83e
--- /dev/null
+++ b/base-package.rules
@@ -0,0 +1,38 @@
+- .git
+- *.xcf
+- *.tex
+
++ /data/Aircraft/Generic
++ /data/Aircraft/Instruments
++ /data/Aircraft/Instruments-3d
+
++ /data/Aircraft/UIUC
++ /data/Aircraft/c172p
++ /data/Aircraft/777
++ /data/Aircraft/777-200
++ /data/Aircraft/b1900d
++ /data/Aircraft/ufo
++ /data/Aircraft/CitationX
++ /data/Aircraft/ZLT-NT
++ /data/Aircraft/dhc2
++ /data/Aircraft/Cub
++ /data/Aircraft/sopwithCamel
++ /data/Aircraft/f-14b
++ /data/Aircraft/ASK13
++ /data/Aircraft/bo105
++ /data/Aircraft/Dragonfly
++ /data/Aircraft/SenecaII
++ /data/Aircraft/A6M2
+
+- /data/Aircraft/*
+
+- /data/Textures.high/*.new
+- /data/Textures.high/*.orig
+- /data/Textures.high/*.save
+- /data/Textures/Unused
+- /data/Textures/*.orig
+- /data/Docs/source
+- /data/Models/Airspace
+- /data/Models/MNUAV
+
+
diff --git a/hudson_mac_build_release.sh b/hudson_mac_build_release.sh
index 4808344..d900525 100755
--- a/hudson_mac_build_release.sh
+++ b/hudson_mac_build_release.sh
@@ -49,12 +49,10 @@ chmod +x $WORKSPACE/dist/bin/osgversion
 ################################################################################
 echo "Building Macflightgear launcher"
 
-SDK_PATH="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk"
-OSX_TARGET="10.6"
+SDK_PATH="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"
+OSX_TARGET="10.7"
 
-svn co https://macflightgear.svn.sourceforge.net/svnroot/macflightgear/trunk/FlightGearOSX  macflightgear
-
-pushd macflightgear
+pushd maclauncher/FlightGearOSX
 
 # compile the stub executable
 gcc -o FlightGear -mmacosx-version-min=$OSX_TARGET -isysroot $SDK_PATH -arch i386 main.m \
diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb
index 3f41408..7b9945b 100755
--- a/hudson_mac_package_release.rb
+++ b/hudson_mac_package_release.rb
@@ -67,10 +67,10 @@ puts "Creating directory structure"
 `mkdir -p #{osgPluginsDir}`
 
 puts "Copying binaries"
-bins = ['fgfs', 'terrasync']
+bins = ['fgfs', 'fgjs']
 bins.each do |b|
-  `cp #{prefixDir}/bin/#{b} #{resourcesDir}/#{b}`
-  fix_install_names("#{resourcesDir}/#{b}")
+  `cp #{prefixDir}/bin/#{b} #{macosDir}/#{b}`
+  fix_install_names("#{macosDir}/#{b}")
 end
 
 puts "copying libraries"
@@ -100,9 +100,9 @@ end
 # Macflightgear launcher
 puts "Copying Macflightgear launcher files"
 
-Dir.chdir "macflightgear" do
+Dir.chdir "maclauncher/FlightGearOSX" do
   `cp FlightGear #{macosDir}`
-  `rsync -a --exclude=\".svn\" *.rb *.lproj *.sh *.tiff #{resourcesDir}`
+  `rsync -a *.rb *.lproj *.sh *.tiff #{resourcesDir}`
 end
 
 # Info.plist
@@ -115,6 +115,7 @@ File.open("#{contents}/Info.plist", 'w') { |f|
 
 `cp #{srcDir}/package/mac/FlightGear.icns #{resourcesDir}/FlightGear.icns`
 `cp #{srcDir}/COPYING #{dmgDir}`
+`rsync -a --verbose --filter 'merge #{Dir.pwd}/base-package.rules' /Users/Shared/FGFS/data #{resourcesDir}`
 
 puts "Creating DMG"