Disable explicit SDK setting for Mac launcher.

Setting an SDK is breaking, but since the build slave is running our lowest supported OS version anyway, we can live with the default setting.

.gitmodules

@@ -4,6 +4,9 @@
 [submodule "flightgear"]
 	path = flightgear
 	url = git://gitorious.org/fg/flightgear.git
+[submodule "fgrun"]
+	path = fgrun
+	url = git://gitorious.org/fg/fgrun.git
 [submodule "maclauncher"]
 	path = maclauncher
 	url = git://gitorious.org/fg/maclauncher.git

download_and_compile.sh

@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-VERSION="1.31"
+VERSION="1.9-4"
 
 #COMPILE GIT FGFS
 
@@ -27,8 +27,9 @@ VERSION="1.31"
 #######################################################
 # Special thanks to Alessandro Garosi for FGComGui and 
 # other patches
-# Thanks to "pac1" for patches for fgrun compilation
+# Thanks to "Pat Callahan" for patches for fgrun compilation
 # Thanks to "F-JJTH" for bug fixes and suggestions
+# Thanks again to "F-JJTH" for OpenRTI and FGX 
 
 
 
@@ -51,8 +52,9 @@ JOPTION=""
 OOPTION=""
 DEBUG=""
 WITH_EVENT_INPUT=""
+WITH_OPENRTI=""
 
-while getopts "suhc:p:a:d:r:j:O:ge" OPTION
+while getopts "suhc:p:a:d:r:j:O:gei" OPTION
 do
      case $OPTION in
          s)
@@ -91,6 +93,9 @@ do
          e)
              WITH_EVENT_INPUT="--with-eventinput"
              ;;
+         i)
+             WITH_OPENRTI="-D ENABLE_RTI=ON"
+             ;;
 
 
          ?)
@@ -122,23 +127,28 @@ fi
 
 #######################################################
 # Last stable revision: currently FlightGear 2.4.0 with 3.0.1
-PLIB_STABLE_REVISION="2163"
+PLIB_STABLE_REVISION="2172"
 OSG_STABLE_REVISION="http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags/OpenSceneGraph-3.0.1"
 
 # common stable branch for flightgear, simgear and fgdata
-FGSG_STABLE_GIT_BRANCH="release/2.6.0"
+FGSG_STABLE_GIT_BRANCH="release/2.8.0"
+FGRUN_STABLE_GIT_BRANCH="master"
+OPENRTI_STABLE_GIT_BRANCH="release-0.3"
 
 # unstable branch: next for sg/fg, master for fgdata
 FGSG_UNSTABLE_GIT_BRANCH="next"
 FGDATA_UNSTABLE_GIT_BRANCH="master"
+FGRUN_UNSTABLE_GIT_BRANCH="master"
+OPENRTI_UNSTABLE_GIT_BRANCH="master"
 
 # stable GIT revision: release tag
-SIMGEAR_STABLE_REVISION="version/2.6.0-final"
-FGFS_STABLE_REVISION="version/2.6.0-final"
-FGFS_DATA_STABLE_REVISION="version/2.6.0-final"
+SIMGEAR_STABLE_REVISION="version/2.8.0-final"
+FGFS_STABLE_REVISION="version/2.8.0-final"
+FGFS_DATA_STABLE_REVISION="version/2.8.0-final"
+OPENRTI_STABLE_REVISION="OpenRTI-0.3.0"
 
-FGRUN_STABLE_REVISION="655"
-FGCOM_STABLE_REVISION="261"
+# FGCOM
+FGCOM_UNSTABLE_GIT_BRANCH="master"
 FGCOMGUI_STABLE_REVISION="46"
 
 # Current developer revision: latest FlightGear GIT (2.5.0) with OSG 3.0.1
@@ -154,14 +164,15 @@ if [ "$WHATTOBUILD" = "--help" ]
 then
 	echo "$0 Version $VERSION"
 	echo "Usage:"
-	echo "./$0 [-u] [-h] [-s] [-e] [-g] [-a y|n] [-c y|n] [-p y|n] [-d y|n] [-r y|n] [ALL|PLIB|OSG|SIMGEAR|FGFS|FGO|FGRUN|FGCOM|FGCOMGUI|ATLAS] [UPDATE]"
-	echo "* without options it recompiles: PLIB,OSG,SIMGEAR,FGFS,FGRUN"
+	echo "./$0 [-u] [-h] [-s] [-e] [-i] [-g] [-a y|n] [-c y|n] [-p y|n] [-d y|n] [-r y|n] [ALL|PLIB|OSG|OPENRTI|SIMGEAR|FGFS|FGO|FGX|FGRUN|FGCOM|FGCOMGUI|ATLAS] [UPDATE]"
+	echo "* without options it recompiles: PLIB,OSG,OPENRTI,SIMGEAR,FGFS,FGRUN"
 	echo "* Using ALL compiles everything"
 	echo "* Adding UPDATE it does not rebuild all (faster but to use only after one successfull first compile)"
 	echo "Switches:"
 	echo "* -u  such as using UPDATE"
 	echo "* -h  show this help"
 	echo "* -e  compile FlightGear with --with-eventinput option (experimental)"
+	echo "* -i  compile SimGear and FlightGear with -D ENABLE_RTI=ON option (experimental)"
 	echo "* -g  compile with debug info for gcc"
 	echo "* -a y|n  y=do an apt-get update n=skip apt-get update                      	default=y"
 	echo "* -p y|n  y=download packages n=skip download packages                      	default=y"
@@ -183,7 +194,7 @@ fi
 echo "**************************************"
 echo "*                                    *"
 echo "* Warning, the compilation process   *"
-echo "* is going to use 9 or more Gbytes   *"
+echo "* is going to use 12 or more Gbytes  *"
 echo "* of space and at least a couple of  *"
 echo "* hours to download and build FG.    *"
 echo "*                                    *"
@@ -258,13 +269,13 @@ fi
 
 
 # default is hardy
-DISTRO_PACKAGES="libopenal-dev libalut-dev libalut0  libfltk1.1-dev libfltk1.1 cvs subversion cmake make build-essential automake zlib1g-dev zlib1g libwxgtk2.8-0 libwxgtk2.8-dev fluid gawk gettext libxi-dev libxi6 libxmu-dev libxmu6 libboost-dev libasound2-dev libasound2 libpng12-dev libpng12-0 libjasper1 libjasper-dev libopenexr-dev libboost-serialization-dev git-core libhal-dev libqt4-dev scons python-tk python-imaging-tk libsvn-dev libglew1.5-dev "
+DISTRO_PACKAGES="libopenal-dev libalut-dev libalut0  libfltk1.3-dev libfltk1.3 cvs subversion cmake make build-essential automake zlib1g-dev zlib1g libwxgtk2.8-0 libwxgtk2.8-dev fluid gawk gettext libxi-dev libxi6 libxmu-dev libxmu6 libboost-dev libasound2-dev libasound2 libpng12-dev libpng12-0 libjasper1 libjasper-dev libopenexr-dev libboost-serialization-dev git-core libhal-dev libqt4-dev scons python-tk python-imaging-tk libsvn-dev libglew1.5-dev  libxft2 libxft-dev libxinerama1 libxinerama-dev"
 
-UBUNTU_PACKAGES="freeglut3-dev libjpeg62-dev libjpeg62 libapr1-dev "
-DEBIAN_PACKAGES="freeglut3-dev libjpeg8-dev libjpeg8 "
+UBUNTU_PACKAGES="freeglut3-dev libjpeg62-dev libjpeg62 libapr1-dev libfltk1.3-dev libfltk1.3"
+DEBIAN_PACKAGES="freeglut3-dev libjpeg8-dev libjpeg8 libfltk-dev libfltk1.1"
 
 # checking linux distro and version to differ needed packages
-if [ "$DISTRIB_ID" = "Ubuntu" ]
+if [ "$DISTRIB_ID" = "Ubuntu" -o "$DISTRIB_ID" = "LinuxMint" ]
 then
 	echo "$DISTRIB_ID $DISTRIB_RELEASE" >> $LOGFILE
 	DISTRO_PACKAGES="$DISTRO_PACKAGES $UBUNTU_PACKAGES"
@@ -375,6 +386,7 @@ then
 
 		PLIB_STABLE_REVISION_=""
 		if [ "$STABLE" = "STABLE" ]
+		#if [ "STABLE" = "STABLE" ]
 		then
 			PLIB_STABLE_REVISION_=" -r $PLIB_STABLE_REVISION"
 		fi
@@ -390,8 +402,8 @@ then
             		else
 				echo -n "DOWNLOADING FROM http://plib.svn.sourceforge.net ..." >> $LOGFILE
 				svn $PLIB_STABLE_REVISION_ co http://plib.svn.sourceforge.net/svnroot/plib/trunk plib 
-				cat plib/src/util/ul.h | sed s/"PLIB_TINY_VERSION  5"/"PLIB_TINY_VERSION  6"/g > ul.h-v1.8.6
-				mv ul.h-v1.8.6 plib/src/util/ul.h
+				#cat plib/src/util/ul.h | sed s/"PLIB_TINY_VERSION  5"/"PLIB_TINY_VERSION  6"/g > ul.h-v1.8.6
+				#mv ul.h-v1.8.6 plib/src/util/ul.h
 				echo " OK" >> $LOGFILE
             		fi
 		fi 
@@ -410,7 +422,7 @@ then
 			./autogen.sh 2>&1 | tee  -a $LOGFILE
 			echo "CONFIGURING plib" >> $LOGFILE
 			cd "$CBD"/build/plib
-			../../plib/configure --prefix="$INSTALL_DIR_PLIB" --exec-prefix="$INSTALL_DIR_PLIB" 2>&1 | tee -a $LOGFILE
+			../../plib/configure  --disable-pw --disable-sl --disable-psl --disable-ssg --disable-ssgaux  --prefix="$INSTALL_DIR_PLIB" --exec-prefix="$INSTALL_DIR_PLIB" 2>&1 | tee -a $LOGFILE
 		else
 			echo "NO RECONFIGURE FOR plib" >> $LOGFILE
 		fi
@@ -521,6 +533,104 @@ fi
 
 
 
+#######################################################
+# OPENRTI
+#######################################################
+OPENRTI_INSTALL_DIR=openrti
+INSTALL_DIR_OPENRTI=$INSTALL_DIR/$OPENRTI_INSTALL_DIR
+cd "$CBD"
+
+if [ ! -d "openrti" ]
+then
+	mkdir "openrti"
+fi
+
+if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "OPENRTI" -o "$WHATTOBUILD" = "ALL" ]
+then
+	echo "****************************************" | tee -a $LOGFILE
+	echo "**************** OPENRTI ***************" | tee -a $LOGFILE
+	echo "****************************************" | tee -a $LOGFILE
+
+
+	if [ "$DOWNLOAD" = "y" ]
+	then
+		cd openrti
+
+		echo -n "git FROM git://gitorious.org/openrti/openrti.git ... " >> $LOGFILE
+
+		if [ -d "openrti" ]
+		then
+			echo "openrti exists already."
+		else
+			git clone git://gitorious.org/openrti/openrti.git
+		fi
+
+		cd openrti
+
+		git fetch origin
+		if [ "$STABLE" = "STABLE" ]
+		then
+			# switch to stable branch
+			# create local stable branch, ignore errors if it exists
+			git branch -f $OPENRTI_STABLE_GIT_BRANCH origin/$OPENRTI_STABLE_GIT_BRANCH 2> /dev/null || true
+			# switch to stable branch. No error is reported if we're already on the branch.
+			git checkout -f $OPENRTI_STABLE_GIT_BRANCH
+			# get indicated stable version
+			git reset --hard $OPENRTI_STABLE_REVISION
+		else
+			# switch to unstable branch
+			# create local unstable branch, ignore errors if it exists
+			git branch -f $OPENRTI_UNSTABLE_GIT_BRANCH origin/$OPENRTI_UNSTABLE_GIT_BRANCH 2> /dev/null || true
+			# switch to unstable branch. No error is reported if we're already on the branch.
+			git checkout -f $OPENRTI_UNSTABLE_GIT_BRANCH
+			# pull latest version from the unstable branch
+			git pull
+		fi
+
+		cd ..	
+
+		echo " OK" >> $LOGFILE
+		cd ..
+	
+	fi
+	
+	cd "openrti/openrti"
+	
+	if [ ! "$UPDATE" = "UPDATE" ]
+	then
+		if [ "$RECONFIGURE" = "y" ]
+		then
+
+			cd "$CBD"
+			mkdir -p build/openrti
+			cd "$CBD"/build/openrti
+			echo -n "RECONFIGURE OPENRTI ... " >> $LOGFILE
+			rm -f ../../openrti/openrti/CMakeCache.txt
+			cmake -D CMAKE_BUILD_TYPE="Release" -D CMAKE_CXX_FLAGS="-O3 -D__STDC_CONSTANT_MACROS" -D CMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_OPENRTI" ../../openrti/openrti/ 2>&1 | tee -a $LOGFILE
+			echo " OK" >> $LOGFILE
+
+
+
+		fi
+	fi
+	
+	if [ "$COMPILE" = "y" ]
+	then
+
+
+		cd "$CBD"/build/openrti
+		echo "MAKE OPENRTI" >> $LOGFILE
+		echo "make $JOPTION $OOPTION " >> $LOGFILE
+		make $JOPTION $OOPTION 2>&1 | tee -a $LOGFILE
+
+		echo "INSTALL OPENRTI" >> $LOGFILE
+		make install 2>&1 | tee -a $LOGFILE
+	fi
+	cd -
+fi
+
+
+
 #######################################################
 # SIMGEAR
 #######################################################
@@ -598,7 +708,7 @@ then
 			cd "$CBD"/build/simgear
 			echo -n "RECONFIGURE SIMGEAR ... " >> $LOGFILE
 			rm -f ../../simgear/simgear/CMakeCache.txt
-			cmake -D CMAKE_BUILD_TYPE="Release" -D CMAKE_CXX_FLAGS="-O3 -D__STDC_CONSTANT_MACROS" -D CMAKE_C_FLAGS="-O3" -D CMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_SIMGEAR" -D CMAKE_PREFIX_PATH=$INSTALL_DIR_OSG ../../simgear/simgear/ 2>&1 | tee -a $LOGFILE
+			cmake -D CMAKE_BUILD_TYPE="Release" $WITH_OPENRTI -D CMAKE_CXX_FLAGS="-O3 -D__STDC_CONSTANT_MACROS" -D CMAKE_C_FLAGS="-O3" -D CMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_SIMGEAR" -D "CMAKE_PREFIX_PATH=$INSTALL_DIR_OSG;$INSTALL_DIR_OPENRTI" ../../simgear/simgear/ 2>&1 | tee -a $LOGFILE
 			echo " OK" >> $LOGFILE
 
 
@@ -716,7 +826,7 @@ then
 				#cp -f  utils/fgadmin/src/CMakeLists_without_err.txt utils/fgadmin/src/CMakeLists.txt
 
 		
-				cmake -D CMAKE_BUILD_TYPE="Release" -D "WITH_FGPANEL=OFF" -D CMAKE_CXX_FLAGS="-O3 -D__STDC_CONSTANT_MACROS" -D CMAKE_C_FLAGS="-O3" -D CMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_FGFS" -D "CMAKE_PREFIX_PATH=$INSTALL_DIR_OSG;$INSTALL_DIR_PLIB;$INSTALL_DIR_SIMGEAR" ../../fgfs/flightgear 2>&1 | tee -a $LOGFILE
+				cmake -D CMAKE_BUILD_TYPE="Release" $WITH_OPENRTI -D "WITH_FGPANEL=OFF" -D CMAKE_CXX_FLAGS="-O3 -D__STDC_CONSTANT_MACROS" -D CMAKE_C_FLAGS="-O3" -D CMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_FGFS" -D "CMAKE_PREFIX_PATH=$INSTALL_DIR_OSG;$INSTALL_DIR_PLIB;$INSTALL_DIR_SIMGEAR;$INSTALL_DIR_OPENRTI" ../../fgfs/flightgear 2>&1 | tee -a $LOGFILE
 
 				echo " OK" >> $LOGFILE
 
@@ -833,7 +943,7 @@ then
 #!/bin/sh
 cd \$(dirname \$0)
 cd $SUB_INSTALL_DIR/$FGFS_INSTALL_DIR/bin
-export LD_LIBRARY_PATH=../../$PLIB_INSTALL_DIR/lib:../../$OSG_INSTALL_DIR/lib:../../$SIMGEAR_INSTALL_DIR/lib
+export LD_LIBRARY_PATH=../../$PLIB_INSTALL_DIR/lib:../../$OSG_INSTALL_DIR/lib:../../$SIMGEAR_INSTALL_DIR/lib:../../$OPENRTI_INSTALL_DIR/lib
 ./fgfs --fg-root=\$PWD/../fgdata/ \$@
 ENDOFALL
 	chmod 755 run_fgfs.sh
@@ -843,7 +953,7 @@ ENDOFALL
 cd \$(dirname \$0)
 P1=\$PWD
 cd $SUB_INSTALL_DIR/$FGFS_INSTALL_DIR/bin
-export LD_LIBRARY_PATH=../../$PLIB_INSTALL_DIR/lib:../../$OSG_INSTALL_DIR/lib:../../$SIMGEAR_INSTALL_DIR/lib
+export LD_LIBRARY_PATH=../../$PLIB_INSTALL_DIR/lib:../../$OSG_INSTALL_DIR/lib:../../$SIMGEAR_INSTALL_DIR/lib:../../$OPENRTI_INSTALL_DIR/lib
 gdb  --directory="\$P1"/fgfs/source/src/ --args fgfs --fg-root=\$PWD/../fgdata/ \$@
 ENDOFALL2
 	chmod 755 run_fgfs_debug.sh
@@ -895,6 +1005,102 @@ then
 fi
 
 
+#######################################################
+# FGx
+#######################################################
+FGX_INSTALL_DIR=fgx
+INSTALL_DIR_FGX=$INSTALL_DIR/$FGX_INSTALL_DIR
+cd "$CBD"
+if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "FGX" ]
+then
+	echo "****************************************" | tee -a $LOGFILE
+	echo "***************** FGX ******************" | tee -a $LOGFILE
+	echo "****************************************" | tee -a $LOGFILE
+
+	if [ "$DOWNLOAD" = "y" ]
+	then
+
+		echo -n "git clone git://gitorious.org/fgx/fgx.git ... " >> $LOGFILE
+
+		if [ -d "fgx" ]
+		then
+			echo "fgx exists already."
+		else
+			git clone git://gitorious.org/fgx/fgx.git fgx
+		fi
+
+		echo " OK" >> $LOGFILE
+
+	fi
+
+	cd fgx/
+
+	git branch -f $FGX_STABLE_GIT_BRANCH origin/$FGX_STABLE_GIT_BRANCH 2> /dev/null || true
+	git checkout -f $FGX_STABLE_GIT_BRANCH
+	git pull
+
+	cd ..
+
+
+	cd fgx/src/
+
+	#Patch in order to pre-setting paths
+	cd resources/default/
+	cp x_default.ini x_default.ini.orig
+	cat x_default.ini | sed s/\\/usr\\/bin\\/fgfs/INSTALL_DIR_FGXMY_SLASH_HERE..MY_SLASH_HEREfgfsMY_SLASH_HEREbinMY_SLASH_HEREfgfs/g > tmp1
+	cat tmp1 | sed s/\\/usr\\/share\\/flightgear/INSTALL_DIR_FGXMY_SLASH_HERE..MY_SLASH_HEREfgfsMY_SLASH_HEREfgdata/g > tmp2
+	cat tmp2 | sed s/\\/usr\\/bin\\/terrasync/INSTALL_DIR_FGXMY_SLASH_HERE..MY_SLASH_HEREfgfsMY_SLASH_HEREbinMY_SLASH_HEREterrasync/g > tmp3
+	cat tmp3 | sed s/\\/usr\\/bin\\/fgcom/INSTALL_DIR_FGXMY_SLASH_HERE..MY_SLASH_HEREfgcomMY_SLASH_HEREbinMY_SLASH_HEREfgcom/g > tmp4
+	cat tmp4 | sed s/\\/usr\\/bin\\/js_demo/INSTALL_DIR_FGXMY_SLASH_HERE..MY_SLASH_HEREfgfsMY_SLASH_HEREbinMY_SLASH_HEREjs_demo/g > tmp5
+
+	INSTALL_DIR_FGX_NO_SLASHS=$(echo "$INSTALL_DIR_FGX" | sed -e 's/\//MY_SLASH_HERE/g')
+	cat tmp5 | sed s/INSTALL_DIR_FGX/"$INSTALL_DIR_FGX_NO_SLASHS"/g > tmp
+	cat tmp | sed s/MY_SLASH_HERE/\\//g > x_default.ini
+	rm tmp*
+
+	cd ..
+
+
+	if [ ! "$UPDATE" = "UPDATE" ]
+	then
+		if [ "$RECONFIGURE" = "y" ]
+		then
+
+			echo -n "RECONFIGURE FGX ... " >> $LOGFILE
+
+			mkdir -p $INSTALL_DIR_FGX
+			cd $INSTALL_DIR_FGX
+
+			qmake ../../fgx/src
+
+			echo " OK" >> $LOGFILE
+		fi
+	fi
+	
+	if [ "$COMPILE" = "y" ]
+	then
+		cd $INSTALL_DIR_FGX
+		echo "MAKE AND INSTALL FGX" >> $LOGFILE
+		echo "make $JOPTION $OOPTION " >> $LOGFILE
+		make $JOPTION $OOPTION | tee -a $LOGFILE
+		cd ..
+	fi
+
+	cd "$CBD"
+
+	SCRIPT=run_fgx.sh
+	echo "#!/bin/sh" > $SCRIPT
+	echo "cd \$(dirname \$0)" >> $SCRIPT
+	echo "cd $SUB_INSTALL_DIR" >> $SCRIPT
+	echo "p=\$(pwd)" >> $SCRIPT
+	echo "cd $FGX_INSTALL_DIR" >> $SCRIPT
+        echo "export LD_LIBRARY_PATH=\$p/plib/lib:\$p/OpenSceneGraph/lib:\$p/simgear/lib"  >> $SCRIPT
+	echo "./fgx" >> $SCRIPT
+	chmod 755 $SCRIPT
+
+fi
+
+
 #######################################################
 # FGRUN
 #######################################################
@@ -908,23 +1114,55 @@ then
 	echo "**************** FGRUN *****************" | tee -a $LOGFILE
 	echo "****************************************" | tee -a $LOGFILE
 
-	if [ "$DOWNLOAD" = "y" ]
-	then
 
-		FGRUN_STABLE_REVISION_=""
-		if [ "$STABLE" = "STABLE" ]
+		if [ "$DOWNLOAD" = "y" ]
 		then
-			FGRUN_STABLE_REVISION_=" -r $FGRUN_STABLE_REVISION"
+			#echo -n "CVS FROM cvs.flightgear.org:/var/cvs/FlightGear-0.9 ... " >> $LOGFILE
+			#cvs -z5 -d :pserver:cvsguest:guest@cvs.flightgear.org:/var/cvs/FlightGear-0.9 login
+			#cvs -z5 -d :pserver:cvsguest@cvs.flightgear.org:/var/cvs/FlightGear-0.9 co source
+
+			echo -n "GIT FROM git://gitorious.org/fg/fgrun.git ... " >> $LOGFILE
+			
+
+			if [ -d "fgrun" ]
+			then
+				echo "fgrun exists already."
+			else
+				git clone git://gitorious.org/fg/fgrun.git fgrun
+			fi
+
+			cd fgrun
+
+			git fetch origin
+			if [ "$STABLE" = "STABLE" ]
+			then
+				# switch to stable branch
+				# create local stable branch, ignore errors if it exists
+				ls
+				git branch -f $FGRUN_STABLE_GIT_BRANCH origin/$FGRUN_STABLE_GIT_BRANCH 2> /dev/null || true
+				# switch to stable branch. No error is reported if we're already on the branch.
+				git checkout -f $FGRUN_STABLE_GIT_BRANCH
+				# get indicated stable version
+				git reset --hard $FGRUN_STABLE_GIT_BRANCH
+			else
+				# switch to unstable branch
+				# create local unstable branch, ignore errors if it exists
+				git branch -f $FGRUN_UNSTABLE_GIT_BRANCH origin/$FGRUN_UNSTABLE_GIT_BRANCH 2> /dev/null || true
+				# switch to unstable branch. No error is reported if we're already on the branch.
+				git checkout -f $FGRUN_UNSTABLE_GIT_BRANCH
+				# pull latest version from the unstable branch
+				git pull
+			fi
+
+			cd ..	
+
+			echo " OK" >> $LOGFILE
+
 		fi
+		
+		cd fgrun
 
 
-		echo -n "SVN FROM http://fgrun.svn.sourceforge.net/svnroot/fgrun ... " >> $LOGFILE
-		svn $FGRUN_STABLE_REVISION_ co http://fgrun.svn.sourceforge.net/svnroot/fgrun/trunk fgrun
-		echo " OK" >> $LOGFILE
-
-	fi
-	cd fgrun/fgrun/
-
 	if [ ! "$UPDATE" = "UPDATE" ]
 	then
 		if [ "$RECONFIGURE" = "y" ]
@@ -934,9 +1172,9 @@ then
                         cd "$CBD"/build/fgrun
 
 			echo -n "RECONFIGURE FGRUN ... " >> $LOGFILE
-			rm -f ../../fgrun/fgrun/CMakeCache.txt
+			rm -f ../../fgrun/CMakeCache.txt
 			
-			cmake -D CMAKE_BUILD_TYPE="Release" -D CMAKE_CXX_FLAGS="-O3 -D__STDC_CONSTANT_MACROS" -D CMAKE_C_FLAGS="-O3" -D CMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_FGRUN" -D "CMAKE_PREFIX_PATH=$INSTALL_DIR_OSG;$INSTALL_DIR_PLIB;$INSTALL_DIR_SIMGEAR" ../../fgrun/fgrun/ 2>&1 | tee -a $LOGFILE
+			cmake -D CMAKE_BUILD_TYPE="Release" -D CMAKE_CXX_FLAGS="-O3 -D__STDC_CONSTANT_MACROS" -D CMAKE_C_FLAGS="-O3" -D CMAKE_INSTALL_PREFIX:PATH="$INSTALL_DIR_FGRUN" -D "CMAKE_PREFIX_PATH=$INSTALL_DIR_OSG;$INSTALL_DIR_PLIB;$INSTALL_DIR_SIMGEAR" ../../fgrun/ 2>&1 | tee -a $LOGFILE
 
 			echo " OK" >> $LOGFILE
 		fi
@@ -994,10 +1232,39 @@ then
 			FGCOM_STABLE_REVISION_=" -r $FGCOM_STABLE_REVISION"
 		fi
 
+		echo -n "git://gitorious.org/fg/fgcom.git ... " >> $LOGFILE
 
-		echo -n "SVN FROM https://appfgcom.svn.sourceforge.net/svnroot/fgcom/trunk ... " >> $LOGFILE
-		svn $FGCOM_STABLE_REVISION_ co https://appfgcom.svn.sourceforge.net/svnroot/fgcom/trunk fgcom 
+		if [ -d "fgcom" ]
+		then 
+			echo "fgcom exists already."
+		else   
+	                git clone git://gitorious.org/fg/fgcom.git
+		fi
+
+		cd fgcom
+		git fetch origin
+		if [ "$STABLE" = "STABLE" ]
+		then
+			# switch to stable branch
+                        # create local stable branch, ignore errors if it exists
+                        git branch -f $FGCOM_STABLE_FGOM_BRANCH origin/$FGCOM_STABLE_FGCOM_BRANCH 2> /dev/null || true
+                        # switch to stable branch. No error is reported if we're already on the branch.
+                        git checkout -f $FGCOM_STABLE_FGCOM_BRANCH
+                        # get indicated stable version
+                        git reset --hard $FGCOM_STABLE_REVISION
+		else
+			# switch to unstable branch
+                        # create local unstable branch, ignore errors if it exists
+                        git branch -f $FGCOM_UNSTABLE_GIT_BRANCH origin/$FGCOM_UNSTABLE_GIT_BRANCH 2> /dev/null || true
+                        # switch to unstable branch. No error is reported if we're already on the branch.
+                        git checkout -f $FGCOM_UNSTABLE_GIT_BRANCH
+                        # pull latest version from the unstable branch
+                        git pull
+		fi
+		
 		echo " OK" >> $LOGFILE
+		cd ..
+		
 
 
 		
@@ -1006,11 +1273,22 @@ then
 		mv fgcom/iaxclient/lib/libiax2/src/iax_ok.c fgcom/iaxclient/lib/libiax2/src/iax.c
 	fi
 	
-	cd fgcom/src/
 	
 	if [ "$RECONFIGURE" = "y" ]
 	then
-        cp Makefile Makefile.original
+		cd "$CBD"
+		mkdir -p build/fgcom
+
+		cd "$CBD"/build/fgcom
+		echo -n "RECONFIGURE FGCOM ... " >> $LOGFILE
+		rm -f CMakeCache.txt
+		cmake -D CMAKE_BUILD_TYPE="Release" -D "CMAKE_PREFIX_PATH=$INSTALL_DIR_PLIB;$INSTALL_DIR_SIMGEAR"  -D "CMAKE_INSTALL_PREFIX:PATH=$INSTALL_DIR_FGCOM" "$CBD"/fgcom   2>&1  | tee -a $LOGFILE
+
+		echo " OK" >> $LOGFILE
+
+	        cd "$CBD"/fgcom/src/
+
+		cp Makefile Makefile.original
 		cat Makefile | sed s/\\//MY_SLASH_HERE/g > Makefile_NOSLASHES
 	
 		# 1
@@ -1050,17 +1328,18 @@ then
 
 	fi
 
+	cd "$CBD"/build/fgcom
 
 	mkdir -p "$INSTALL_DIR_FGCOM"/bin
 
 	if [ "$COMPILE" = "y" ]
 	then
 		echo "MAKE FGCOM" >> $LOGFILE
-		echo "make $JOPTION $OOPTION" >> $LOGFILE
-		make $JOPTION $OOPTION 2>&1 | tee -a $LOGFILE
-
+		echo "cmake --build . --config Release" >> $LOGFILE
+		cmake --build . --config Release 2>&1 | tee -a $LOGFILE
+		
 		echo "INSTALL FGCOM" >> $LOGFILE
-		make install 2>&1 | tee -a $LOGFILE
+		cmake -DBUILD_TYPE=Release -P cmake_install.cmake 2>&1 | tee -a $LOGFILE
 	fi
 	cd "$CBD"
 

hudson_mac_build_release.sh

@@ -49,12 +49,17 @@ chmod +x $WORKSPACE/dist/bin/osgversion
 ################################################################################
 echo "Building Macflightgear launcher"
 
-OSX_TARGET="10.6"
+#OSX_TARGET="10.6"
+# JMT - disabling setting the sysroot since it's breaking things on 
+# current build slave. Sinc ethe slave runs 10.6 natively, we don't 
+# actually need to set these. Real solution would be to use a proper
+# build system for the Mac-launcher of course.
+# -mmacosx-version-min=$OSX_TARGET -isysroot $SDK_PATH
 
 pushd maclauncher/FlightGearOSX
 
 # compile the stub executable
-gcc -o FlightGear -mmacosx-version-min=$OSX_TARGET -isysroot $SDK_PATH -arch i386 main.m \
+gcc -o FlightGear main.m \
     -framework Cocoa -framework RubyCocoa -framework Foundation -framework AppKit
 
 popd

hudson_mac_package_release.rb

@@ -22,8 +22,6 @@ puts "Code signing identity is #{$codeSignIdentity}"
 
 puts "osgVersion=#{osgVersion}, so-number=#{$osgSoVersion}"
 
-$alutSourcePath='/Library/Frameworks/ALUT.framework'
-
 $svnLibs = ['svn_client', 'svn_wc', 'svn_delta', 'svn_diff', 'svn_ra', 
   'svn_ra_local', 'svn_repos', 'svn_fs', 'svn_fs_fs', 'svn_fs_util',
   'svn_ra_svn', 'svn_subr', 'svn_ra_neon']
@@ -40,10 +38,6 @@ def fix_install_names(object)
   oldName = "libOpenThreads.#{$openThreadsSoVersion}.dylib"
   newName= "@executable_path/../Frameworks/#{oldName}"
   `install_name_tool -change #{oldName} #{newName} #{object}`
-  
-  alutBundlePath = "@executable_path/../Frameworks/ALUT.framework"
-  alutLib = "Versions/A/ALUT"
-  `install_name_tool -change #{$alutSourcePath}/#{alutLib} #{alutBundlePath}/#{alutLib} #{object}`
 end
 
 $prefixDir=Dir.pwd + "/dist"
@@ -132,10 +126,6 @@ end
 
 copy_svn_libs()
 
-# custom ALUT
-# must copy frameworks using ditto
-`ditto #{$alutSourcePath} #{$frameworksDir}/ALUT.framework`
-
 # Macflightgear launcher
 puts "Copying Macflightgear launcher files"
 

hudson_win_build32.bat

@@ -1,15 +1,20 @@
 
 IF NOT DEFINED WORKSPACE SET WORKSPACE=%~dp0
 
-ECHO #define SIMGEAR_VERSION "2.8.0" > %WORKSPACE%\simgear\simgear\version.h
+ECHO #define SIMGEAR_VERSION "2.9.0" > %WORKSPACE%\simgear\simgear\version.h
 rem set PATH=%PATH%;D:\Program Files (x86)\CMake 2.8\bin
 rem call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\Tools\vsvars32.bat"
 md build-sg
 md build-fg
+md build-fgrun
 cd build-sg
-cmake ..\simgear -G "Visual Studio 10" -DMSVC_3RDPARTY_ROOT=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100/SimGear
+cmake ..\simgear -G "Visual Studio 10" -DMSVC_3RDPARTY_ROOT=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100/SimGear -DBOOST_ROOT=%WORKSPACE%/Boost
 cmake --build . --config Release --target INSTALL
 
 cd ..\build-fg
-cmake ..\flightgear -G "Visual Studio 10" -DMSVC_3RDPARTY_ROOT=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100/FlightGear -DFLTK_FLUID_EXECUTABLE=%WORKSPACE%/3rdParty/bin/fluid.exe
+cmake ..\flightgear -G "Visual Studio 10" -DMSVC_3RDPARTY_ROOT=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100/FlightGear -DFLTK_FLUID_EXECUTABLE=%WORKSPACE%/3rdParty/bin/fluid.exe -DBOOST_ROOT=%WORKSPACE%/Boost
+cmake --build . --config Release --target INSTALL
+
+cd ..\build-fgrun
+cmake ..\fgrun -G "Visual Studio 10" -DMSVC_3RDPARTY_ROOT:PATH=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100/FGRun -DFLTK_FLUID_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/fluid.exe -DGETTEXT_MSGFMT_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/msgfmt.exe -DGETTEXT_MSGMERGE_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/msgmerge.exe -DBOOST_ROOT=%WORKSPACE%/Boost
 cmake --build . --config Release --target INSTALL

hudson_win_build64.bat

@@ -1,15 +1,20 @@
 
 IF NOT DEFINED WORKSPACE SET WORKSPACE=%~dp0
 
-ECHO #define SIMGEAR_VERSION "2.8.0" > %WORKSPACE%\simgear\simgear\version.h
+ECHO #define SIMGEAR_VERSION "2.9.0" > %WORKSPACE%\simgear\simgear\version.h
 rem set PATH=%PATH%;D:\Program Files (x86)\CMake 2.8\bin
 rem call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" amd64
 md build-sg64
 md build-fg64
+md build-fgrun64
 cd build-sg64
-cmake ..\SimGear -G "Visual Studio 10 Win64" -DMSVC_3RDPARTY_ROOT=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100-64/SimGear
+cmake ..\SimGear -G "Visual Studio 10 Win64" -DMSVC_3RDPARTY_ROOT=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100-64/SimGear -DBOOST_ROOT=%WORKSPACE%/Boost
 cmake --build . --config Release --target INSTALL
 
 cd ..\build-fg64
-cmake ..\flightgear -G "Visual Studio 10 Win64" -DMSVC_3RDPARTY_ROOT=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100-64/FlightGear -DFLTK_FLUID_EXECUTABLE=%WORKSPACE%/3rdParty/bin/fluid.exe
+cmake ..\flightgear -G "Visual Studio 10 Win64" -DMSVC_3RDPARTY_ROOT=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100-64/FlightGear -DFLTK_FLUID_EXECUTABLE=%WORKSPACE%/3rdParty/bin/fluid.exe -DBOOST_ROOT=%WORKSPACE%/Boost -DWITH_FGPANEL=OFF -DENABLE_PROFILE=OFF
+cmake --build . --config Release --target INSTALL
+
+cd ..\build-fgrun64
+cmake ..\fgrun -G "Visual Studio 10 Win64" -DMSVC_3RDPARTY_ROOT:PATH=%WORKSPACE% -DCMAKE_INSTALL_PREFIX:PATH=%WORKSPACE%/install/msvc100-64/FGRun -DFLTK_FLUID_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/fluid.exe -DGETTEXT_MSGFMT_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/msgfmt.exe -DGETTEXT_MSGMERGE_EXECUTABLE:FILEPATH=%WORKSPACE%/3rdParty/bin/msgmerge.exe -DBOOST_ROOT=%WORKSPACE%/Boost
 cmake --build . --config Release --target INSTALL