From: Daid <Daid303@gmail.com>
Date: Tue, 8 Oct 2013 12:43:01 +0000 (+0200)
Subject: Fix mac build script. Was reading the version the wrong way.
X-Git-Tag: 13.10~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=bfdb3c4efdabd72c527e74c3c49318579b9fff34;hp=94805dff3406ded0d08cf40e920c3f1759485179;p=cura.git

Fix mac build script. Was reading the version the wrong way.
---

diff --git a/build_app.py b/build_app.py
index 62eaaca8..7c6791ce 100644
--- a/build_app.py
+++ b/build_app.py
@@ -5,17 +5,12 @@ import os
 if sys.platform.startswith('darwin'):
     from setuptools import setup
 
-    try:
-        f = open('scripts/darwin/dist/Cura.app/Contents/Resources/version', 'r')
-        version = unicode(f.readline().strip())
-        f.close()
-    except IOError:
-        version = 'Unknown'
+    version = os.environ['BUILD_NAME']
 
     APP = ['Cura/cura.py']
     DATA_FILES = ['Cura/LICENSE', 'Cura/resources/images', 'Cura/resources/meshes', 'Cura/resources/example', 'Cura/resources/firmware', 'Cura/resources/locale', 'Cura/resources/machine_profiles']
     PLIST = {
-        u'CFBundleName': u'Cura-'+version,
+        u'CFBundleName': u'Cura',
         u'CFBundleShortVersionString': version,
         u'CFBundleVersion': version,
         u'CFBundleIdentifier': u'com.ultimaker.Cura-'+version,
diff --git a/package.sh b/package.sh
index c1e0303c..4ef4dbbb 100755
--- a/package.sh
+++ b/package.sh
@@ -17,7 +17,7 @@ BUILD_TARGET=${1:-all}
 ##Do we need to create the final archive
 ARCHIVE_FOR_DISTRIBUTION=1
 ##Which version name are we appending to the final archive
-BUILD_NAME=13.10
+export BUILD_NAME=13.10-RC1
 TARGET_DIR=Cura-${BUILD_NAME}-${BUILD_TARGET}
 
 ##Which versions of external programs to use