From 8302a21ef7cfc9554b4e27f25a21ebfd03f61832 Mon Sep 17 00:00:00 2001 From: James Turner Date: Sat, 21 May 2011 15:11:22 +0100 Subject: [PATCH 1/9] Pickup SimGear version from its workspace (only works with 2.3.0 or higher) --- hudson_win_build32.bat | 4 +++- hudson_win_build64.bat | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hudson_win_build32.bat b/hudson_win_build32.bat index 77669d5..c5f1e3a 100644 --- a/hudson_win_build32.bat +++ b/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 diff --git a/hudson_win_build64.bat b/hudson_win_build64.bat index 4d235de..1d044bb 100644 --- a/hudson_win_build64.bat +++ b/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 From 5c289cb98ca4fc3e915fa0a45fc8e5335b96cc1b Mon Sep 17 00:00:00 2001 From: James Turner Date: Sat, 21 May 2011 15:11:57 +0100 Subject: [PATCH 2/9] Set next versions of FG/SG, for testing --- flightgear | 2 +- simgear | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flightgear b/flightgear index 118d8fb..53e8fbf 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 118d8fbca5d98e994d572e4c922f76ba2cab9e52 +Subproject commit 53e8fbfcbb3ddac0dc261043fea7bd24dfa6e62d diff --git a/simgear b/simgear index e55017b..e988dc0 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit e55017bbfce20a999bc9173260f402b2ec3819d0 +Subproject commit e988dc0e421744fe71b7cdc74b8ff081becfc31d From b209471a49411ddc814c06af504d49b703669c52 Mon Sep 17 00:00:00 2001 From: James Turner Date: Sun, 17 Jul 2011 11:26:06 +0100 Subject: [PATCH 3/9] Update fgmeta pieces for 2.4.0 branch creation. --- download_and_compile.sh | 12 ++++++------ flightgear | 2 +- simgear | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/download_and_compile.sh b/download_and_compile.sh index dd1637b..af873a1 100755 --- a/download_and_compile.sh +++ b/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 diff --git a/flightgear b/flightgear index 53e8fbf..ee5f323 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 53e8fbfcbb3ddac0dc261043fea7bd24dfa6e62d +Subproject commit ee5f323d3ef487469347005fcec1d7cf4de501b8 diff --git a/simgear b/simgear index e988dc0..feb0b83 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit e988dc0e421744fe71b7cdc74b8ff081becfc31d +Subproject commit feb0b83365fe83260ab8e9c032f20ce39fbbe883 From 9509d5c2e897c99a3cb1c52fd28104cd230fadcf Mon Sep 17 00:00:00 2001 From: James Turner Date: Sun, 17 Jul 2011 12:05:35 +0100 Subject: [PATCH 4/9] Bump to tweaked 2.4 FG release branch --- flightgear | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flightgear b/flightgear index ee5f323..73cd925 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit ee5f323d3ef487469347005fcec1d7cf4de501b8 +Subproject commit 73cd925ea9005e7db9c63a962198c7afe459440e From 0e8a608dd47065eed59d28153c6f14cb9044447b Mon Sep 17 00:00:00 2001 From: James Turner Date: Sun, 17 Jul 2011 12:54:34 +0100 Subject: [PATCH 5/9] Move release files to a standard 'output' dir, for ease of uploading / archiving. --- hudson_build_release.sh | 21 +++++++++++++++++++-- hudson_mac_package_release.rb | 6 ++++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/hudson_build_release.sh b/hudson_build_release.sh index a91f480..6796e02 100755 --- 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}/ + diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb index d1cfb24..f813246 100755 --- 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}` From c7fa1238b8b6d323c6715a27219f1098adbf75ac Mon Sep 17 00:00:00 2001 From: James Turner Date: Sun, 17 Jul 2011 13:22:18 +0100 Subject: [PATCH 6/9] Bah, typo. --- hudson_mac_package_release.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hudson_mac_package_release.rb b/hudson_mac_package_release.rb index f813246..efea5f5 100755 --- a/hudson_mac_package_release.rb +++ b/hudson_mac_package_release.rb @@ -56,7 +56,7 @@ osgPluginsDir=contents+"/PlugIns/osgPlugins-#{osgVersion}" fgVersion = File.read("#{srcDir}/version").strip volName="\"FlightGear #{fgVersion}\"" -dmgOutDir = Dir.pwd + "output" +dmgOutDir = Dir.pwd + "/output" dmgPath = "#{dmgOutDir}/#{fgVersion}/fg_mac_#{fgVersion}.dmg" `rm -rf #{dmgOutDir}` `mkdir -p #{dmgOutDir}/#{fgVersion}` From 94e35443bee07ffee4b8223d460bf6934be96780 Mon Sep 17 00:00:00 2001 From: James Turner Date: Sun, 17 Jul 2011 13:28:36 +0100 Subject: [PATCH 7/9] And another couple of typos. --- hudson_build_release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hudson_build_release.sh b/hudson_build_release.sh index 6796e02..7b0bac2 100755 --- a/hudson_build_release.sh +++ b/hudson_build_release.sh @@ -42,6 +42,6 @@ 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}/ +mv simgear/simgear-${SG_VERSION}.tar.bz2 output/${FG_VERSION}/ +mv flightgear/flightgear-${FG_VERSION}.tar.bz2 output/${FG_VERSION}/ From 648df65ddf8999acc1e07eb6b515f65bdd03d52d Mon Sep 17 00:00:00 2001 From: James Turner Date: Tue, 19 Jul 2011 07:53:04 +0100 Subject: [PATCH 8/9] Switch submodule paths to use git: protocol - hoping this will help the Windows slave issues. --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index dbc0fce..29ede68 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "simgear"] path = simgear - url = http://git.gitorious.org/fg/simgear.git + url = git://gitorious.org/fg/simgear.git [submodule "flightgear"] path = flightgear - url = http://git.gitorious.org/fg/flightgear.git + url = git://gitorious.org/fg/flightgear.git From 15a995550114aee715a80691b985d1f4a61240fe Mon Sep 17 00:00:00 2001 From: James Turner Date: Wed, 27 Jul 2011 18:57:09 +0100 Subject: [PATCH 9/9] Bump FG and SG revisions to 2.4.0 release heads. --- flightgear | 2 +- simgear | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flightgear b/flightgear index 73cd925..6d61bac 160000 --- a/flightgear +++ b/flightgear @@ -1 +1 @@ -Subproject commit 73cd925ea9005e7db9c63a962198c7afe459440e +Subproject commit 6d61bacdc3bb0e2b9f24a256698266d3a7d481d4 diff --git a/simgear b/simgear index feb0b83..9c0cafb 160000 --- a/simgear +++ b/simgear @@ -1 +1 @@ -Subproject commit feb0b83365fe83260ab8e9c032f20ce39fbbe883 +Subproject commit 9c0cafb82c04be22e63539ff83b754b5b88bec3e