write correct version in mac-bundle;

fixes #833

diff --git a/scripts/build/Info.plist b/scripts/build/Info.plist
index fbc7ac1..e0f434c 100644 (file)
--- a/scripts/build/Info.plist
+++ b/scripts/build/Info.plist
@@ -1,35 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
-  "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-  <key>CFBundleDevelopmentRegion</key>
-  <string>English</string>
-   <key>CFBundleExecutable</key>
-  <string>%(BUNDLE_NAME)s</string>
-  <key>CFBundleGetInfoString</key>
-  <string>Quassel IRC Client</string>
-  <key>CFBundleIconFile</key>
-  <string>%(ICON_FILE)s</string>
-  <key>CFBundleIdentifier</key>
-  <string>org.quassel-irc.client</string>
-  <key>CFBundleInfoDictionaryVersion</key>
-  <string>6.0</string>
-  <key>CFBundleName</key>
-  <string>Quassel IRC Client</string>
-  <key>CFBundlePackageType</key>
-  <string>APPL</string>
-  <key>CFBundleShortVersionString</key>
-  <string>%(BUNDLE_VERSION)s</string>
-  <key>CFBundleSignature</key>
-  <string>????</string>
-  <key>CFBundleVersion</key>
-  <string>%(BUNDLE_VERSION)s</string>
-  <!-- <key>CSResourcesFileMapped</key>
-       <true/> -->
-  <key>LSRequiresCarbon</key>
-  <true/>
-  <key>NSHumanReadableCopyright</key>
-  <string>© 2005-08, Quassel IRC Team</string>
+       <key>CFBundleDevelopmentRegion</key>
+       <string>English</string>
+       <key>CFBundleExecutable</key>
+       <string>%(BUNDLE_NAME)s</string>
+       <key>CFBundleGetInfoString</key>
+       <string>Quassel IRC Client</string>
+       <key>CFBundleIconFile</key>
+       <string>%(ICON_FILE)s</string>
+       <key>CFBundleIdentifier</key>
+       <string>org.quassel-irc.client</string>
+       <key>CFBundleInfoDictionaryVersion</key>
+       <string>6.0</string>
+       <key>CFBundleName</key>
+       <string>Quassel IRC Client</string>
+       <key>CFBundlePackageType</key>
+       <string>APPL</string>
+       <key>CFBundleShortVersionString</key>
+       <string>%(BUNDLE_VERSION)s</string>
+       <key>CFBundleSignature</key>
+       <string>????</string>
+       <key>CFBundleVersion</key>
+       <string>%(BUNDLE_VERSION)s</string>
+       <key>LSRequiresCarbon</key>
+       <true/>
+       <key>NSHumanReadableCopyright</key>
+       <string>© 2005-2010, Quassel IRC Team</string>
 </dict>
 </plist>

diff --git a/scripts/build/macosx_makebundle.py b/scripts/build/macosx_makebundle.py
index 8ac4396..fe1ba87 100755 (executable)
--- a/scripts/build/macosx_makebundle.py
+++ b/scripts/build/macosx_makebundle.py
@@ -16,6 +16,7 @@
 import os
 import os.path
 import sys
+import commands
 
 # ==============================
 #  Constants
@@ -37,7 +38,7 @@ if(os.path.dirname(EXE_NAME)):
     CONTENTS_DIR = os.path.dirname(EXE_NAME) + "/"
 CONTENTS_DIR += BUNDLE_NAME + ".app/Contents/"
 
-BUNDLE_VERSION = "0.3.0"
+BUNDLE_VERSION = commands.getoutput("git --git-dir="+SOURCE_DIR+"/.git/ describe")
 ICON_FILE = "pics/quassel.icns"
 
 def createBundle():