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.
Update download_and_compile script for FG2.4.0
2011-08-18 20:33:01 +02:00 · 2011-08-16 21:42:51 +02:00 · 2011-08-14 00:01:52 +02:00 · 2011-08-13 16:56:00 +02:00 · 2011-08-12 23:32:08 +02:00 · 2011-08-11 21:37:36 +02:00
8 changed files with 134 additions and 43 deletions
--- a/FlightGear.iss
+++ b/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
--- 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.4"
+VERSION="1.4.3"

 #COMPILE GIT FGFS

@@ -119,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
@@ -538,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 ..
@@ -623,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
@@ -679,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"
--- a/2
+++ b/2
--- a/hudson_build_release.sh
+++ b/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}/
+
--- a/hudson_mac_package_release.rb
+++ b/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}`
--- a/hudson_win_build32.bat
+++ b/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
--- a/hudson_win_build64.bat
+++ b/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
--- a/2
+++ b/2
Author	SHA1	Message	Date
ThorstenB	a6306e0ed4	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.	2011-08-18 20:33:01 +02:00
ThorstenB	3191ddccb9	Update download_and_compile script for FG2.4.0 More GIT magic: cleanly switch between stable and unstable branches.	2011-08-16 21:42:51 +02:00
ThorstenB	40fab97907	Update download_and_compile script for FG2.4.0 Pick up 2.4.0 release tag for stable version (Note: specifying commit IDs alone doesn't work - since the same commits are on different branches => either use commitID+branch or preferably the release-tag). Update FGRUN stable version for FG2.4.0	2011-08-14 00:01:52 +02:00
ThorstenB	b54ee9d358	bump fg release head: replay NaN issue	2011-08-13 16:56:00 +02:00
ThorstenB	dc0be7726e	bump fg release head: #403 , scroll up/down for Mac OS	2011-08-12 23:32:08 +02:00
ThorstenB	f4c20ca386	bump fg release head for #359	2011-08-11 21:37:36 +02:00
Frederic Bouvier	5539a94d2f	Bump 2.4.0 release head, Fix issue #398 : Menubar - Help > Help opens strange path when including space character	2011-08-08 23:30:52 +02:00
ThorstenB	80950129a5	Bump fg 2.4 release head: #389 : NumPad keys not working	2011-08-07 18:38:55 +02:00
Frederic Bouvier	c5eeca1e42	Bump 2.4.0 release head, #392 : Non-outdated METAR data is dropped depending on OS timezone setting in Windows	2011-08-06 16:32:46 +02:00
ThorstenB	6378d284af	Bump 2.4.0 fg release head, #393 : VSI affected by sim speed up	2011-08-06 12:58:28 +02:00
ThorstenB	ba262d3a3a	Bump FG 2.4.0 release head cmake build fixes (FG 2.4 relies on automake, but good when CMake also works)	2011-08-04 22:48:14 +02:00
ThorstenB	828cb1d1da	Bump again Lalalala...	2011-08-02 08:05:54 +02:00
ThorstenB	b905d3aa6b	Bump again. VC project files. Let's go for cmake... ;-)	2011-08-02 01:08:35 +02:00
ThorstenB	df26699a7c	Bump 2.4.0 release head: flightgear (Fix VS90 solution wrt JS_demo)	2011-08-02 00:51:34 +02:00
ThorstenB	48eb37c742	Bump 2.4.0 release head: flightgear also update download_and_compile script	2011-08-02 00:03:54 +02:00
Frederic Bouvier	c56723ff20	Fix typo in 64-bit plugin deployment	2011-08-01 23:38:19 +02:00
Frederic Bouvier	6b419614bc	Add several OSG plugins required by some models	2011-08-01 23:09:28 +02:00
ThorstenB	7cc9a90f13	Bump 2.4.0 release head: simgear (Fix property refcounting for particles)	2011-08-01 19:54:45 +02:00
ThorstenB	c50318a70a	Bump 2.4.0 release head for flightgear (Fix missing js_demo config in vs90 solution)	2011-08-01 19:12:59 +02:00
ThorstenB	a2114aebee	Bump 2.4.0 release head for flightgear (Add JS_demo to VC90 project)	2011-08-01 00:32:51 +02:00
ThorstenB	2a01fdf6d0	Bump sg+fg head for release/2.4.0.	2011-07-31 14:24:53 +02:00
Torsten Dreyer	31ab182050	Merge branch 'release/2.4.0' of gitorious.org:fg/fgmeta into release/2.4.0	2011-07-29 18:56:53 +02:00
Torsten Dreyer	cc4134c743	Fix typo in hudson win32/64 build scripts Also remove obsolete build of SimGear which is included in the build of the solution.	2011-07-29 14:14:13 +02:00
James Turner	9f8497143e	Bump to 2.4.0 tip	2011-07-29 12:08:37 +01:00
Torsten Dreyer	d320b92b50	Merge branch 'release/2.4.0' of gitorious.org:fg/fgmeta into release/2.4.0	2011-07-29 12:57:43 +02:00
James Turner	15a9955501	Bump FG and SG revisions to 2.4.0 release heads.	2011-07-27 18:57:09 +01:00
James Turner	648df65ddf	Switch submodule paths to use git: protocol - hoping this will help the Windows slave issues.	2011-07-19 07:53:04 +01:00
James Turner	94e35443be	And another couple of typos.	2011-07-17 13:28:36 +01:00
James Turner	c7fa1238b8	Bah, typo.	2011-07-17 13:22:18 +01:00
James Turner	0e8a608dd4	Move release files to a standard 'output' dir, for ease of uploading / archiving.	2011-07-17 12:54:34 +01:00
James Turner	9509d5c2e8	Bump to tweaked 2.4 FG release branch	2011-07-17 12:05:35 +01:00
James Turner	b209471a49	Update fgmeta pieces for 2.4.0 branch creation.	2011-07-17 11:26:06 +01:00
James Turner	5c289cb98c	Set next versions of FG/SG, for testing	2011-05-21 15:11:57 +01:00
James Turner	8302a21ef7	Pickup SimGear version from its workspace (only works with 2.3.0 or higher)	2011-05-21 15:11:22 +01:00