Use version file to populate bundle plist.

diff --git a/package/mac/build-mac-nightly-dmg.rb b/package/mac/build-mac-nightly-dmg.rb
index e3517ef129210de08e20de394ce6294e79c727b8..cd839acaa76e09183ba9715342e682397711ec1a 100755 (executable)
--- a/package/mac/build-mac-nightly-dmg.rb
+++ b/package/mac/build-mac-nightly-dmg.rb
@@ -15,6 +15,8 @@ osgVersion = runOsgVersion('version-number')
 $osgSoVersion=runOsgVersion('so-number')
 $openThreadsSoVersion=runOsgVersion('openthreads-soversion-number')
 
+VERSION = File.read("#{srcDir}/version").strip
+
 puts "osgVersion=#{osgVersion}, so-number=#{$osgSoVersion}"
 
 $alutSourcePath='/Library/Frameworks/ALUT.framework'

diff --git a/package/mac/nightly.plist.in b/package/mac/nightly.plist.in
index f8b2c562a9e5444aa8be0fac2ac3a2c9475876d2..0565abe93f0e771f28c3dcb70c63532849ff04f8 100644 (file)
--- a/package/mac/nightly.plist.in
+++ b/package/mac/nightly.plist.in
@@ -15,7 +15,7 @@
        <key>CFBundleIdentifier</key>
        <string>org.flightgear.FlightGear</string>
        <key>CFBundleVersion</key>
-       <string>2.0</string>
+       <string><%= VERSION %></string>
        <key>CFBundleShortVersionString</key>
        <string>unstable nightly build</string>
        <key>LSMinimumSystemVersion</key>