From 4bcce7bf6b164870db99d13e61b1428217fe9451 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Wed, 29 Apr 2015 21:43:40 +0100
Subject: [PATCH] Include Model/AI/Scenery files in base package

---
 .gitignore              | 1 +
 aircraft.rules          | 6 ++++++
 hudson_build_release.sh | 9 +++++----
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 06d8e25..26062f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,5 @@ osgbuild
 CMakeCache.txt
 aircraft-data
 base_package
+extended-data
 
diff --git a/aircraft.rules b/aircraft.rules
index b480f33..08a5160 100644
--- a/aircraft.rules
+++ b/aircraft.rules
@@ -1,3 +1,4 @@
++ /Aircraft
 + /Aircraft/777
 + /Aircraft/777-200
 + /Aircraft/b1900d
@@ -13,3 +14,8 @@
 + /Aircraft/SenecaII
 + /Aircraft/A6M2
 - /Aircraft/*
++ /Models
++ /Scenery
++ /AI
+- /*
+
diff --git a/hudson_build_release.sh b/hudson_build_release.sh
index 952d3cc..1040c1e 100755
--- a/hudson_build_release.sh
+++ b/hudson_build_release.sh
@@ -72,12 +72,13 @@ rsync -a --delete \
  --filter 'merge base-package.rules' \
   fgdata base_package
 
-echo "Syncing aircraft"
-rsync -a --filter 'merge aircraft.rules' /home/jenkins/fgdata_340/Aircraft aircraft-data
+echo "Syncing extended data"
+rsync -a --filter 'merge aircraft.rules' /home/jenkins/fgdata_340/ extended-data
 
-echo "Copying aircraft"
-rsync -a aircraft-data/Aircraft base_package/fgdata
+echo "Copying extended data"
+rsync -a extended-data/ base_package/fgdata
 
+echo "Creating tar archive"
 pushd base_package
 tar cjf $WORKSPACE/output/FlightGear-$VERSION-data.tar.bz2 fgdata/
 popd