diff --git a/.gitignore b/.gitignore index e5f3491..a4cb745 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ fgBuild sgBuild image macflightgear +fgdata diff --git a/base-package.rules b/base-package.rules index 488a83e..8e210bf 100644 --- a/base-package.rules +++ b/base-package.rules @@ -2,37 +2,37 @@ - *.xcf - *.tex -+ /data/Aircraft/Generic -+ /data/Aircraft/Instruments -+ /data/Aircraft/Instruments-3d ++ /fgdata/Aircraft/Generic ++ /fgdata/Aircraft/Instruments ++ /fgdata/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 ++ /fgdata/Aircraft/UIUC ++ /fgdata/Aircraft/c172p ++ /fgdata/Aircraft/777 ++ /fgdata/Aircraft/777-200 ++ /fgdata/Aircraft/b1900d ++ /fgdata/Aircraft/ufo ++ /fgdata/Aircraft/CitationX ++ /fgdata/Aircraft/ZLT-NT ++ /fgdata/Aircraft/dhc2 ++ /fgdata/Aircraft/Cub ++ /fgdata/Aircraft/sopwithCamel ++ /fgdata/Aircraft/f-14b ++ /fgdata/Aircraft/ASK13 ++ /fgdata/Aircraft/bo105 ++ /fgdata/Aircraft/Dragonfly ++ /fgdata/Aircraft/SenecaII ++ /fgdata/Aircraft/A6M2 -- /data/Aircraft/* +- /fgdata/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 +- /fgdata/Textures.high/*.new +- /fgdata/Textures.high/*.orig +- /fgdata/Textures.high/*.save +- /fgdata/Textures/Unused +- /fgdata/Textures/*.orig +- /fgdata/Docs/source +- /fgdata/Models/Airspace +- /fgdata/Models/MNUAV diff --git a/hudson_mac_build_release.sh b/hudson_mac_build_release.sh index d900525..8b29689 100755 --- a/hudson_mac_build_release.sh +++ b/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 diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb index 7b9945b..def85c1 100755 --- a/hudson_mac_package_release.rb +++ b/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"