diff --git a/.gitignore b/.gitignore index efcb7e1..bb74c16 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ archivebuild osgbuild CMakeCache.txt *.pyc +base_package +extended-data diff --git a/aircraft.rules b/aircraft.rules new file mode 100644 index 0000000..04f0b03 --- /dev/null +++ b/aircraft.rules @@ -0,0 +1,16 @@ ++ /Aircraft ++ /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/* diff --git a/base-package.rules b/base-package.rules new file mode 100644 index 0000000..e9995ee --- /dev/null +++ b/base-package.rules @@ -0,0 +1,9 @@ +- .git +- *.xcf +- *.tex + +- /fgdata/Textures/Unused +- /fgdata/Textures/*.orig +- /fgdata/Docs/source +- /fgdata/Models/Airspace +- /fgdata/Models/MNUAV diff --git a/build_release_linux.sh b/build_release_linux.sh index 07c384e..0bec9e0 100755 --- a/build_release_linux.sh +++ b/build_release_linux.sh @@ -59,5 +59,25 @@ cp flightgear-*.tar.bz2 ../output/. echo "Assembling base package" cd $WORKSPACE -tar cjf output/FlightGear-$VERSION-data.tar.bz2 fgdata/ +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 + +echo "Copying FGData files" +rsync -a --delete \ + --filter 'merge base-package.rules' \ + fgdata base_package + +echo "Syncing aircraft data" +rsync -a --delete --filter 'merge aircraft.rules' /home/jenkins/fgaddon-3.6.0/ extended-data + +echo "Copying aircraft data" +rsync -a extended-data/ base_package/fgdata + +echo "Creating tar archive" +pushd base_package +tar cjf output/FlightGear-$VERSION-data.tar.bz2 fgdata/ +popd