Merge branch 'release/2.4.0' of gitorious.org:fg/fgmeta into release/2.4.0

download_and_compile.sh

@@ -119,18 +119,18 @@ fi
 
 
 #######################################################
-# Last stable revision: currently FlightGear 2.0 with OSG 2.8.3
+# Last stable revision: currently FlightGear 2.4 with 3.0.0
 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"
+OSG_STABLE_REVISION="http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags/OpenSceneGraph-3.0.0"
+SIMGEAR_STABLE_REVISION="feb0b83365fe83260ab8e9c032f20ce39fbbe883"
+FGFS_STABLE_REVISION="ee5f323d3ef487469347005fcec1d7cf4de501b8"
 FGFS_DATA_STABLE_REVISION="061d4ec7f7037e4c71f7163d38d443e59225f399"
 FGRUN_STABLE_REVISION="554"
 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.3.0) with OSG 3.0.0
+OSG_UNSTABLE_REVISION="http://www.openscenegraph.org/svn/osg/OpenSceneGraph/tags/OpenSceneGraph-3.0.0"
 
 #######################################################
 # set script to stop if an error occours

hudson_build_release.sh

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

hudson_mac_package_release.rb

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

hudson_win_build32.bat

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

hudson_win_build64.bat

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