Update Mac release build to sync from Telascience

.gitignore

@@ -10,3 +10,4 @@ fgBuild
 sgBuild
 image
 macflightgear
+fgdata

base-package.rules

@@ -2,37 +2,37 @@
 - *.xcf
 - *.tex
 
-+ /data/Aircraft/Generic
++ /fgdata/Aircraft/Generic
-+ /data/Aircraft/Instruments
++ /fgdata/Aircraft/Instruments
-+ /data/Aircraft/Instruments-3d
++ /fgdata/Aircraft/Instruments-3d
 
-+ /data/Aircraft/UIUC
++ /fgdata/Aircraft/UIUC
-+ /data/Aircraft/c172p
++ /fgdata/Aircraft/c172p
-+ /data/Aircraft/777
++ /fgdata/Aircraft/777
-+ /data/Aircraft/777-200
++ /fgdata/Aircraft/777-200
-+ /data/Aircraft/b1900d
++ /fgdata/Aircraft/b1900d
-+ /data/Aircraft/ufo
++ /fgdata/Aircraft/ufo
-+ /data/Aircraft/CitationX
++ /fgdata/Aircraft/CitationX
-+ /data/Aircraft/ZLT-NT
++ /fgdata/Aircraft/ZLT-NT
-+ /data/Aircraft/dhc2
++ /fgdata/Aircraft/dhc2
-+ /data/Aircraft/Cub
++ /fgdata/Aircraft/Cub
-+ /data/Aircraft/sopwithCamel
++ /fgdata/Aircraft/sopwithCamel
-+ /data/Aircraft/f-14b
++ /fgdata/Aircraft/f-14b
-+ /data/Aircraft/ASK13
++ /fgdata/Aircraft/ASK13
-+ /data/Aircraft/bo105
++ /fgdata/Aircraft/bo105
-+ /data/Aircraft/Dragonfly
++ /fgdata/Aircraft/Dragonfly
-+ /data/Aircraft/SenecaII
++ /fgdata/Aircraft/SenecaII
-+ /data/Aircraft/A6M2
++ /fgdata/Aircraft/A6M2
 
-- /data/Aircraft/*
+- /fgdata/Aircraft/*
 
-- /data/Textures.high/*.new
+- /fgdata/Textures.high/*.new
-- /data/Textures.high/*.orig
+- /fgdata/Textures.high/*.orig
-- /data/Textures.high/*.save
+- /fgdata/Textures.high/*.save
-- /data/Textures/Unused
+- /fgdata/Textures/Unused
-- /data/Textures/*.orig
+- /fgdata/Textures/*.orig
-- /data/Docs/source
+- /fgdata/Docs/source
-- /data/Models/Airspace
+- /fgdata/Models/Airspace
-- /data/Models/MNUAV
+- /fgdata/Models/MNUAV
 
 

hudson_mac_build_release.sh

@@ -60,5 +60,10 @@ gcc -o FlightGear -mmacosx-version-min=$OSX_TARGET -isysroot $SDK_PATH -arch i38
 
 popd
 
+################################################################################
+echo "Syncing base packages files from sphere.telascience.org"
+rsync -avz --filter 'merge base-package.rules' \
+ -e ssh jturner@sphere.telascience.org:/home/jturner/fgdata .
+
 echo "Running package script"
 ./hudson_mac_package_release.rb

hudson_mac_package_release.rb

@@ -115,7 +115,9 @@ 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 "Copying base package files into the image"
+`rsync -a fgdata/ #{resourcesDir}/data`
 
 puts "Creating DMG"