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.
Maclauncher: No 32-bit anymore!
2013-01-04 14:37:55 +00:00 · 2013-01-04 12:06:26 +00:00 · 2013-01-04 10:43:24 +00:00 · 2013-01-04 10:40:43 +00:00 · 2013-01-04 10:37:42 +00:00 · 2012-12-20 08:46:41 +01:00
15 changed files with 627 additions and 166 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,6 @@ Output
 output
 fgBuild
 sgBuild
+image
+macflightgear
+fgdata
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +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
--- a/FlightGear.iss
+++ b/FlightGear.iss
@@ -46,7 +46,7 @@ DefaultDirName={pf}\FlightGear
 DefaultGroupName=FlightGear {#FGVersion}
 LicenseFile=X:\flightgear\COPYING
 Uninstallable=yes
-SetupIconFile=X:\flightgear\projects\VC90\flightgear.ico
+SetupIconFile=X:\flightgear\package\flightgear.ico
 VersionInfoVersion={#FGVersion}.0
 WizardImageFile=X:\flightgear\package\Win32-Inno\setupimg.bmp
 WizardImageStretch=No
@@ -211,8 +211,8 @@ filename: "{app}\bin\Win64\vcredist_x64.exe"; WorkingDir: "{app}\bin\Win64"; Par
 filename: "{app}\bin\Win32\oalinst.exe"; WorkingDir: "{app}\bin\Win32"; Description: "Installing OpenAL"; Check: IsTaskSelected('insoal') and FileExists(ExpandConstant('{app}\bin\Win32\oalinst.exe'))

 ; Put installation directory into the fgrun.prefs
-filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}\bin\Win32"; Parameters: "--silent ""--fg-exe={app}\bin\Win32\fgfs.exe"" ""--ts-exe={app}\bin\Win32\terrasync.exe"" ""--fg-root={app}\data"" ""--fg-scenery={app}\data\Scenery;{app}\scenery;{code:TerrasyncDir}"" --ts-dir=3"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
-filename: "{app}\bin\Win64\fgrun.exe"; WorkingDir: "{app}\bin\Win64"; Parameters: "--silent ""--fg-exe={app}\bin\Win64\fgfs.exe"" ""--ts-exe={app}\bin\Win32\terrasync.exe"" ""--fg-root={app}\data"" ""--fg-scenery={app}\data\Scenery;{app}\scenery;{code:TerrasyncDir}"" --ts-dir=3"; Check: Is64BitInstallMode and not IsTaskSelected('force32')
+filename: "{app}\bin\Win32\fgrun.exe"; WorkingDir: "{app}\bin\Win32"; Parameters: "--silent ""--fg-exe={app}\bin\Win32\fgfs.exe"" ""--ts-exe={app}\bin\Win32\terrasync.exe"" ""--fg-root={app}\data"" ""--fg-scenery={app}\data\Scenery;{app}\scenery;{code:TerrasyncDir}"" --ts-dir=3 --version={#FGVersion}"; Check: not Is64BitInstallMode or IsTaskSelected('force32')
+filename: "{app}\bin\Win64\fgrun.exe"; WorkingDir: "{app}\bin\Win64"; Parameters: "--silent ""--fg-exe={app}\bin\Win64\fgfs.exe"" ""--ts-exe={app}\bin\Win32\terrasync.exe"" ""--fg-root={app}\data"" ""--fg-scenery={app}\data\Scenery;{app}\scenery;{code:TerrasyncDir}"" --ts-dir=3 --version={#FGVersion}"; Check: Is64BitInstallMode and not IsTaskSelected('force32')

 ; Put installation and source directories into the fgadmin.prefs
 filename: "{app}\bin\Win32\fgadmin.exe"; WorkingDir: "{app}\bin\Win32"; Parameters: "--silent ""--install-source={src}\..\Scenery"" ""--scenery-dest={app}\scenery"""
--- a/Info.plist.in
+++ b/Info.plist.in
@@ -2,12 +2,14 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>English</string>
 	<key>CFBundleIconFile</key>
 	<string>FlightGear.icns</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>
-	<string>FlightGear nightly build</string>
+	<string>FlightGear, the open-source flight simulator, <%= fgVersion %>. ©1996-<%= fgCurrentYear%>, The FlightGear Project</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>
@@ -19,11 +21,13 @@
 	<key>CFBundleShortVersionString</key>
 	<string><%= fgVersion %></string>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.5.0</string>
+	<string>10.6.0</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+    <key>NSHumanReadableCopyright</key>
+    <string>©1996-<%= fgCurrentYear%>, The FlightGear Project</string>
 </dict>
 </plist>

--- a/base-package.rules
+++ b/base-package.rules
@@ -0,0 +1,38 @@
+- .git
+- *.xcf
+- *.tex
+
+ /fgdata/Aircraft/Generic
+ /fgdata/Aircraft/Instruments
+ /fgdata/Aircraft/Instruments-3d
+
+ /fgdata/Aircraft/UIUC
+ /fgdata/Aircraft/c172p
+ /fgdata/Aircraft/777
+ /fgdata/Aircraft/777-200
+ /fgdata/Aircraft/b1900d
+ /fgdata/Aircraft/ufo
+ /fgdata/Aircraft/CitationX
+ /fgdata/Aircraft/ZLT-NT
+ /fgdata/Aircraft/dhc2
+ /fgdata/Aircraft/Cub
+ /fgdata/Aircraft/sopwithCamel
+ /fgdata/Aircraft/f-14b
+ /fgdata/Aircraft/ASK13
+ /fgdata/Aircraft/bo105
+ /fgdata/Aircraft/Dragonfly
+ /fgdata/Aircraft/SenecaII
+ /fgdata/Aircraft/A6M2
+
+- /fgdata/Aircraft/*
+
+- /fgdata/Textures.high/*.new
+- /fgdata/Textures.high/*.orig
+- /fgdata/Textures.high/*.save
+- /fgdata/Textures/Unused
+- /fgdata/Textures/*.orig
+- /fgdata/Docs/source
+- /fgdata/Models/Airspace
+- /fgdata/Models/MNUAV
+
+
--- a/download_and_compile.sh
+++ b/download_and_compile.sh
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.


-VERSION="1.7"
+VERSION="1.9-4"

 #COMPILE GIT FGFS

@@ -27,6 +27,9 @@ VERSION="1.7"
 #######################################################
 # Special thanks to Alessandro Garosi for FGComGui and 
 # other patches
+# 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 



@@ -49,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)
@@ -89,6 +93,9 @@ do
         e)
             WITH_EVENT_INPUT="--with-eventinput"
             ;;
+         i)
+             WITH_OPENRTI="-D ENABLE_RTI=ON"
+             ;;


         ?)
@@ -120,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.4.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.4.0-final"
-FGFS_STABLE_REVISION="version/2.4.0-final"
-FGFS_DATA_STABLE_REVISION="version/2.4.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="625"
-FGCOM_STABLE_REVISION="234"
+# FGCOM
+FGCOM_UNSTABLE_GIT_BRANCH="master"
 FGCOMGUI_STABLE_REVISION="46"

 # Current developer revision: latest FlightGear GIT (2.5.0) with OSG 3.0.1
@@ -152,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"
@@ -181,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 "*                                    *"
@@ -256,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 "
+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 libboost1.46-dev libapr1-dev"
-DEBIAN_PACKAGES="freeglut3-dev libjpeg8-dev libjpeg8 libboost1.46-dev"
+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"
@@ -344,6 +357,10 @@ SUB_INSTALL_DIR=install
 INSTALL_DIR=$CBD/$SUB_INSTALL_DIR


+cd "$CBD"
+mkdir -p build
+
+
 #######################################################
 # PLIB
 #######################################################
@@ -354,7 +371,6 @@ INSTALL_DIR_PLIB=$INSTALL_DIR/$PLIB_INSTALL_DIR
 cd "$CBD"

 #svn co http://plib.svn.sourceforge.net/svnroot/plib/trunk plib
-#cd plib

 if [ "$WHATTOBUILD" = "" -o "$WHATTOBUILD" = "PLIB" -o "$WHATTOBUILD" = "ALL" ]
 then
@@ -368,27 +384,13 @@ then
 		echo "INSTALL_DIR_PLIB=$INSTALL_DIR_PLIB" >> $LOGFILE


-		#we rebuild plib only if not in update
-		#if [ "$DOWNLOAD" = "y" ]
-		#then
-			#echo -n "DOWNLOADING FROM http://plib.sourceforge.net/dist/plib-1.8.5.tar.gz ... " >> $LOGFILE
-			#wget -c http://plib.sourceforge.net/dist/plib-1.8.5.tar.gz
-			#echo " OK" >> $LOGFILE
-
-			#echo -n "UNPACKING plib-1.8.5.tar.gz ... " >> $LOGFILE
-			#tar zxvf plib-1.8.5.tar.gz
-			#echo " OK" >> $LOGFILE
-		#fi
-		#cd plib-1.8.5
-
-
 		PLIB_STABLE_REVISION_=""
 		if [ "$STABLE" = "STABLE" ]
+		#if [ "STABLE" = "STABLE" ]
 		then
 			PLIB_STABLE_REVISION_=" -r $PLIB_STABLE_REVISION"
 		fi

-		#we rebuild plib only if not in update, using svn version tagged 1.8.6
 		if [ "$DOWNLOAD" = "y" ]
 		then
 			if [ -d "plib/.svn" ]
@@ -400,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 
@@ -409,20 +411,31 @@ then

 		if [ "$RECONFIGURE" = "y" ]
 		then
+
+			cd "$CBD"
+			mkdir -p build/plib
+
+
+			cd plib
+
 			echo "AUTOGEN plib" >> $LOGFILE
 			./autogen.sh 2>&1 | tee  -a $LOGFILE
 			echo "CONFIGURING plib" >> $LOGFILE
-			./configure --prefix="$INSTALL_DIR_PLIB" --exec-prefix="$INSTALL_DIR_PLIB" 2>&1 | tee -a $LOGFILE
+			cd "$CBD"/build/plib
+			../../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
+
 		
 		if [ "$COMPILE" = "y" ]
 		then
+			
 			echo "MAKE plib" >> $LOGFILE
 			echo "make $JOPTION $OOPTION" >> $LOGFILE
-			make $JOPTION $OOPTION 2>&1 | tee -a $LOGFILE
 			
+			cd "$CBD"/build/plib
+			make $JOPTION $OOPTION 2>&1 | tee -a $LOGFILE
 	
 			if [ ! -d $INSTALL_DIR_PLIB ]
 			then
@@ -435,12 +448,11 @@ then
 			make install 2>&1 | tee -a $LOGFILE
 		fi

-		cd -
+		cd "$CBD"
 	fi
 fi


-
 #######################################################
 # OpenSceneGraph
 #######################################################
@@ -473,12 +485,17 @@ then
 	then
 		if [ "$RECONFIGURE" = "y" ]
 		then
+			cd "$CBD"
+			mkdir -p build/osg
+			cd "$CBD"/build/osg		
 			echo -n "RECONFIGURE OSG ... " >> $LOGFILE
-			rm -f CMakeCache.txt
-			cmake .
+			rm -f ../../OpenSceneGraph/CMakeCache.txt
+			cmake ../../OpenSceneGraph/
 			echo " OK" >> $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_OSG" . 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_OSG" ../../OpenSceneGraph/ 2>&1 | tee -a $LOGFILE
 			
 			echo "RECONFIGURE OSG DONE." >> $LOGFILE
 			
@@ -488,6 +505,7 @@ then
 	if [ "$COMPILE" = "y" ]
 	then
 		echo "COMPILING OSG" >> $LOGFILE
+		cd "$CBD"/build/osg
 		make $JOPTION $OOPTION 2>&1 | tee -a $LOGFILE
 	
 		if [ ! -d $INSTALL_DIR_OSG ]
@@ -513,6 +531,106 @@ then
 	cd -
 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
 #######################################################
@@ -584,19 +702,15 @@ then
 	then
 		if [ "$RECONFIGURE" = "y" ]
 		then
-			#echo "AUTOGEN SIMGEAR" >> $LOGFILE
-			#./autogen.sh 2>&1 | tee -a $LOGFILE
-			#echo "CONFIGURE SIMGEAR" >> $LOGFILE
-			#./configure $DEBUG --prefix="$INSTALL_DIR_SIMGEAR" --exec-prefix="$INSTALL_DIR_SIMGEAR" --with-osg="$INSTALL_DIR_OSG" --with-plib="$INSTALL_DIR_PLIB" --with-jpeg-factory --with-boost-libdir=/usr/include/boost 2>&1 | tee -a $LOGFILE

+			cd "$CBD"
+			mkdir -p build/simgear
+			cd "$CBD"/build/simgear
 			echo -n "RECONFIGURE SIMGEAR ... " >> $LOGFILE
-			rm -f 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 . 2>&1 | tee -a $LOGFILE
-
+			rm -f ../../simgear/simgear/CMakeCache.txt
+			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

-			


 		fi
@@ -604,6 +718,9 @@ then
 	
 	if [ "$COMPILE" = "y" ]
 	then
+
+
+		cd "$CBD"/build/simgear
 		echo "MAKE SIMGEAR" >> $LOGFILE
 		echo "make $JOPTION $OOPTION " >> $LOGFILE
 		make $JOPTION $OOPTION 2>&1 | tee -a $LOGFILE
@@ -694,10 +811,22 @@ then
 			   	#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

+
+	                        cd "$CBD"
+       				mkdir -p build/fgfs
+	                        cd "$CBD"/build/fgfs
+
+
 				echo -n "RECONFIGURE FGFS ... " >> $LOGFILE
-				rm -f CMakeCache.txt
+				rm -f ../../fgfs/flightgear/CMakeCache.txt
+
+				# REMOVING BAD LINES IN CMakeLists.txt
+				#echo "REMOVING BAD LINES IN CMakeLists.txt"
+				#cat utils/fgadmin/src/CMakeLists.txt  | sed /X11_Xft_LIB/d | sed /X11_Xinerama_LIB/d > utils/fgadmin/src/CMakeLists_without_err.txt
+				#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" . 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

@@ -711,6 +840,10 @@ then
 		
 		if [ "$COMPILE" = "y" ]
 		then
+                        cd "$CBD"
+                        mkdir -p build/fgfs
+                        cd "$CBD"/build/fgfs
+
 			echo "MAKE FGFS" >> $LOGFILE
 			echo "make $JOPTION $OOPTION" >> $LOGFILE
 			make $JOPTION $OOPTION 2>&1 | tee -a $LOGFILE
@@ -802,6 +935,7 @@ then
 		fi
 	fi

+	cd "$CBD"

 	# IF SEPARATED FOLDER FOR AIRCRAFTS
 	# --fg-aircraft=\$PWD/../aircrafts
@@ -809,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
@@ -819,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
@@ -834,7 +968,6 @@ ENDOFALL2

 fi

-
 #######################################################
 # FGO!
 #######################################################
@@ -872,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
 #######################################################
@@ -885,53 +1114,76 @@ 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
-
-
-		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
-
-		#echo -n "Patching fgrun ... " >> $LOGFILE
-		#cd fgrun/
 		
-		#MF=src/wizard_funcs.cxx && cat $MF | awk '{o=$0} /#include <plib\/netSocket.h>/ {o=o"\n#include <plib/sg.h>"} {print o}' > "$MF"2 && mv "$MF"2 "$MF"
-		#MF=src/AirportBrowser.cxx && cat $MF | awk '{o=$0} /#include <iomanip>/ {o=o"\n#include <math.h>"} {print o}' > "$MF"2 && mv "$MF"2 "$MF"		
-		#MF=src/run_posix.cxx && cat $MF | awk '{o=$0} /#include <string>/ {o=o"\n#include <string.h>"} {print o}' > "$MF"2 && mv "$MF"2 "$MF"		
+		cd fgrun

-		#Thanks to Brandano.....
-		#if [ ! -e "compile-fix-20100102.patch" ]
-		#then
-		#	wget http://brisa.homelinux.net/fgfs/compile-fix-20100102.patch
-		#fi
-		#patch -p0 < compile-fix-20100102.patch
-    		
-		#cd -
-	fi
-	#cd fgrun/trunk/fgrun/
-	cd fgrun/fgrun/

 	if [ ! "$UPDATE" = "UPDATE" ]
 	then
 		if [ "$RECONFIGURE" = "y" ]
 		then
-			echo "AUTOGEN FGRUN" >> $LOGFILE
-			./autogen.sh 2>&1 | tee -a $LOGFILE
-			echo "CONFIGURE FGRUN" >> $LOGFILE
+                        cd "$CBD"
+                        mkdir -p build/fgrun
+                        cd "$CBD"/build/fgrun
+
+			echo -n "RECONFIGURE FGRUN ... " >> $LOGFILE
+			rm -f ../../fgrun/CMakeCache.txt
 			
-			./configure --prefix=$INSTALL_DIR_FGRUN --exec-prefix=$INSTALL_DIR_FGRUN --with-osg="$INSTALL_DIR_OSG" --with-simgear="$INSTALL_DIR_SIMGEAR" CPPFLAGS="-I$INSTALL_DIR_PLIB/include" LDFLAGS="-L$INSTALL_DIR_PLIB/lib" 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
 	fi
 	
 	if [ "$COMPILE" = "y" ]
 	then
+		cd "$CBD"/build/fgrun
+
 		echo "MAKE FGRUN" >> $LOGFILE
 		echo "make $JOPTION $OOPTION" >> $LOGFILE
 		make $JOPTION $OOPTION 2>1 | tee -a $LOGFILE
@@ -939,7 +1191,8 @@ then
 		echo "INSTALL FGRUN" >> $LOGFILE
 		make install 2>&1 | tee -a $LOGFILE
 	fi
-	cd -
+
+	cd "$CBD"

 	SCRIPT=run_fgrun.sh
 	echo "#!/bin/sh" > $SCRIPT
@@ -979,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 ..
+		


 		
@@ -991,16 +1273,24 @@ 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
 		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
@@ -1038,20 +1328,20 @@ 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 -
+	cd "$CBD"

 	echo "#!/bin/sh" > run_fgcom.sh
 	echo "cd \$(dirname \$0)" >> run_fgcom.sh
@@ -1107,7 +1397,7 @@ then
 		echo "INSTALL FGCOM" >> $LOGFILE
 		scons install 2>&1 | tee -a $LOGFILE
 	fi
-	cd -
+	cd "$CBD"

 	echo "#!/bin/sh" > run_fgcomgui.sh
 	echo "cd \$(dirname \$0)" >> run_fgcomgui.sh
@@ -1137,22 +1427,10 @@ then

 	if [ "$DOWNLOAD" = "y" ]
 	then
-		#echo "Downloading from http://ovh.dl.sourceforge.net/project/atlas/atlas/0.3.0/Atlas-0.3.0.tar.gz ... " >> $LOGFILE	
-		#wget -c http://ovh.dl.sourceforge.net/project/atlas/atlas/0.3.0/Atlas-0.3.0.tar.gz
-		#echo " OK" >> $LOGFILE
-		#tar zxvf Atlas-0.3.0.tar.gz
-
-		
 		echo -n "CSV FROM atlas.cvs.sourceforge.net:/cvsroot/atlas ... " >> $LOGFILE
 		cvs -z3 -d:pserver:anonymous@atlas.cvs.sourceforge.net:/cvsroot/atlas co Atlas
 		echo " OK" >> $LOGFILE

-		#echo -n "CSV PATCH FROM http://janodesbois.free.fr ... " >> $LOGFILE
-		#cd Atlas		
-		#wget http://janodesbois.free.fr/doc/atlas-CVS.diff
-		#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
@@ -1160,16 +1438,21 @@ then
        cd "$CBD"
 	fi
 	cd Atlas
-	#cd Atlas-0.3.0

 	if [ ! "$UPDATE" = "UPDATE" ]
 	then
 		if [ "$RECONFIGURE" = "y" ]
 		then
+
+			cd "$CBD"
+                        mkdir -p build/atlas
+
+			cd Atlas
 			echo "AUTOGEN ATLAS" >> $LOGFILE
 			./autogen.sh 2>&1 | tee -a $LOGFILE
 			echo "CONFIGURE ATLAS" >> $LOGFILE
-			./configure --prefix=$INSTALL_DIR_ATLAS --exec-prefix=$INSTALL_DIR_ATLAS  --with-plib=$INSTALL_DIR_PLIB --with-simgear="$INSTALL_DIR_SIMGEAR" --with-fgbase="$INSTALL_DIR_FGFS/fgdata" CXXFLAGS="$CXXFLAGS -I$CBD/OpenSceneGraph/include" 2>&1 | tee -a $LOGFILE
+			cd "$CBD"/build/atlas
+			../../Atlas/configure --prefix=$INSTALL_DIR_ATLAS --exec-prefix=$INSTALL_DIR_ATLAS  --with-plib=$INSTALL_DIR_PLIB --with-simgear="$INSTALL_DIR_SIMGEAR" --with-fgbase="$INSTALL_DIR_FGFS/fgdata" CXXFLAGS="$CXXFLAGS -I$CBD/OpenSceneGraph/include" 2>&1 | tee -a $LOGFILE
 			make clean
 		fi
 	fi
@@ -1177,12 +1460,14 @@ then
 	then
 		echo "MAKE ATLAS" >> $LOGFILE
 		echo "make $JOPTION $OOPTION" >> $LOGFILE
+		
+		cd "$CBD"/build/atlas
 		make $JOPTION $OOPTION 2>&1 | tee -a $LOGFILE

 		echo "INSTALL ATLAS" >> $LOGFILE
 		make install 2>&1 | tee -a $LOGFILE
 	fi
-	cd -
+	cd "$CBD"

 	echo "#!/bin/sh" > run_atlas.sh
 	echo "cd \$(dirname \$0)" >> run_atlas.sh
--- a/1
+++ b/1
--- a/2
+++ b/2
--- a/hudson_mac_build_launcher.sh
+++ b/hudson_mac_build_launcher.sh
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-SDK_PATH="/Developer/SDKs/MacOSX10.6.sdk"
-OSX_TARGET="10.6"
-
-svn co https://macflightgear.svn.sourceforge.net/svnroot/macflightgear/trunk/FlightGearOSX  macflightgear
-
-pushd macflightgear
-
-# compile the stub executable
-gcc -o FlightGear -mmacosx-version-min=$OSX_TARGET -isysroot $SDK_PATH -arch i386 main.m \
-    -framework Cocoa -framework RubyCocoa -framework Foundation -framework AppKit
-
-popd
-
--- a/hudson_mac_build_release.sh
+++ b/hudson_mac_build_release.sh
@@ -0,0 +1,77 @@
+#!/bin/sh
+
+if [ "$WORKSPACE" == "" ]; then
+    echo "ERROR: Missing WORKSPACE environment variable."
+    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"
+pushd sgBuild
+cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -G Xcode ../simgear
+
+# compile
+xcodebuild -configuration Release -target install  build
+
+if [ $? -ne '0' ]; then
+    echo "make simgear failed"
+    exit 1
+fi
+
+popd
+
+################################################################################
+echo "Starting on FlightGear"
+pushd fgBuild
+cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -G Xcode ../flightgear
+
+xcodebuild -configuration Release -target install  build
+
+if [ $? -ne '0' ]; then
+    echo "make flightgear failed"
+    exit 1
+fi
+
+popd
+
+chmod +x $WORKSPACE/dist/bin/osgversion
+
+################################################################################
+echo "Building Macflightgear launcher"
+
+#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 main.m \
+    -framework Cocoa -framework RubyCocoa -framework Foundation -framework AppKit
+
+popd
+
+################################################################################
+echo "Syncing base packages files from sphere.telascience.org"
+rsync -avz --filter 'merge base-package.rules' \
+ -e ssh jturner@sphere.telascience.org:/home/jturner/fgdata .
+
+# run the unlock script now - we need to do this right before code-signing,
+# or the keychain may automatically re-lock after some period of time
+unlock-keychain.sh
+
+echo "Running package script"
+./hudson_mac_package_release.rb
--- a/hudson_mac_package_release.rb
+++ b/hudson_mac_package_release.rb
@@ -1,9 +1,11 @@
 #!/usr/bin/ruby

 require 'ERB'
+require 'fileutils' #I know, no underscore is not ruby-like
+include FileUtils

 $osgLibs = ['osgFX', 'osgParticle', 'osg', 'osgGA', 'osgText', 'osgUtil', 'osgSim', 'osgViewer', 'osgDB']
-$osgPlugins = ['ac', 'osg', 'freetype', 'qt', 'imageio', 'rgb', 'txf', 'mdl', '3ds']
+$osgPlugins = ['ac', 'osg', 'freetype', 'imageio', 'rgb', 'txf', 'mdl', '3ds']

 def runOsgVersion(option)
  env = "export DYLD_LIBRARY_PATH=#{Dir.pwd}/dist/lib"
@@ -15,9 +17,14 @@ osgVersion = runOsgVersion('version-number')
 $osgSoVersion=runOsgVersion('so-number')
 $openThreadsSoVersion=runOsgVersion('openthreads-soversion-number')

+$codeSignIdentity = ENV['FG_CODESIGN_IDENTITY']
+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']

 def fix_install_names(object)
  #puts "fixing install names for #{object}"
@@ -31,16 +38,36 @@ 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"
+$prefixDir=Dir.pwd + "/dist"
 dmgDir=Dir.pwd + "/image"
 srcDir=Dir.pwd + "/flightgear"

+def fix_svn_install_names(object)
+  $svnLibs.each do |l|
+    fileName = "lib#{l}-1.0.dylib"
+    newName = "@executable_path/../Frameworks/#{fileName}"
+    `install_name_tool -change #{fileName} #{newName} #{object}`
+  end
+end
+
+def copy_svn_libs()
+  puts "Copying Subversion client libraries"
+  $svnLibs.each do |l|
+    libFile = "lib#{l}-1.0.dylib"
+    path = "#{$frameworksDir}/#{libFile}"
+    `cp #{$prefixDir}/lib/#{libFile} #{$frameworksDir}`
+    fix_svn_install_names(path)
+   # `install_name_tool -id #{libFile}  #{path}`    
+  end
+end
+
+def code_sign(path)
+  puts "Signing #{path}"
+  `codesign -s "#{$codeSignIdentity}" #{path}`
+end
+

 puts "Erasing previous image dir"
 `rm -rf #{dmgDir}`
@@ -48,56 +75,68 @@ puts "Erasing previous image dir"
 bundle=dmgDir + "/FlightGear.app"
 contents=bundle + "/Contents"
 macosDir=contents + "/MacOS"
-frameworksDir=contents +"/Frameworks"
+$frameworksDir=contents +"/Frameworks"
 resourcesDir=contents+"/Resources"
 osgPluginsDir=contents+"/PlugIns/osgPlugins-#{osgVersion}"

+# for writing copyright year to Info.plist
+t = Time.new
+fgCurrentYear = t.year

 fgVersion = File.read("#{srcDir}/version").strip
 volName="\"FlightGear #{fgVersion}\""

-dmgPath = Dir.pwd + "/fg_mac_#{fgVersion}.dmg"
+dmgPath = Dir.pwd + "/output/fg_mac_#{fgVersion}.dmg"

 puts "Creating directory structure"
 `mkdir -p #{macosDir}`
-`mkdir -p #{frameworksDir}`
+`mkdir -p #{$frameworksDir}`
 `mkdir -p #{resourcesDir}`
 `mkdir -p #{osgPluginsDir}`

 puts "Copying binaries"
-bins = ['fgfs', 'terrasync']
+bins = ['fgfs', 'fgjs', 'fgcom', 'fgviewer']
 bins.each do |b|
-  `cp #{prefixDir}/bin/#{b} #{resourcesDir}/#{b}`
-  fix_install_names("#{resourcesDir}/#{b}")
+  if !File.exist?("#{$prefixDir}/bin/#{b}")
+    next
+  end
+  
+  outPath = "#{macosDir}/#{b}"
+  `cp #{$prefixDir}/bin/#{b} #{outPath}`
+  fix_install_names(outPath)
+  fix_svn_install_names(outPath)
 end

 puts "copying libraries"
 $osgLibs.each do |l|
  libFile = "lib#{l}.#{$osgSoVersion}.dylib"
-  `cp #{prefixDir}/lib/#{libFile} #{frameworksDir}`
-  fix_install_names("#{frameworksDir}/#{libFile}")
+  `cp #{$prefixDir}/lib/#{libFile} #{$frameworksDir}`
+  fix_install_names("#{$frameworksDir}/#{libFile}")
 end

 # and not forgetting OpenThreads
 libFile = "libOpenThreads.#{$openThreadsSoVersion}.dylib"
-`cp #{prefixDir}/lib/#{libFile} #{frameworksDir}`
+`cp #{$prefixDir}/lib/#{libFile} #{$frameworksDir}`

 $osgPlugins.each do |p|
  pluginFile = "osgdb_#{p}.so"
-  `cp #{prefixDir}/lib/osgPlugins-#{osgVersion}/#{pluginFile} #{osgPluginsDir}`
+  `cp #{$prefixDir}/lib/osgPlugins-#{osgVersion}/#{pluginFile} #{osgPluginsDir}`
  fix_install_names("#{osgPluginsDir}/#{pluginFile}")
 end

-# custom ALUT
-# must copy frameworks using ditto
-`ditto #{$alutSourcePath} #{frameworksDir}/ALUT.framework`
+copy_svn_libs()

 # Macflightgear launcher
 puts "Copying Macflightgear launcher files"

-Dir.chdir "macflightgear" do
+Dir.chdir "maclauncher/FlightGearOSX" do
  `cp FlightGear #{macosDir}`
-  `rsync -a --exclude=\".svn\" *.rb *.lproj *.sh *.tiff #{resourcesDir}`
+  `rsync -a *.rb *.lproj *.sh *.tiff #{resourcesDir}`
+end
+
+if File.exist?("#{$prefixDir}/bin/fgcom-data")
+  puts "Copying FGCom data files"
+  `ditto #{$prefixDir}/bin/fgcom-data #{resourcesDir}/fgcom-data`
 end

 # Info.plist
@@ -111,6 +150,18 @@ File.open("#{contents}/Info.plist", 'w') { |f|
 `cp #{srcDir}/package/mac/FlightGear.icns #{resourcesDir}/FlightGear.icns`
 `cp #{srcDir}/COPYING #{dmgDir}`

+puts "Copying base package files into the image"
+`rsync -a fgdata/ #{resourcesDir}/data`
+
+# code sign all executables in MacOS dir. Do this last since reource
+# changes will invalidate the signature!
+Dir.foreach(macosDir) do |b|
+    if b == '.' or b == '..' then
+        next
+    end
+  code_sign("#{macosDir}/#{b}")
+end
+
 puts "Creating DMG"

 createArgs = "-format UDBZ -imagekey bzip2-level=9 -quiet -volname #{volName}"
--- a/hudson_win_build32.bat
+++ b/hudson_win_build32.bat
@@ -1,15 +1,20 @@

 IF NOT DEFINED WORKSPACE SET WORKSPACE=%~dp0

-ECHO #define SIMGEAR_VERSION "2.6.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
--- a/hudson_win_build64.bat
+++ b/hudson_win_build64.bat
@@ -1,15 +1,20 @@

 IF NOT DEFINED WORKSPACE SET WORKSPACE=%~dp0

-ECHO #define SIMGEAR_VERSION "2.6.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
--- a/1
+++ b/1
--- a/2
+++ b/2
Author	SHA1	Message	Date
James Turner	bb80ee392e	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.	2013-01-04 14:37:55 +00:00
James Turner	658afaab27	Maclauncher: No 32-bit anymore!	2013-01-04 12:06:26 +00:00
James Turner	6380e284c2	Bump FG & SG to latest, testing release build.	2013-01-04 10:43:24 +00:00
James Turner	e27bfc00cf	Remove any references to ALUT from Mac build.	2013-01-04 10:40:43 +00:00
James Turner	f165971a23	Merge branch 'refs/heads/release/2.8.0'	2013-01-04 10:37:42 +00:00
Frederic Bouvier	2ffc2e2161	Bump fgmeta to latest sources	2012-12-20 08:46:41 +01:00
Frederic Bouvier	675d32f137	Update to latest sources	2012-12-04 09:18:56 +01:00
Frederic Bouvier	24b0e27fee	Fix the windows 64 release build	2012-12-04 09:18:22 +01:00
Frederic Bouvier	76abd56d61	Build release with last Boost	2012-11-30 19:52:22 +01:00
Frederic Bouvier	b60191638b	Bump fgmeta to latest next	2012-11-30 16:30:35 +01:00
ThorstenB	73fac5dd6a	Francesco Brisa: d&c script update * fix OpenRTI support for simgear. * fix package management on debian 6.0	2012-11-27 22:09:03 +01:00
ThorstenB	6941d72b9f	Francesco Brisa: d&c script, F-JJTH has done some big improvements Added OpenRTI to compilation list Added FGX to compilation list Simgear now can be compiled with openrti option. Minor minor fixes for plib	2012-11-22 20:38:51 +01:00
ThorstenB	1b1be1678e	Francesco Angelo Brisa: plib update for d&c script.	2012-11-20 19:40:35 +01:00
ThorstenB	babafbb198	Francesco Angelo Brisa: FGRun update for d&c script. Also pulls FGrun from git repository now, thanks to Pac.	2012-11-01 13:28:51 +01:00
James Turner	a717c77ee9	Mac launcher fixes.	2012-09-17 23:02:55 +01:00
ThorstenB	48ad2d326f	Bump sg+fg.	2012-09-04 00:00:42 +02:00
Frederic Bouvier	7cbc6a0439	Update fgmeta master to latest sources	2012-09-03 10:51:33 +02:00
James Turner	81f5a48973	Changes to Info.plist creation, fix copyright. Info.plist now generates correct copyright strings based on the current year.	2012-08-28 13:47:37 +01:00
James Turner	f1f4fcb0d8	Bump FG version.	2012-08-25 14:55:34 +01:00
James Turner	083269de80	Fix ALUT naming, ooops.	2012-08-25 14:55:20 +01:00
ThorstenB	9a80c0103e	Francesco Angelo Brisa: Updated d_and_c script for FG2.8.0	2012-08-23 20:49:07 +02:00
James Turner	23b0f4eea4	Bump flightgear head to 2.8.1 to get ATC crash fix.	2012-08-23 08:15:24 +01:00
James Turner	e13daffc46	Fix SV renaming for Mac release.	2012-08-22 22:34:27 +01:00
James Turner	154afebc45	Tweaks for building on different Jenkins slave.	2012-08-22 18:35:52 +01:00
James Turner	302b1ff5b7	Bump for Mac launcher tweak.	2012-08-19 20:25:34 +01:00
Frederic Bouvier	9ca5e06578	Give FG version to fgrun to control what path should be set and overwrite a previous installation in the preference file	2012-08-17 22:27:48 +02:00
Frederic Bouvier	c7ef5567d3	Bump for fgrun	2012-08-17 21:12:25 +02:00
Frederic Bouvier	78dfd31128	Build embedded fgrun	2012-08-17 21:07:05 +02:00
Frederic Bouvier	9fc39e9575	Bump master for test purposes	2012-08-15 23:55:23 +02:00
James Turner	2cb313c6f1	Bump for new Mac launcher head.	2012-08-14 19:51:50 +01:00
James Turner	3ea2728b69	Mac: Keychain unlock needs to happen later. Apparently the keychain re-locks fairly rapidly, so run the unlock script right before running the packaging script. This is non-portable to another Mac slave, but will do for now.	2012-08-14 12:11:48 +01:00
James Turner	0d7f99e261	Tweak Mac code-signing for 2.8 release.	2012-08-14 10:46:00 +01:00
James Turner	2382a0600a	Bump to latest Mac launcher.	2012-08-13 14:26:47 +01:00
James Turner	41356c1aba	Code-sign using the identity from the environment.	2012-08-13 14:26:33 +01:00
Frederic Bouvier	0a40a36041	Bump for rembrandt fix	2012-08-12 19:10:53 +02:00
James Turner	b400a2adc1	Bump release heads, enable SVN packaging.	2012-08-12 17:03:10 +01:00
Frederic Bouvier	3b202ff607	Bump for missing rembrandt uniforms	2012-08-11 12:30:38 +02:00
James Turner	69c46231d7	FGCom data copying for release package	2012-08-08 16:27:04 +01:00
James Turner	d8897780d2	Mac packaging tweaks Pieces for libsvn deployment, code-signing and FGCom	2012-08-08 14:43:45 +01:00
Frederic Bouvier	dd0bbe0a05	Add fgrun git repository as git module for future release (not 2.8). Hand edited .gitmodules as msysgit doesn't modify that file	2012-08-05 23:24:00 +02:00
Frederic Bouvier	86d0cef390	Add fgrun git repository as git module for future release (not 2.8)	2012-08-05 22:47:38 +02:00
James Turner	f15b661076	Bump release head for PUI menubar crash fix.	2012-08-05 21:38:08 +01:00
Frederic Bouvier	e25d5289e2	Bump for another Rembrandt fix	2012-08-02 23:24:06 +02:00
Frederic Bouvier	e528468bd4	Bump for Rembrandt fix	2012-08-02 23:04:23 +02:00
James Turner	022f1791d9	Update Mac release build to sync from Telascience	2012-08-02 10:34:00 +01:00
James Turner	05f4f85b27	Bump for updated Mac launcher	2012-07-31 19:04:45 +01:00
James Turner	e7011cab66	Updates for Mac packaging. Note this is currently hard-coding a source path for rsync which only works on my machine - which is the Mac jenkins slave. This will be updated shortly.	2012-07-31 19:02:26 +01:00
James Turner	8b782ce69b	Add the Mac launcher as an external. Folks on other platforms, it's tiny - and this is the simplest way to manage things for the release builds. If you strongly object please let me know and we can figure out an alternate approach.	2012-07-31 11:02:38 +01:00
James Turner	7190575775	Bump Simgear head for Clang templates fix.	2012-07-31 09:02:46 +01:00
James Turner	06800a6c56	Bump FG release for Mac fixes.	2012-07-30 18:09:12 +01:00
James Turner	3e0eefa8f5	Bump release head for metar.exe fix on Windows.	2012-07-27 17:52:34 +01:00
Frederic Bouvier	5a31e3133f	Give FG version to fgrun to control what path should be set and overwrite a previous installation in the preference file	2012-07-20 00:40:03 +02:00
ThorstenB	3d99ef3ea2	knock knock: 2.8.0 fg head	2012-07-20 00:25:52 +02:00
ThorstenB	a3c2a9424a	Switch fgmeta's existing 2.8.0 branch to now track new sg/fg 2.8.0 branches	2012-07-17 19:01:58 +02:00
Frederic Bouvier	eebf4dbcaf	Bump	2012-07-14 14:24:25 +02:00
Frederic Bouvier	868f7df661	Bump	2012-07-13 18:59:26 +02:00
Frederic Bouvier	26e6b859a5	Bump to latest next	2012-07-13 16:11:47 +02:00
ThorstenB	72d2bb9044	Bump 2.8.0 release head.	2012-07-04 22:26:39 +02:00
ThorstenB	7ef17cc4b2	Bump to 2.8.0 head	2012-06-26 23:25:33 +02:00
James Turner	9c0ccec847	Bump 2.8 fg+sg commits (still on next) Checking that Mac release build increments ok.	2012-06-26 15:21:51 +01:00
James Turner	35bc589a04	Git-ignore updates for Mac build	2012-06-26 10:23:40 +01:00
James Turner	57cafd62e1	Fix DMG output path, oops.	2012-06-26 10:22:46 +01:00
James Turner	561b221448	Mac release builds should use static SimGear	2012-06-26 10:22:32 +01:00
James Turner	4c54c5feb6	Skip missing OSG plugins silently in Mac packaging	2012-06-26 09:17:42 +01:00
James Turner	1ff0264a57	Updated Mac release build script. Capture most of the build logic in a script (ie. visible to Git, and outside Jenkins). use XCodebuild to run the actual compiles, so we get Clang. Use the Xcode 4.3 SDK paths.	2012-06-25 14:14:58 +01:00
ThorstenB	4eb511c33d	Prepare 2.8.0 branch. fg/sg submodules still tracking "next" (until sg/fg are branched, too).	2012-06-23 14:28:42 +02:00
ThorstenB	ffa12d720b	Francesco Brisa & F-JJTH: d&c script bugfixes	2012-04-20 19:28:06 +02:00
ThorstenB	45a38fe121	Francesco Angelo Brisa: d_and_compile now using out-of-directory builds Building binaries in a separate directory keeps the original source directory clean.	2012-04-18 10:38:22 +02:00
ThorstenB	eaed135885	Francesco Angelo Brisa: download_and_compile now using cmake for fgrun	2012-04-12 19:58:37 +02:00
ThorstenB	444ebf92e7	Merge branch 'release/2.6.0'	2012-03-01 22:51:57 +01:00
Frederic Bouvier	7f31b781cd	Fix Win64 packaging (include win32 dlls for tools that are not available in 64bit)	2012-02-27 23:25:54 +01:00
Frederic Bouvier	a0b8fdd867	Add fgpanel to the release on Windows	2012-02-27 23:25:30 +01:00
Frederic Bouvier	a226592697	Call vcredist*.exe and oalinst.exe when available	2012-02-27 23:25:07 +01:00
ThorstenB	beb8dfebc8	Francesco Angelo Brisa: d&c script update for FG2.6.0 updated all the 2.4.0-final tags to 2.6.0-final. compilation runs fine (2.7 version). compilation using -s switch (2.6 version) runs fine.	2012-02-21 09:24:37 +01:00
ThorstenB	cd10243834	Francesco Angelo Brisa: add required package for Atlas compilation	2012-02-06 21:22:38 +01:00
Frederic Bouvier	39924c29ee	Working dual (32/64bit) setup on windows	2012-01-27 09:10:26 +01:00
Frederic Bouvier	675002e298	Improve dual (32/64bit) setup on windows (not complete)	2012-01-27 09:10:26 +01:00
Frederic Bouvier	a71117b58f	Try to fix fgsetup build by Inno Setup	2012-01-27 09:10:26 +01:00
Frederic Bouvier	3a9abdb092	Second try at building a 64-bit version of the release : flightgear	2012-01-27 09:10:26 +01:00
Frederic Bouvier	bea03a5011	First try at building a 64-bit version of the release : simgear	2012-01-27 09:10:26 +01:00
Frederic Bouvier	1e00b6a679	Move setting environment variable out of the build script	2012-01-27 09:10:26 +01:00
Frederic Bouvier	4d3fffd8e4	Adapt Inno-setup packaging to new build system	2012-01-27 09:10:25 +01:00
Frederic Bouvier	ad3595fdc6	First try at building Windows release with VS2010 and Cmake	2012-01-27 09:09:18 +01:00
ThorstenB	c90b114ac9	Update downl_and_comp script to version of Francesco Brisa	2012-01-22 19:19:02 +01:00