Merge branch 'SteamEngine' of github.com:daid/Cura into SteamEngine

diff --git a/build_app.py b/build_app.py
index af9b7d4a8114efe02625ffc99f09563ebc0a8d9a..6371c4feeaab680b851551ea80017b70675f72af 100644 (file)
--- a/build_app.py
+++ b/build_app.py
@@ -6,7 +6,7 @@ if sys.platform.startswith('darwin'):
     from setuptools import setup
 
     APP = ['Cura/cura.py']
-    DATA_FILES = ['Cura/LICENSE', 'Cura/resources/images', 'Cura/resources/meshes', 'Cura/resources/example', 'Cura/resources/firmware']
+    DATA_FILES = ['Cura/LICENSE', 'Cura/resources/images', 'Cura/resources/meshes', 'Cura/resources/example', 'Cura/resources/firmware', 'Cura/resources/locale']
     PLIST = {
         u'CFBundleName': u'Cura',
         u'CFBundleShortVersionString': u'13.06.5',

diff --git a/package.sh b/package.sh
index 6b4d47b7a649408fe4e377563a839ea8cef2f504..e212845c9af6656c55851401ba74e2e778bb4fbb 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
-BUILD_NAME=13.09
+BUILD_NAME=13.10-MultiLanguageTest
 TARGET_DIR=Cura-${BUILD_NAME}-${BUILD_TARGET}
 
 ##Which versions of external programs to use
@@ -145,13 +145,8 @@ if [ "$BUILD_TARGET" = "debian" ]; then
                git pull
                cd ..
        fi
-       if [ ! -d "CuraEngine" ]; then
-               git clone https://github.com/Ultimaker/CuraEngine
-       else
-               cd CuraEngine
-               git pull
-               cd ..
-       fi
+       rm -rf CuraEngine
+       git clone https://github.com/Ultimaker/CuraEngine
        make -C CuraEngine
        rm -rf scripts/linux/debian/usr/share/cura
        mkdir -p scripts/linux/debian/usr/share/cura