download_and_compile.sh: ignore errors when creating branches

Branches may already exist, errors must be properly since the "-e" flag
is set to abort the script on any errors.
Thanks to Francesco for testing.

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "simgear"]
 	path = simgear
-	url = http://git.gitorious.org/fg/simgear.git
+	url = git://gitorious.org/fg/simgear.git
 [submodule "flightgear"]
 	path = flightgear
-	url = http://git.gitorious.org/fg/flightgear.git
+	url = git://gitorious.org/fg/flightgear.git

FlightGear.iss

@@ -92,12 +92,26 @@ Source: "{#OSGInstallDir}\bin\ot12-OpenThreads.dll"; DestDir: "{app}\bin\Win32"
 
 Source: "{#OSGPluginsDir}\osgdb_ac.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
 Source: "{#OSGPluginsDir}\osgdb_osg.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
+Source: "{#OSGPluginsDir}\osgdb_osga.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
 Source: "{#OSGPluginsDir}\osgdb_3ds.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
 Source: "{#OSGPluginsDir}\osgdb_mdl.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
 Source: "{#OSGPluginsDir}\osgdb_jpeg.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
 Source: "{#OSGPluginsDir}\osgdb_rgb.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
 Source: "{#OSGPluginsDir}\osgdb_png.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
+Source: "{#OSGPluginsDir}\osgdb_dds.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
 Source: "{#OSGPluginsDir}\osgdb_txf.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
+Source: "{#OSGPluginsDir}\osgdb_serializers_osg.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
+Source: "{#OSGPluginsDir}\osgdb_serializers_osganimation.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
+Source: "{#OSGPluginsDir}\osgdb_serializers_osgfx.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
+Source: "{#OSGPluginsDir}\osgdb_serializers_osgmanipulator.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
+Source: "{#OSGPluginsDir}\osgdb_serializers_osgparticle.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
+Source: "{#OSGPluginsDir}\osgdb_serializers_osgshadow.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
+Source: "{#OSGPluginsDir}\osgdb_serializers_osgsim.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
+Source: "{#OSGPluginsDir}\osgdb_serializers_osgterrain.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
+Source: "{#OSGPluginsDir}\osgdb_serializers_osgtext.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
+Source: "{#OSGPluginsDir}\osgdb_serializers_osgvolume.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
+Source: "{#OSGPluginsDir}\osgdb_deprecated_osg.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
+Source: "{#OSGPluginsDir}\osgdb_deprecated_osgparticle.dll"; DestDir: "{app}\bin\Win32\osgPlugins-{#OSGVersion}"
 
 Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osg.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist
 Source: "{#OSG64InstallDir}\bin\osg{#OSGSoNumber}-osgDB.dll"; DestDir: "{app}\bin\Win64"; Flags: skipifsourcedoesntexist
@@ -113,12 +127,26 @@ Source: "{#OSG64InstallDir}\bin\ot12-OpenThreads.dll"; DestDir: "{app}\bin\Win64
 
 Source: "{#OSG64PluginsDir}\osgdb_ac.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
 Source: "{#OSG64PluginsDir}\osgdb_osg.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
+Source: "{#OSG64PluginsDir}\osgdb_osga.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
 Source: "{#OSG64PluginsDir}\osgdb_3ds.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
 Source: "{#OSG64PluginsDir}\osgdb_mdl.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
 Source: "{#OSG64PluginsDir}\osgdb_jpeg.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
 Source: "{#OSG64PluginsDir}\osgdb_rgb.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
 Source: "{#OSG64PluginsDir}\osgdb_png.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
+Source: "{#OSG64PluginsDir}\osgdb_dds.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
 Source: "{#OSG64PluginsDir}\osgdb_txf.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
+Source: "{#OSG64PluginsDir}\osgdb_serializers_osg.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
+Source: "{#OSG64PluginsDir}\osgdb_serializers_osganimation.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
+Source: "{#OSG64PluginsDir}\osgdb_serializers_osgfx.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
+Source: "{#OSG64PluginsDir}\osgdb_serializers_osgmanipulator.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
+Source: "{#OSG64PluginsDir}\osgdb_serializers_osgparticle.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
+Source: "{#OSG64PluginsDir}\osgdb_serializers_osgshadow.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
+Source: "{#OSG64PluginsDir}\osgdb_serializers_osgsim.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
+Source: "{#OSG64PluginsDir}\osgdb_serializers_osgterrain.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
+Source: "{#OSG64PluginsDir}\osgdb_serializers_osgtext.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
+Source: "{#OSG64PluginsDir}\osgdb_serializers_osgvolume.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
+Source: "{#OSG64PluginsDir}\osgdb_deprecated_osg.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
+Source: "{#OSG64PluginsDir}\osgdb_deprecated_osgparticle.dll"; DestDir: "{app}\bin\Win64\osgPlugins-{#OSGVersion}"; Flags: skipifsourcedoesntexist
 
 [Dirs]
 ; Make the user installable scenery directory

download_and_compile.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 #* Written by Francesco Angelo Brisa, started January 2008.
 #
-# Copyright (C) 2008 Francesco Angelo Brisa - http://brisa.homelinux.net
-# email: francesco@brisa.homelinux.net   -   fbrisa@yahoo.it
+# Copyright (C) 2008 Francesco Angelo Brisa
+# email: fbrisa@gmail.com   -   fbrisa@yahoo.it
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-VERSION="1.2"
+VERSION="1.4.3"
 
 #COMPILE GIT FGFS
 
@@ -46,9 +46,11 @@ DOWNLOAD="y"
 
 
 JOPTION=""
+OOPTION=""
 DEBUG=""
+WITH_EVENT_INPUT=""
 
-while getopts "suhc:p:a:d:r:j:g" OPTION
+while getopts "suhc:p:a:d:r:j:O:ge" OPTION
 do
      case $OPTION in
          s)
@@ -78,11 +80,19 @@ do
          j)
              JOPTION=" -j"$OPTARG" "
              ;;
+	 O)
+	    OOPTION=" -O"$OPTARG" "
+	    ;;
          g)
              DEBUG="CXXFLAGS=-g"
              ;;
+         e)
+             WITH_EVENT_INPUT="--with-eventinput"
+             ;;
+
+
          ?)
-             echo "errore"
+             echo "error"
              WHATTOBUILD="--help"
              #exit
              ;;
@@ -109,18 +119,28 @@ fi
 
 
 #######################################################
-# Last stable revision: currently FlightGear 2.0 with OSG 2.8.3
+# Last stable revision: currently FlightGear 2.4.0 with 3.0.1
 PLIB_STABLE_REVISION="2163"
-OSG_STABLE_REVISION="http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags/OpenSceneGraph-2.8.3"
-SIMGEAR_STABLE_REVISION="937297561fcc4daadedd1f7c49efd39291ebd5df"
-FGFS_STABLE_REVISION="a5017f218fe68fbfb05cfef9e85214b198ed8f0b"
-FGFS_DATA_STABLE_REVISION="061d4ec7f7037e4c71f7163d38d443e59225f399"
-FGRUN_STABLE_REVISION="554"
+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.4.0"
+
+# unstable branch: next for sg/fg, master for fgdata
+FGSG_UNSTABLE_GIT_BRANCH="next"
+FGDATA_UNSTABLE_GIT_BRANCH="master"
+
+# stable GIT revision: release tag
+SIMGEAR_STABLE_REVISION="version/2.4.0-final"
+FGFS_STABLE_REVISION="version/2.4.0-final"
+FGFS_DATA_STABLE_REVISION="version/2.4.0-final"
+
+FGRUN_STABLE_REVISION="625"
 FGCOM_STABLE_REVISION="234"
 FGCOMGUI_STABLE_REVISION="46"
 
-# Current developer revision: latest FlightGear GIT (2.3.0) with OSG 2.9.9
-OSG_UNSTABLE_REVISION="http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags/OpenSceneGraph-2.9.9"
+# Current developer revision: latest FlightGear GIT (2.5.0) with OSG 3.0.1
+OSG_UNSTABLE_REVISION="http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags/OpenSceneGraph-3.0.1"
 
 #######################################################
 # set script to stop if an error occours
@@ -132,19 +152,21 @@ if [ "$WHATTOBUILD" = "--help" ]
 then
 	echo "$0 Version $VERSION"
 	echo "Usage:"
-	echo "./$0 [-u] [-h] [-s] [-a y|n] [-c y|n] [-p y|n] [-d y|n] [-r y|n] [ALL|PLIB|OSG|SIMGEAR|FGFS|FGRUN|FGCOM|FGCOMGUI|ATLAS] [UPDATE]"
+	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|FGRUN|FGCOM|FGCOMGUI|ATLAS] [UPDATE]"
 	echo "* without options it recompiles: PLIB,OSG,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 "* -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"
 	echo "* -c y|n  y=compile programs  n=do not compile programs                     	default=y"
 	echo "* -d y|n  y=fetch programs from internet (cvs, svn, etc...)  n=do not fetch 	default=y"
-	echo "* -j X    Add -jX to the make compiolation                                  	default=None"
+	echo "* -j X    Add -jX to the make compilation		                             	default=None"
+	echo "* -O X    Add -OX to the make compilation	           				default=None"
 	echo "* -r y|n  y=reconfigure programs before compiling them  n=do not reconfigure	default=y"
 	echo "* -s compile only last stable known versions					default=y"
 	
@@ -159,7 +181,7 @@ fi
 echo "**************************************"
 echo "*                                    *"
 echo "* Warning, the compilation process   *"
-echo "* is going to use 7 or more Gbytes   *"
+echo "* is going to use 9 or more Gbytes   *"
 echo "* of space and at least a couple of  *"
 echo "* hours to download and build FG.    *"
 echo "*                                    *"
@@ -220,6 +242,7 @@ echo "COMPILE=$COMPILE" >> $LOGFILE
 echo "RECONFIGURE=$RECONFIGURE" >> $LOGFILE
 echo "DOWNLOAD=$DOWNLOAD" >> $LOGFILE
 echo "JOPTION=$JOPTION" >> $LOGFILE
+echo "OOPTION=$OOPTION" >> $LOGFILE
 echo "DEBUG=$DEBUG" >> $LOGFILE
 
 
@@ -394,8 +417,8 @@ then
 		if [ "$COMPILE" = "y" ]
 		then
 			echo "MAKE plib" >> $LOGFILE
-			echo "make $JOPTION" >> $LOGFILE
-			make $JOPTION 2>&1 | tee -a $LOGFILE
+			echo "make $JOPTION $OOPTION" >> $LOGFILE
+			make $JOPTION $OOPTION 2>&1 | tee -a $LOGFILE
 			
 	
 			if [ ! -d $INSTALL_DIR_PLIB ]
@@ -429,7 +452,7 @@ then
 	echo "****************************************" | tee -a $LOGFILE
 
 	OSG_SVN=$OSG_UNSTABLE_REVISION
-	if [ "$STABLE" = "STABLE"  -o "Y" = "Y" ]
+	if [ "$STABLE" = "STABLE" ]
 	then
 		OSG_SVN=$OSG_STABLE_REVISION
 	fi
@@ -462,7 +485,7 @@ then
 	if [ "$COMPILE" = "y" ]
 	then
 		echo "COMPILING OSG" >> $LOGFILE
-		make $JOPTION 2>&1 | tee -a $LOGFILE
+		make $JOPTION $OOPTION 2>&1 | tee -a $LOGFILE
 	
 		if [ ! -d $INSTALL_DIR_OSG ]
 		then
@@ -525,16 +548,27 @@ then
 
 		cd simgear
 
+		git fetch origin
 		if [ "$STABLE" = "STABLE" ]
 		then
-			git pull origin
+			# switch to stable branch
+			# create local stable branch, ignore errors if it exists
+			git branch -f $FGSG_STABLE_GIT_BRANCH origin/$FGSG_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 $FGSG_STABLE_GIT_BRANCH
+			# get indicated stable version
 			git reset --hard $SIMGEAR_STABLE_REVISION
+		else
+			# switch to unstable branch
+			# create local unstable branch, ignore errors if it exists
+			git branch -f $FGSG_UNSTABLE_GIT_BRANCH origin/$FGSG_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 $FGSG_UNSTABLE_GIT_BRANCH
+			# pull latest version from the unstable branch
+			git pull
 		fi
 
-		git pull
 		cd ..	
-		
-
 
 		echo " OK" >> $LOGFILE
 		cd ..
@@ -559,8 +593,8 @@ then
 	if [ "$COMPILE" = "y" ]
 	then
 		echo "MAKE SIMGEAR" >> $LOGFILE
-		echo "make $JOPTION" >> $LOGFILE
-		make $JOPTION 2>&1 | tee -a $LOGFILE
+		echo "make $JOPTION $OOPTION " >> $LOGFILE
+		make $JOPTION $OOPTION 2>&1 | tee -a $LOGFILE
 
 		echo "INSTALL SIMGEAR" >> $LOGFILE
 		make install 2>&1 | tee -a $LOGFILE
@@ -610,14 +644,26 @@ then
 
 			cd flightgear
 
+			git fetch origin
 			if [ "$STABLE" = "STABLE" ]
 			then
-				git pull origin
+				# switch to stable branch
+				# create local stable branch, ignore errors if it exists
+				git branch -f $FGSG_STABLE_GIT_BRANCH origin/$FGSG_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 $FGSG_STABLE_GIT_BRANCH
+				# get indicated stable version
 				git reset --hard $FGFS_STABLE_REVISION
+			else
+				# switch to unstable branch
+				# create local unstable branch, ignore errors if it exists
+				git branch -f $FGSG_UNSTABLE_GIT_BRANCH origin/$FGSG_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 $FGSG_UNSTABLE_GIT_BRANCH
+				# pull latest version from the unstable branch
+				git pull
 			fi
 
-
-			git pull
 			cd ..	
 
 			echo " OK" >> $LOGFILE
@@ -634,16 +680,16 @@ then
 				./autogen.sh 2>&1 | tee -a $LOGFILE
 
 				echo "CONFIGURE FGFS" >> $LOGFILE
-			   echo ./configure "$DEBUG" --with-eventinput --prefix=$INSTALL_DIR_FGFS --exec-prefix=$INSTALL_DIR_FGFS --with-osg="$INSTALL_DIR_OSG" --with-simgear="$INSTALL_DIR_SIMGEAR" --with-plib="$INSTALL_DIR_PLIB" 
-				./configure "$DEBUG" --with-eventinput --prefix=$INSTALL_DIR_FGFS --exec-prefix=$INSTALL_DIR_FGFS --with-osg="$INSTALL_DIR_OSG" --with-simgear="$INSTALL_DIR_SIMGEAR" --with-plib="$INSTALL_DIR_PLIB" 2>&1 | tee -a $LOGFILE
+			   echo ./configure "$DEBUG" $WITH_EVENT_INPUT --prefix=$INSTALL_DIR_FGFS --exec-prefix=$INSTALL_DIR_FGFS --with-osg="$INSTALL_DIR_OSG" --with-simgear="$INSTALL_DIR_SIMGEAR" --with-plib="$INSTALL_DIR_PLIB" 
+				./configure "$DEBUG" $WITH_EVENT_INPUT --prefix=$INSTALL_DIR_FGFS --exec-prefix=$INSTALL_DIR_FGFS --with-osg="$INSTALL_DIR_OSG" --with-simgear="$INSTALL_DIR_SIMGEAR" --with-plib="$INSTALL_DIR_PLIB" 2>&1 | tee -a $LOGFILE
 			fi
 		fi
 		
 		if [ "$COMPILE" = "y" ]
 		then
 			echo "MAKE FGFS" >> $LOGFILE
-			echo "make $JOPTION" >> $LOGFILE
-			make $JOPTION 2>&1 | tee -a $LOGFILE
+			echo "make $JOPTION $OOPTION" >> $LOGFILE
+			make $JOPTION $OOPTION 2>&1 | tee -a $LOGFILE
 
 			echo "INSTALL FGFS" >> $LOGFILE
 			make install 2>&1 | tee -a $LOGFILE
@@ -666,21 +712,36 @@ then
 				#cvs -z5 -d :pserver:cvsguest@cvs.flightgear.org:/var/cvs/FlightGear-0.9 co data
 
 				if [ -d "fgdata" ]
-                                then
-                                        cd fgdata
-
-					if [ "$STABLE" = "STABLE" ]
-					then
-						git pull origin
-						git reset --hard $FGFS_DATA_STABLE_REVISION
-					fi
-
-                                        git pull
-                                        cd ..
-                                else
+				then
+					echo "fgdata exists already."
+				else
+					# no repository yet - need to clone a fresh one
 					git clone git://gitorious.org/fg/fgdata.git
-                                fi
+				fi
 
+				cd fgdata
+
+				git fetch origin
+				if [ "$STABLE" = "STABLE" ]
+				then
+					# switch to stable branch
+					# create local stable branch, ignore errors if it exists
+					git branch -f $FGSG_STABLE_GIT_BRANCH origin/$FGSG_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 $FGSG_STABLE_GIT_BRANCH
+					# get indicated stable version
+					git reset --hard $FGFS_DATA_STABLE_REVISION
+				else
+					# switch to unstable branch
+					# create local unstable branch, ignore errors if it exists
+					git branch -f $FGDATA_UNSTABLE_GIT_BRANCH origin/$FGDATA_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 $FGDATA_UNSTABLE_GIT_BRANCH
+					# pull latest version from the unstable branch
+					git pull
+				fi
+
+				cd ..
 
 				echo " OK" >> $LOGFILE
 				cd "$EXDIR"
@@ -788,8 +849,8 @@ then
 	if [ "$COMPILE" = "y" ]
 	then
 		echo "MAKE FGRUN" >> $LOGFILE
-		echo "make $JOPTION" >> $LOGFILE
-		make $JOPTION 2>1 | tee -a $LOGFILE
+		echo "make $JOPTION $OOPTION" >> $LOGFILE
+		make $JOPTION $OOPTION 2>1 | tee -a $LOGFILE
 
 		echo "INSTALL FGRUN" >> $LOGFILE
 		make install 2>&1 | tee -a $LOGFILE
@@ -849,6 +910,7 @@ then
 	
 	if [ "$RECONFIGURE" = "y" ]
 	then
+        cp Makefile Makefile.original
 		cat Makefile | sed s/\\//MY_SLASH_HERE/g > Makefile_NOSLASHES
 	
 	
@@ -856,7 +918,7 @@ then
 	
 		# 1
 		INSTALL_DIR_PLIB_NO_SLASHES=$(echo "$INSTALL_DIR_PLIB" | sed -e 's/\//MY_SLASH_HERE/g')
-		cat Makefile_NOSLASHES | sed s/PLIB_PREFIX:=MY_SLASH_HEREusrMY_SLASH_HERElocalMY_SLASH_HEREsrcMY_SLASH_HEREfgfs-builderMY_SLASH_HEREinstall/PLIB_PREFIX:=$INSTALL_DIR_PLIB_NO_SLASHES/g > Makefile_temp
+		cat Makefile_NOSLASHES | sed s/PLIB_PREFIX\ *:=\ *MY_SLASH_HEREusrMY_SLASH_HERElocalMY_SLASH_HEREsrcMY_SLASH_HEREfgfs-builderMY_SLASH_HEREinstall/PLIB_PREFIX\ :=\ $INSTALL_DIR_PLIB_NO_SLASHES/g > Makefile_temp
 		mv -f Makefile_temp Makefile_NOSLASHES
 	
 		#2
@@ -864,7 +926,7 @@ then
 		CXXFLAGS2=$CXXFLAGS" -I $INSTALL_DIR_SIMGEAR/include -I $INSTALL_DIR_OSG/include" 
 		CXXFLAGS3=$(echo $CXXFLAGS2 | sed s/\\//MY_SLASH_HERE/g)
 	
-		cat Makefile_NOSLASHES | sed s/^CXXFLAGS.*/"$CXXFLAGS3"/g  > Makefile_temp
+		cat Makefile_NOSLASHES | sed s/^CXXFLAGS\ *:=.*/"$CXXFLAGS3"/g  > Makefile_temp
 		mv -f Makefile_temp Makefile_NOSLASHES	
 	
 		#3
@@ -879,10 +941,10 @@ then
 		INSTALL_DIR_FGCOM_NO_SLASHS=$(echo "$INSTALL_DIR_FGCOM" | sed -e 's/\//MY_SLASH_HERE/g')
 		INSTALL_BIN_FGCOM_NO_SLASHS="$INSTALL_DIR_FGCOM_NO_SLASHS""MY_SLASH_HEREbin"
 	
-		cat Makefile_NOSLASHES | sed s/INSTALL_BIN:=MY_SLASH_HEREusrMY_SLASH_HERElocalMY_SLASH_HEREbin/INSTALL_BIN:=$INSTALL_BIN_FGCOM_NO_SLASHS/g > Makefile_temp		
+		cat Makefile_NOSLASHES | sed s/INSTALL_BIN\ *:=\ *MY_SLASH_HEREusrMY_SLASH_HERElocalMY_SLASH_HEREbin/INSTALL_BIN\ :=\ $INSTALL_BIN_FGCOM_NO_SLASHS/g > Makefile_temp		
 		mv -f Makefile_temp Makefile_NOSLASHES	
 	
-		cat Makefile_NOSLASHES | sed s/INSTALL_DIR:=MY_SLASH_HEREusrMY_SLASH_HERElocal/INSTALL_DIR:=$INSTALL_DIR_FGCOM_NO_SLASHS/g > Makefile_temp		
+		cat Makefile_NOSLASHES | sed s/INSTALL_DIR\ *:=\ *MY_SLASH_HEREusrMY_SLASH_HERElocal/INSTALL_DIR\ :=\ $INSTALL_DIR_FGCOM_NO_SLASHS/g > Makefile_temp		
 		mv -f Makefile_temp Makefile_NOSLASHES	
 		
 	
@@ -898,8 +960,8 @@ then
 	if [ "$COMPILE" = "y" ]
 	then
 		echo "MAKE FGCOM" >> $LOGFILE
-		echo "make $JOPTION" >> $LOGFILE
-		make $JOPTION 2>&1 | tee -a $LOGFILE
+		echo "make $JOPTION $OOPTION" >> $LOGFILE
+		make $JOPTION $OOPTION 2>&1 | tee -a $LOGFILE
 
 		echo "INSTALL FGCOM" >> $LOGFILE
 		make install 2>&1 | tee -a $LOGFILE
@@ -1006,7 +1068,11 @@ then
 		#patch -p0 < atlas-CVS.diff
 		#cd ..
 		#echo " OK" >> $LOGFILE
-
+        echo "fixing old function name \".get_gbs_center2(\" in Subbucket.cxx"
+        cd Atlas/src
+        cp Subbucket.cxx Subbucket.cxx.original
+        cat Subbucket.cxx.original | sed s/\.get_gbs_center2\(/\.get_gbs_center\(/g > Subbucket.cxx
+        cd "$CBD"
 	fi
 	cd Atlas
 	#cd Atlas-0.3.0
@@ -1025,8 +1091,8 @@ then
 	if [ "$COMPILE" = "y" ]
 	then
 		echo "MAKE ATLAS" >> $LOGFILE
-		echo "make $JOPTION" >> $LOGFILE
-		make $JOPTION 2>&1 | tee -a $LOGFILE
+		echo "make $JOPTION $OOPTION" >> $LOGFILE
+		make $JOPTION $OOPTION 2>&1 | tee -a $LOGFILE
 
 		echo "INSTALL ATLAS" >> $LOGFILE
 		make install 2>&1 | tee -a $LOGFILE

hudson_build_release.sh

@@ -1,6 +1,10 @@
 #!/bin/sh
 
-cd simgear
+
+pushd simgear
+
+SG_VERSION=$(cat version)
+
 ./autogen.sh
 ./configure --prefix=$WORKSPACE/dist --with-osg=$WORKSPACE/dist
 
@@ -16,7 +20,11 @@ make dist
 
 echo "Starting on FlightGear"
 
-cd ../flightgear
+popd
+pushd flightgear
+
+FG_VERSION=$(cat version)
+
 ./autogen.sh
 ./configure --prefix=$WORKSPACE/dist --with-osg=$WORKSPACE/dist
 make
@@ -28,3 +36,12 @@ fi
 
 make install
 make dist
+
+popd
+
+# create output directory, suitable for archiving / uploading
+rm -rf output
+mkdir -p output/${FG_VERSION}
+mv simgear/simgear-${SG_VERSION}.tar.bz2 output/${FG_VERSION}/
+mv flightgear/flightgear-${FG_VERSION}.tar.bz2 output/${FG_VERSION}/
+

hudson_mac_package_release.rb

@@ -56,7 +56,10 @@ osgPluginsDir=contents+"/PlugIns/osgPlugins-#{osgVersion}"
 fgVersion = File.read("#{srcDir}/version").strip
 volName="\"FlightGear #{fgVersion}\""
 
-dmgPath = Dir.pwd + "/fg_mac_#{fgVersion}.dmg"
+dmgOutDir = Dir.pwd + "/output"
+dmgPath = "#{dmgOutDir}/#{fgVersion}/fg_mac_#{fgVersion}.dmg"
+`rm -rf #{dmgOutDir}`
+`mkdir -p #{dmgOutDir}/#{fgVersion}`
 
 puts "Creating directory structure"
 `mkdir -p #{macosDir}`
@@ -115,5 +118,4 @@ puts "Creating DMG"
 
 createArgs = "-format UDBZ -imagekey bzip2-level=9 -quiet -volname #{volName}"
 
-`rm #{dmgPath}`
 `hdiutil create -srcfolder #{dmgDir} #{createArgs} #{dmgPath}`

hudson_win_build32.bat

@@ -1,9 +1,7 @@
-
 IF NOT DEFINED WORKSPACE SET WORKSPACE=%~dp0
 
-ECHO #define SIMGEAR_VERSION "2.2.0" > %WORKSPACE%\simgear\simgear\version.h
-cd %WORKSPACE%\simgear\projects\VC90
-msbuild SimGear.vcproj /p:Configuration=Release /m
+SET /P SIMGEAR_VERSION=<%WORKSPACE%\simgear\version
+ECHO #define SIMGEAR_VERSION "%SIMGEAR_VERSION%" > %WORKSPACE%\simgear\simgear\version.h
 
 cd %WORKSPACE%\flightgear
 call scripts\tools\version.bat

hudson_win_build64.bat

@@ -1,9 +1,7 @@
-
 IF NOT DEFINED WORKSPACE SET WORKSPACE=%~dp0
 
-ECHO #define SIMGEAR_VERSION "2.2.0" > %WORKSPACE%\simgear\simgear\version.h
-cd %WORKSPACE%\simgear\projects\VC90
-msbuild SimGear.vcproj /p:Configuration=Release /p:Platform=x64
+SET /P SIMGEAR_VERSION=<%WORKSPACE%\simgear\version
+ECHO #define SIMGEAR_VERSION "%SIMGEAR_VERSION%" > %WORKSPACE%\simgear\simgear\version.h
 
 cd %WORKSPACE%\flightgear
 call scripts\tools\version.bat