Move release files to a standard 'output' dir, for ease of uploading / archiving.

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}`