Work on packaging for 3.4.1 release

.gitignore

@@ -20,3 +20,6 @@ CMakeFiles
 archivebuild
 osgbuild
 CMakeCache.txt
+aircraft-data
+base_package
+

FlightGear.iss

@@ -123,6 +123,9 @@ Source: "X:\3rdParty\bin\oalinst.exe"; DestDir: "{app}\bin"; Flags: ignoreversio
 Source: "X:\data\*.*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist
 Source: "X:\fgdata\*.*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist
 
+; work-around for 3.4.1: look for additional aircraft data
+Source: "X:\aircraft-data\*.*"; DestDir: "{app}\data"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist
+
 ; 32 bits install
 Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osg.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode
 Source: "{#OSGInstallDir}\bin\osg{#OSGSoNumber}-osgDB.dll"; DestDir: "{app}\bin"; Check: not Is64BitInstallMode

aircraft.rules

@@ -1,15 +1,15 @@
-+ /fgdata_340/Aircraft/777
-+ /fgdata_340/Aircraft/777-200
-+ /fgdata_340/Aircraft/b1900d
-+ /fgdata_340/Aircraft/CitationX
-+ /fgdata_340/Aircraft/ZLT-NT
-+ /fgdata_340/Aircraft/dhc2
-+ /fgdata_340/Aircraft/Cub
-+ /fgdata_340/Aircraft/sopwithCamel
-+ /fgdata_340/Aircraft/f-14b
-+ /fgdata_340/Aircraft/ASK13
-+ /fgdata_340/Aircraft/bo105
-+ /fgdata_340/Aircraft/Dragonfly
-+ /fgdata_340/Aircraft/SenecaII
-+ /fgdata_340/Aircraft/A6M2
-- /fgdata_340/*
++ /Aircraft/777
++ /Aircraft/777-200
++ /Aircraft/b1900d
++ /Aircraft/CitationX
++ /Aircraft/ZLT-NT
++ /Aircraft/dhc2
++ /Aircraft/Cub
++ /Aircraft/sopwithCamel
++ /Aircraft/f-14b
++ /Aircraft/ASK13
++ /Aircraft/bo105
++ /Aircraft/Dragonfly
++ /Aircraft/SenecaII
++ /Aircraft/A6M2
+- /Aircraft/*

hudson_build_release.sh

@@ -60,20 +60,25 @@ cp flightgear-*.tar.bz2 ../output/.
 echo "Assembling base package"
 cd $WORKSPACE
 
-rm -rf fgdata-tarball
+rm -rf base_package
 
 # a: archive mode
 # z: compress
 # delete: 'delete extraneous files from dest dirs'; avoid bug 1344
 # filter: use the rules in our rules file
 
-rsync -avz --delete \
- --filter 'merge aircraft-package.rules' \
- -e ssh jturner@sphere.telascience.org:/home/jturner/fgdata_340 fgdata-tarball
-
-
-rsync -az --delete \
+echo "Copying FGData files"
+rsync -a --delete \
  --filter 'merge base-package.rules' \
-  fgdata fgdata-tarball
+  fgdata base_package
 
-tar cjf output/FlightGear-$VERSION-data.tar.bz2 fgdata-tarball/
+echo "Syncing aircraft"
+rsync -az --filter 'merge aircraft.rules' \
+ -e ssh jturner@sphere.telascience.org:/home/jturner/fgdata/Aircraft aircraft-data
+
+echo "Copying aircraft"
+rsync -a aircraft-data/Aircraft base_package/fgdata
+
+pushd base_package
+tar cjf $WORKSPACE/output/FlightGear-$VERSION-data.tar.bz2 fgdata/
+popd

hudson_mac_build_release.sh

@@ -44,11 +44,6 @@ fi
 
 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 .
-
 chmod +x $WORKSPACE/dist/bin/osgversion
 
 ################################################################################

hudson_mac_package_release.rb

@@ -129,7 +129,10 @@ File.open("#{contents}/Info.plist", 'w') { |f|
 `mv fgdata/Docs/getstart.pdf "#{dmgDir}/Getting Started.pdf"`
 
 puts "Copying base package files into the image"
-`rsync -a fgdata/ #{resourcesDir}/data`
+`rsync -a --filter 'merge base-package.rules' fgdata/ #{resourcesDir}/data`
+
+# work-around for 3.4.1: copy aircraft files too
+`rsync -a aircraft-data/Aircraft #{resourcesDir}/data`
 
 # code sign the entire bundle once complete - v2 code-signing
 puts "Signing #{bundle}"

hudson_win_package_release.bat

@@ -29,10 +29,9 @@ ECHO #define OSGVersion "%OSG_VERSION%" >> InstallConfig.iss
 ECHO #define OSGSoNumber "%OSG_SO_NUMBER%" >> InstallConfig.iss
 ECHO #define OTSoNumber "%OT_SO_NUMBER%" >> InstallConfig.iss
 
-set DATA_FILE=FlightGear-%FLIGHTGEAR_VERSION%-data
-
+REM set DATA_FILE=FlightGear-%FLIGHTGEAR_VERSION%-data
 REM extract the data files
-7z e -aoa %DATA_FILE%.tar.bz2 && 7z x -aoa %DATA_FILE%.tar
+REM 7z e -aoa %DATA_FILE%.tar.bz2 && 7z x -aoa %DATA_FILE%.tar
 
 REM run Inno-setup!
 REM use iscc instead of compil32 for better error reporting