X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=scripts%2Fbuild%2Fmacosx_makebundle.py;h=fe1ba87ced2ef532083173dea6bb658e911fec0f;hp=72e73793781aee4c2e175c52f94c542620e7928d;hb=98fe341385f5b1bc0f652df61a85a0c7e00014d1;hpb=335e3cf6203327b3ce1ee6e47c09a8139232317c

diff --git a/scripts/build/macosx_makebundle.py b/scripts/build/macosx_makebundle.py
index 72e73793..fe1ba87c 100755
--- a/scripts/build/macosx_makebundle.py
+++ b/scripts/build/macosx_makebundle.py
@@ -14,7 +14,9 @@
 #  Imports
 # ==============================
 import os
+import os.path
 import sys
+import commands
 
 # ==============================
 #  Constants
@@ -28,12 +30,16 @@ if len(sys.argv) < 4:
     BUNDLE_NAME= "Quassel Client"
     EXE_NAME = "quasselclient"
 else:
-    BUNDLE_NAME = sys.argv[2]
     EXE_NAME = sys.argv[3]
-CONTENTS_DIR = BUNDLE_NAME + ".app/Contents/"
+    BUNDLE_NAME = sys.argv[2]
+
+# make the dir of the exe the target dir
+if(os.path.dirname(EXE_NAME)):
+    CONTENTS_DIR = os.path.dirname(EXE_NAME) + "/"
+CONTENTS_DIR += BUNDLE_NAME + ".app/Contents/"
 
-BUNDLE_VERSION = "0.2.0-pre"
-ICON_FILE = "src/icons/quassel/quassel.icns"
+BUNDLE_VERSION = commands.getoutput("git --git-dir="+SOURCE_DIR+"/.git/ describe")
+ICON_FILE = "pics/quassel.icns"
 
 def createBundle():
     try:
@@ -50,7 +56,6 @@ def createPlist(bundleName, iconFile, bundleVersion):
     templateFile = file(SOURCE_DIR + "/scripts/build/Info.plist", 'r')
     template = templateFile.read()
     templateFile.close()
-    print 
 
     plistFile = file(CONTENTS_DIR + "Info.plist", 'w')
     plistFile.write(template % {"BUNDLE_NAME" : bundleName,