From fec0b28f14b900f1d011bd76b7b384aff9c2bcad Mon Sep 17 00:00:00 2001 From: James Turner Date: Mon, 24 Jan 2011 13:35:01 +0000 Subject: [PATCH 1/3] Include Macflightgear files, and the build helper. --- package/mac/build-mac-nightly-dmg.rb | 10 +++++++++- package/mac/hudson_mac_build_launcher.sh | 15 +++++++++++++++ package/mac/nightly.plist.in | 2 +- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100755 package/mac/hudson_mac_build_launcher.sh diff --git a/package/mac/build-mac-nightly-dmg.rb b/package/mac/build-mac-nightly-dmg.rb index 2930ab305..39f170aa8 100755 --- a/package/mac/build-mac-nightly-dmg.rb +++ b/package/mac/build-mac-nightly-dmg.rb @@ -53,7 +53,7 @@ resourcesDir=contents+"/Resources" osgPluginsDir=contents+"/PlugIns/osgPlugins-#{osgVersion}" volName="\"FlightGear Nightly Build\"" -VERSION = File.read("#{srcDir}/version").strip +fgVersion = File.read("#{srcDir}/version").strip dmgPath = Dir.pwd + "/fg_mac_nightly_#{VERSION}.dmg" @@ -103,6 +103,14 @@ File.open("#{contents}/Info.plist", 'w') { |f| `cp #{srcDir}/package/mac/FlightGear.icns #{resourcesDir}/FlightGear.icns` `cp #{srcDir}/COPYING #{dmgDir}` +# Macflightgear launcher +puts "Copying Macflightgear launcher files" + +Dir.chdir "macflightgear" do + `cp FlightGear #{macosDir}` + `rsync -a --exclude=\".svn\" *.rb *.lproj *.sh *.tiff #{resourcesDir}` +end + puts "Creating DMG" createArgs = "-format UDBZ -imagekey bzip2-level=9 -quiet -volname #{volName}" diff --git a/package/mac/hudson_mac_build_launcher.sh b/package/mac/hudson_mac_build_launcher.sh new file mode 100755 index 000000000..4cf8e541b --- /dev/null +++ b/package/mac/hudson_mac_build_launcher.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +SDK_PATH="/Developer/SDKs/MacOSX10.5.sdk" +OSX_TARGET="10.5" + +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 + diff --git a/package/mac/nightly.plist.in b/package/mac/nightly.plist.in index 0565abe93..fd9fe1892 100644 --- a/package/mac/nightly.plist.in +++ b/package/mac/nightly.plist.in @@ -15,7 +15,7 @@ CFBundleIdentifier org.flightgear.FlightGear CFBundleVersion - <%= VERSION %> + <%= fgVersion %> CFBundleShortVersionString unstable nightly build LSMinimumSystemVersion From 7f84bf559900870108e51d1da44ca1ff929ab484 Mon Sep 17 00:00:00 2001 From: James Turner Date: Mon, 24 Jan 2011 13:48:01 +0000 Subject: [PATCH 2/3] Whoops, missed a place to use fgVersion --- package/mac/build-mac-nightly-dmg.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mac/build-mac-nightly-dmg.rb b/package/mac/build-mac-nightly-dmg.rb index 39f170aa8..6161599e7 100755 --- a/package/mac/build-mac-nightly-dmg.rb +++ b/package/mac/build-mac-nightly-dmg.rb @@ -55,7 +55,7 @@ volName="\"FlightGear Nightly Build\"" fgVersion = File.read("#{srcDir}/version").strip -dmgPath = Dir.pwd + "/fg_mac_nightly_#{VERSION}.dmg" +dmgPath = Dir.pwd + "/fg_mac_nightly_#{fgVersion}.dmg" puts "Creating directory structure" `mkdir -p #{macosDir}` From 8fe3d6c8e8450e8dbc93a2beb567b2af78457d75 Mon Sep 17 00:00:00 2001 From: Torsten Dreyer Date: Mon, 24 Jan 2011 19:41:56 +0100 Subject: [PATCH 3/3] Bugfix: reset transparency of non fog/mist/haze layers --- src/Environment/metarproperties.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Environment/metarproperties.cxx b/src/Environment/metarproperties.cxx index 6d8c1c51a..171d716af 100644 --- a/src/Environment/metarproperties.cxx +++ b/src/Environment/metarproperties.cxx @@ -374,6 +374,7 @@ void MetarProperties::set_metar( const char * metar ) -9999.0 : metarClouds[i].getAltitude_ft() + _station_elevation; + layerNode->setDoubleValue( "alpha", 1.0 ); layerNode->setStringValue( "coverage", coverage_string[coverage] ); layerNode->setDoubleValue( "coverage-type", SGCloudLayer::getCoverageType(coverage_string[coverage]) ); layerNode->setDoubleValue( "elevation-ft", elevation );