Allow for odd shaped platforms and generalize the UM2 clip code into no-go zones.

[cura.git] / package.sh

diff --git a/package.sh b/package.sh
index acdbaffcda2a08dec53fa306586ba8b6759a9770..e93d54db678dfd1195e2d807fd014eb498f7d590 100755 (executable)
--- a/package.sh
+++ b/package.sh
@@ -17,12 +17,17 @@ 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.06.5
+export BUILD_NAME=13.11.2
 TARGET_DIR=Cura-${BUILD_NAME}-${BUILD_TARGET}
 
 ##Which versions of external programs to use
 WIN_PORTABLE_PY_VERSION=2.7.2.1
 
+##Which CuraEngine to use
+if [ -z ${CURA_ENGINE_REPO} ] ; then
+       CURA_ENGINE_REPO="https://github.com/Ultimaker/CuraEngine"
+fi
+
 #############################
 # Support functions
 #############################
@@ -106,7 +111,7 @@ if [ "$BUILD_TARGET" = "darwin" ]; then
     #Add cura version file (should read the version from the bundle with pyobjc, but will figure that out later)
     echo $BUILD_NAME > scripts/darwin/dist/Cura.app/Contents/Resources/version
        rm -rf CuraEngine
-       git clone https://github.com/Ultimaker/CuraEngine
+       git clone ${CURA_ENGINE_REPO}
        make -C CuraEngine
        cp CuraEngine/CuraEngine scripts/darwin/dist/Cura.app/Contents/Resources/CuraEngine
 
@@ -138,8 +143,15 @@ fi
 #############################
 
 if [ "$BUILD_TARGET" = "debian" ]; then
-       git clone https://github.com/GreatFruitOmsk/Power
-       git clone https://github.com/Ultimaker/CuraEngine
+       if [ ! -d "Power" ]; then
+               git clone https://github.com/GreatFruitOmsk/Power
+       else
+               cd Power
+               git pull
+               cd ..
+       fi
+       rm -rf CuraEngine
+       git clone ${CURA_ENGINE_REPO}
        make -C CuraEngine
        rm -rf scripts/linux/debian/usr/share/cura
        mkdir -p scripts/linux/debian/usr/share/cura
@@ -148,7 +160,7 @@ if [ "$BUILD_TARGET" = "debian" ]; then
        cp scripts/linux/cura.py scripts/linux/debian/usr/share/cura/
        cp -a Power/power scripts/linux/debian/usr/share/cura/
        echo $BUILD_NAME > scripts/linux/debian/usr/share/cura/Cura/version
-       sudo chown root:root scripts/linux/debian/usr -R
+       sudo chown root:root scripts/linux/debian -R
        sudo chmod 755 scripts/linux/debian/usr -R
        sudo chmod 755 scripts/linux/debian/DEBIAN -R
        cd scripts/linux
@@ -179,7 +191,7 @@ if [ $BUILD_TARGET = "win32" ]; then
        rm -rf Power
        git clone https://github.com/GreatFruitOmsk/Power
        rm -rf CuraEngine
-       git clone https://github.com/Ultimaker/CuraEngine
+       git clone ${CURA_ENGINE_REPO}
 fi
 
 #############################