Remove the old print window code.

[cura.git] / package.sh

diff --git a/package.sh b/package.sh
index 9c27ef38e067863fa05abfffc6847c68c06f106a..376446df022edc731a266c369705a2790f455f4c 100755 (executable)
--- a/package.sh
+++ b/package.sh
@@ -12,17 +12,23 @@ BUILD_TARGET=${1:-all}
 #BUILD_TARGET=win32
 #BUILD_TARGET=linux
 #BUILD_TARGET=darwin
-#BUILD_TARGET=debian
+#BUILD_TARGET=debian_i386
+#BUILD_TARGET=debian_amd64
 
 ##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
+export BUILD_NAME=14.02-TEST1
 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
 #############################
@@ -105,7 +111,10 @@ 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
-    cp CuraEngine scripts/darwin/dist/Cura.app/Contents/Resources/CuraEngine
+       rm -rf CuraEngine
+       git clone ${CURA_ENGINE_REPO}
+       make -C CuraEngine
+       cp CuraEngine/CuraEngine scripts/darwin/dist/Cura.app/Contents/Resources/CuraEngine
 
        cd scripts/darwin
 
@@ -131,25 +140,74 @@ if [ "$BUILD_TARGET" = "darwin" ]; then
 fi
 
 #############################
-# Debian .deb
+# Debian 32bit .deb
 #############################
 
-if [ "$BUILD_TARGET" = "debian" ]; then
-       git clone https://github.com/GreatFruitOmsk/Power
-       rm -rf scripts/linux/debian/usr/share/cura
-       mkdir -p scripts/linux/debian/usr/share/cura
-       cp -a Cura scripts/linux/debian/usr/share/cura/
-       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 -R
-       sudo chmod 755 scripts/linux/debian/DEBIAN/*
+if [ "$BUILD_TARGET" = "debian_i386" ]; then
+    export CXX="g++ -m32"
+       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/${BUILD_TARGET}/usr/share/cura
+       mkdir -p scripts/linux/${BUILD_TARGET}/usr/share/cura
+       cp -a Cura scripts/linux/${BUILD_TARGET}/usr/share/cura/
+       cp -a resources scripts/linux/${BUILD_TARGET}/usr/share/cura/
+       cp -a plugins scripts/linux/${BUILD_TARGET}/usr/share/cura/
+       cp -a CuraEngine/CuraEngine scripts/linux/${BUILD_TARGET}/usr/share/cura/
+       cp scripts/linux/cura.py scripts/linux/${BUILD_TARGET}/usr/share/cura/
+       cp -a Power/power scripts/linux/${BUILD_TARGET}/usr/share/cura/
+       echo $BUILD_NAME > scripts/linux/${BUILD_TARGET}/usr/share/cura/Cura/version
+       sudo chown root:root scripts/linux/${BUILD_TARGET} -R
+       sudo chmod 755 scripts/linux/${BUILD_TARGET}/usr -R
+       sudo chmod 755 scripts/linux/${BUILD_TARGET}/DEBIAN -R
+       cd scripts/linux
+       dpkg-deb --build ${BUILD_TARGET} $(dirname ${TARGET_DIR})/cura_${BUILD_NAME}-${BUILD_TARGET}.deb
+       sudo chown `id -un`:`id -gn` ${BUILD_TARGET} -R
+       exit
+fi
+
+#############################
+# Debian 64bit .deb
+#############################
+
+if [ "$BUILD_TARGET" = "debian_amd64" ]; then
+    export CXX="g++ -m64"
+       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/${BUILD_TARGET}/usr/share/cura
+       mkdir -p scripts/linux/${BUILD_TARGET}/usr/share/cura
+       cp -a Cura scripts/linux/${BUILD_TARGET}/usr/share/cura/
+       cp -a resources scripts/linux/${BUILD_TARGET}/usr/share/cura/
+       cp -a plugins scripts/linux/${BUILD_TARGET}/usr/share/cura/
+       cp -a CuraEngine/CuraEngine scripts/linux/${BUILD_TARGET}/usr/share/cura/
+       cp scripts/linux/cura.py scripts/linux/${BUILD_TARGET}/usr/share/cura/
+       cp -a Power/power scripts/linux/${BUILD_TARGET}/usr/share/cura/
+       echo $BUILD_NAME > scripts/linux/${BUILD_TARGET}/usr/share/cura/Cura/version
+       sudo chown root:root scripts/linux/${BUILD_TARGET} -R
+       sudo chmod 755 scripts/linux/${BUILD_TARGET}/usr -R
+       sudo chmod 755 scripts/linux/${BUILD_TARGET}/DEBIAN -R
        cd scripts/linux
-       dpkg-deb --build debian ${TARGET_DIR}.deb
-       sudo chown `id -un`:`id -gn` debian -R
+       dpkg-deb --build ${BUILD_TARGET} $(dirname ${TARGET_DIR})/cura_${BUILD_NAME}-${BUILD_TARGET}.deb
+       sudo chown `id -un`:`id -gn` ${BUILD_TARGET} -R
        exit
 fi
 
+
 #############################
 # Rest
 #############################
@@ -172,7 +230,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
 
 #############################
@@ -235,8 +293,10 @@ if [ $BUILD_TARGET = "win32" ]; then
 fi
 
 #add Cura
-mkdir -p ${TARGET_DIR}/Cura
+mkdir -p ${TARGET_DIR}/Cura ${TARGET_DIR}/resources ${TARGET_DIR}/plugins
 cp -a Cura/* ${TARGET_DIR}/Cura
+cp -a resources/* ${TARGET_DIR}/resources
+cp -a plugins/* ${TARGET_DIR}/plugins
 #Add cura version file
 echo $BUILD_NAME > ${TARGET_DIR}/Cura/version