Merge branch 'next' of http://git.gitorious.org/fg/flightgear into next

package/mac/build-mac-nightly-dmg.rb

@@ -53,9 +53,9 @@ 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"
+dmgPath = Dir.pwd + "/fg_mac_nightly_#{fgVersion}.dmg"
 
 puts "Creating directory structure"
 `mkdir -p #{macosDir}`
@@ -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}"

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
+

package/mac/nightly.plist.in

@@ -15,7 +15,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>org.flightgear.FlightGear</string>
 	<key>CFBundleVersion</key>
-	<string><%= VERSION %></string>
+	<string><%= fgVersion %></string>
 	<key>CFBundleShortVersionString</key>
 	<string>unstable nightly build</string>
 	<key>LSMinimumSystemVersion</key>

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 );