Merge branch 'release/2.6.0'

.gitignore

@@ -5,3 +5,6 @@ install
 boost_1_44_0
 InstallConfig.iss
 Output
+output
+fgBuild
+sgBuild

flightgear

@@ -1 +1 @@
-Subproject commit 118d8fbca5d98e994d572e4c922f76ba2cab9e52
+Subproject commit 7e2aaf061ee53b3b9a5cd840555b2deeecd1bd45

hudson_build_release.sh

@@ -1,9 +1,26 @@
 #!/bin/sh
 
-cd simgear
+if [ "$WORKSPACE" == "" ]; then
-./autogen.sh
+    echo "ERROR: Missing WORKSPACE environment variable."
-./configure --prefix=$WORKSPACE/dist --with-osg=$WORKSPACE/dist
+    exit 1
+fi
 
+#####################################################################################
+# remove old and create fresh build directories
+rm -rf sgBuild
+rm -rf fgBuild
+mkdir -p sgBuild
+mkdir -p fgBuild
+mkdir -p output
+rm -rf output/*
+rm -rf $WORKSPACE/dist/include/simgear $WORKSPACE/dist/libSim* $WORKSPACE/dist/libsg*.a
+
+#####################################################################################
+echo "Starting on SimGear"
+cd sgBuild
+cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DSIMGEAR_SHARED:BOOL="ON" ../simgear
+
+# compile
 make
 
 if [ $? -ne '0' ]; then
@@ -12,13 +29,17 @@ if [ $? -ne '0' ]; then
 fi
 
 make install
-make dist
 
+# build source package and copy to output
+make package_source
+cp simgear-*.tar.bz2 ../output/.
+
+#####################################################################################
 echo "Starting on FlightGear"
+cd ../fgBuild
+cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DSIMGEAR_SHARED:BOOL="ON" ../flightgear
 
-cd ../flightgear
+# compile
-./autogen.sh
-./configure --prefix=$WORKSPACE/dist --with-osg=$WORKSPACE/dist
 make
 
 if [ $? -ne '0' ]; then
@@ -27,4 +48,8 @@ if [ $? -ne '0' ]; then
 fi
 
 make install
-make dist
+
+# build source package and copy to output
+make package_source
+cp flightgear-*.tar.bz2 ../output/.
+

simgear

@@ -1 +1 @@
-Subproject commit e55017bbfce20a999bc9173260f402b2ec3819d0
+Subproject commit cfda390557f506c051bfae0cb36b206e59961481