chiark / gitweb /
~ianmdlvl / cura.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add plugins to MacOS resources.
[cura.git] / package.sh
diff --git a/package.sh b/package.sh
index 068333fa514d8534f500830e5dde6d7bda746208..05f840b500cebe930227d53513f4320cf0c8495c 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
-export BUILD_NAME=13.10
+export BUILD_NAME=14.02-RC1
 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 +112,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
 
@@ -134,10 +140,11 @@ if [ "$BUILD_TARGET" = "darwin" ]; then
 fi
 
 #############################
-# Debian .deb
+# Debian 32bit .deb
 #############################
 
-if [ "$BUILD_TARGET" = "debian" ]; then
+if [ "$BUILD_TARGET" = "debian_i386" ]; then
+    export CXX="g++ -m32"
        if [ ! -d "Power" ]; then
                git clone https://github.com/GreatFruitOmsk/Power
        else
@@ -146,24 +153,61 @@ if [ "$BUILD_TARGET" = "debian" ]; then
                cd ..
        fi
        rm -rf CuraEngine
-       git clone https://github.com/Ultimaker/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
-       cp -a Cura scripts/linux/debian/usr/share/cura/
-       cp -a CuraEngine/CuraEngine 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/usr -R
-       sudo chmod 755 scripts/linux/debian/usr -R
-       sudo chmod 755 scripts/linux/debian/DEBIAN -R
+       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
 
+#############################
+# 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 ${BUILD_TARGET} $(dirname ${TARGET_DIR})/cura_${BUILD_NAME}-${BUILD_TARGET}.deb
+       sudo chown `id -un`:`id -gn` ${BUILD_TARGET} -R
+       exit
+fi
+
+
 #############################
 # Rest
 #############################
@@ -179,14 +223,14 @@ if [ $BUILD_TARGET = "win32" ]; then
        downloadURL http://sourceforge.net/projects/pyopengl/files/PyOpenGL/3.0.1/PyOpenGL-3.0.1.win32.exe
        downloadURL http://sourceforge.net/projects/numpy/files/NumPy/1.6.2/numpy-1.6.2-win32-superpack-python2.7.exe
        downloadURL http://videocapture.sourceforge.net/VideoCapture-0.9-5.zip
-       downloadURL http://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-20120927-git-13f0cd6-win32-static.7z
+       #downloadURL http://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-20120927-git-13f0cd6-win32-static.7z
        downloadURL http://sourceforge.net/projects/comtypes/files/comtypes/0.6.2/comtypes-0.6.2.win32.exe
        downloadURL http://www.uwe-sieber.de/files/ejectmedia.zip
        #Get the power module for python
        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
 
 #############################
@@ -205,8 +249,8 @@ if [ $BUILD_TARGET = "win32" ]; then
        extract numpy-1.6.2-win32-superpack-python2.7.exe numpy-1.6.2-sse2.exe
        extract numpy-1.6.2-sse2.exe PLATLIB
        extract VideoCapture-0.9-5.zip VideoCapture-0.9-5/Python27/DLLs/vidcap.pyd
-       extract ffmpeg-20120927-git-13f0cd6-win32-static.7z ffmpeg-20120927-git-13f0cd6-win32-static/bin/ffmpeg.exe
-       extract ffmpeg-20120927-git-13f0cd6-win32-static.7z ffmpeg-20120927-git-13f0cd6-win32-static/licenses
+       #extract ffmpeg-20120927-git-13f0cd6-win32-static.7z ffmpeg-20120927-git-13f0cd6-win32-static/bin/ffmpeg.exe
+       #extract ffmpeg-20120927-git-13f0cd6-win32-static.7z ffmpeg-20120927-git-13f0cd6-win32-static/licenses
        extract comtypes-0.6.2.win32.exe
        extract ejectmedia.zip Win32
 
@@ -220,8 +264,8 @@ if [ $BUILD_TARGET = "win32" ]; then
        mv PLATLIB/numpy ${TARGET_DIR}/python/Lib
        mv Power/power ${TARGET_DIR}/python/Lib
        mv VideoCapture-0.9-5/Python27/DLLs/vidcap.pyd ${TARGET_DIR}/python/DLLs
-       mv ffmpeg-20120927-git-13f0cd6-win32-static/bin/ffmpeg.exe ${TARGET_DIR}/Cura/
-       mv ffmpeg-20120927-git-13f0cd6-win32-static/licenses ${TARGET_DIR}/Cura/ffmpeg-licenses/
+       #mv ffmpeg-20120927-git-13f0cd6-win32-static/bin/ffmpeg.exe ${TARGET_DIR}/Cura/
+       #mv ffmpeg-20120927-git-13f0cd6-win32-static/licenses ${TARGET_DIR}/Cura/ffmpeg-licenses/
        mv Win32/EjectMedia.exe ${TARGET_DIR}/Cura/
        
        rm -rf Power/
@@ -230,7 +274,7 @@ if [ $BUILD_TARGET = "win32" ]; then
        rm -rf PLATLIB
        rm -rf VideoCapture-0.9-5
        rm -rf numpy-1.6.2-sse2.exe
-       rm -rf ffmpeg-20120927-git-13f0cd6-win32-static
+       #rm -rf ffmpeg-20120927-git-13f0cd6-win32-static
 
        #Clean up portable python a bit, to keep the package size down.
        rm -rf ${TARGET_DIR}/python/PyScripter.*
@@ -249,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
 
Unnamed repository; edit this file 'description' to name the repository.