Mac launcher fixes.

Info.plist now generates correct copyright strings based on the current year.

.gitignore

@@ -8,3 +8,6 @@ Output
 output
 fgBuild
 sgBuild
+image
+macflightgear
+fgdata

.gitmodules

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

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"""

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>
 

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
+
+

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.31"
 
 #COMPILE GIT FGFS
 
@@ -27,6 +27,8 @@ VERSION="1.7"
 #######################################################
 # Special thanks to Alessandro Garosi for FGComGui and 
 # other patches
+# Thanks to "pac1" for patches for fgrun compilation
+# Thanks to "F-JJTH" for bug fixes and suggestions
 
 
 
@@ -124,19 +126,19 @@ PLIB_STABLE_REVISION="2163"
 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.6.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"
+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"
 
-FGRUN_STABLE_REVISION="625"
-FGCOM_STABLE_REVISION="234"
+FGRUN_STABLE_REVISION="655"
+FGCOM_STABLE_REVISION="261"
 FGCOMGUI_STABLE_REVISION="46"
 
 # Current developer revision: latest FlightGear GIT (2.5.0) with OSG 3.0.1
@@ -256,10 +258,10 @@ 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.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 "
 
-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 "
+DEBIAN_PACKAGES="freeglut3-dev libjpeg8-dev libjpeg8 "
 
 # checking linux distro and version to differ needed packages
 if [ "$DISTRIB_ID" = "Ubuntu" ]
@@ -344,6 +346,10 @@ SUB_INSTALL_DIR=install
 INSTALL_DIR=$CBD/$SUB_INSTALL_DIR
 
 
+cd "$CBD"
+mkdir -p build
+
+
 #######################################################
 # PLIB
 #######################################################
@@ -354,7 +360,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 +373,12 @@ 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" ]
 		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" ]
@@ -409,20 +399,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 --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 +436,11 @@ then
 			make install 2>&1 | tee -a $LOGFILE
 		fi
 
-		cd -
+		cd "$CBD"
 	fi
 fi
 
 
-
 #######################################################
 # OpenSceneGraph
 #######################################################
@@ -473,12 +473,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 +493,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 +519,8 @@ then
 	cd -
 fi
 
+
+
 #######################################################
 # SIMGEAR
 #######################################################
@@ -584,19 +592,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" -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
 			echo " OK" >> $LOGFILE
 
-			
 
 
 		fi
@@ -604,6 +608,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 +701,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" -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
 
 				echo " OK" >> $LOGFILE
 
@@ -711,6 +730,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 +825,7 @@ then
 		fi
 	fi
 
+	cd "$CBD"
 
 	# IF SEPARATED FOLDER FOR AIRCRAFTS
 	# --fg-aircraft=\$PWD/../aircrafts
@@ -834,7 +858,6 @@ ENDOFALL2
 
 fi
 
-
 #######################################################
 # FGO!
 #######################################################
@@ -899,39 +922,30 @@ then
 		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"		
-
-		#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/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/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 +953,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
@@ -998,9 +1013,6 @@ then
         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
@@ -1039,7 +1051,6 @@ then
 	fi
 
 
-
 	mkdir -p "$INSTALL_DIR_FGCOM"/bin
 
 	if [ "$COMPILE" = "y" ]
@@ -1051,7 +1062,7 @@ then
 		echo "INSTALL FGCOM" >> $LOGFILE
 		make install 2>&1 | tee -a $LOGFILE
 	fi
-	cd -
+	cd "$CBD"
 
 	echo "#!/bin/sh" > run_fgcom.sh
 	echo "cd \$(dirname \$0)" >> run_fgcom.sh
@@ -1107,7 +1118,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 +1148,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 +1159,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 +1181,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

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
-

hudson_mac_build_release.sh

@@ -0,0 +1,72 @@
+#!/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"
+
+pushd maclauncher/FlightGearOSX
+
+# 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
+
+################################################################################
+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

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,10 +17,17 @@ 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}"
   
@@ -32,15 +41,39 @@ def fix_install_names(object)
   newName= "@executable_path/../Frameworks/#{oldName}"
   `install_name_tool -change #{oldName} #{newName} #{object}`
   
-  alutBundlePath = "@executable_path/../Frameworks/Alut.framework"
+  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 +81,72 @@ 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
 
+copy_svn_libs()
+
 # custom ALUT
 # must copy frameworks using ditto
-`ditto #{$alutSourcePath} #{frameworksDir}/ALUT.framework`
+`ditto #{$alutSourcePath} #{$frameworksDir}/ALUT.framework`
 
 # 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 +160,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}"

hudson_win_build32.bat

@@ -1,7 +1,7 @@
 
 IF NOT DEFINED WORKSPACE SET WORKSPACE=%~dp0
 
-ECHO #define SIMGEAR_VERSION "2.6.0" > %WORKSPACE%\simgear\simgear\version.h
+ECHO #define SIMGEAR_VERSION "2.8.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

hudson_win_build64.bat

@@ -1,7 +1,7 @@
 
 IF NOT DEFINED WORKSPACE SET WORKSPACE=%~dp0
 
-ECHO #define SIMGEAR_VERSION "2.6.0" > %WORKSPACE%\simgear\simgear\version.h
+ECHO #define SIMGEAR_VERSION "2.8.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