chiark
/
gitweb
/
~ianmdlvl
/
cura.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
94805df
)
Fix mac build script. Was reading the version the wrong way.
author
Daid
<Daid303@gmail.com>
Tue, 8 Oct 2013 12:43:01 +0000
(14:43 +0200)
committer
Daid
<Daid303@gmail.com>
Tue, 8 Oct 2013 12:43:01 +0000
(14:43 +0200)
build_app.py
patch
|
blob
|
history
package.sh
patch
|
blob
|
history
diff --git
a/build_app.py
b/build_app.py
index 62eaaca8b9ad0beec02045c3408023254f1e5f74..7c6791ce1c29570c0fd34305bb653e45b1a2e652 100644
(file)
--- a/
build_app.py
+++ b/
build_app.py
@@
-5,17
+5,12
@@
import os
if sys.platform.startswith('darwin'):
from setuptools import setup
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 = {
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,
u'CFBundleShortVersionString': version,
u'CFBundleVersion': version,
u'CFBundleIdentifier': u'com.ultimaker.Cura-'+version,
diff --git
a/package.sh
b/package.sh
index c1e0303c575ede615aeaa6bb956f41d6bfb7681d..4ef4dbbbdb62ec78c9984c7fa118016eb3e6593b 100755
(executable)
--- 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
##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
TARGET_DIR=Cura-${BUILD_NAME}-${BUILD_TARGET}
##Which versions of external programs to use