diff --git a/aircraft.rules b/aircraft.rules new file mode 100644 index 0000000..82049b7 --- /dev/null +++ b/aircraft.rules @@ -0,0 +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/* diff --git a/base-package.rules b/base-package.rules index 11ad292..ef1215c 100644 --- a/base-package.rules +++ b/base-package.rules @@ -2,29 +2,6 @@ - *.xcf - *.tex -+ /fgdata/Aircraft/Generic -+ /fgdata/Aircraft/Instruments -+ /fgdata/Aircraft/Instruments-3d - -+ /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 - -- /fgdata/Aircraft/* - - /fgdata/Textures/Unused - /fgdata/Textures/*.orig - /fgdata/Docs/source diff --git a/hudson_build_release.sh b/hudson_build_release.sh index 7cd504e..a2d41d6 100755 --- a/hudson_build_release.sh +++ b/hudson_build_release.sh @@ -60,14 +60,20 @@ cp flightgear-*.tar.bz2 ../output/. echo "Assembling base package" cd $WORKSPACE -echo "Syncing base packages files from sphere.telascience.org" +rm -rf fgdata-tarball # 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 \ --filter 'merge base-package.rules' \ - -e ssh jturner@sphere.telascience.org:/home/jturner/fgdata . + fgdata fgdata-tarball -tar cjf output/FlightGear-$VERSION-data.tar.bz2 fgdata/ +tar cjf output/FlightGear-$VERSION-data.tar.bz2 fgdata-tarball/