chiark / gitweb /
Use Power as pip dependency, not git submodule.
[cura.git] / package.sh
index d6260d21c338c7a3791c35d610c3f5297ca99c4c..57726525be4bf287d8b40d4fafa33746ddc46c06 100755 (executable)
@@ -1,28 +1,27 @@
 #!/bin/bash
 
-# This script is to package the Cura package for Windows/Linux and OSx
-# This script should run under Linux and OSx, as well as Windows with Cygwin.
+# This script is to package the Cura package for Windows/Linux and Mac OS X
+# This script should run under Linux and Mac OS X, as well as Windows with Cygwin.
 
 #############################
 # CONFIGURATION
 #############################
 
 ##Select the build target
-BUILD_TARGET=${1:-all}
+BUILD_TARGET=${1:-all}
 #BUILD_TARGET=win32
 #BUILD_TARGET=linux
-#BUILD_TARGET=osx64
+BUILD_TARGET=darwin
 
 ##Do we need to create the final archive
 ARCHIVE_FOR_DISTRIBUTION=1
 ##Which version name are we appending to the final archive
-BUILD_NAME=12.08
-TARGET_DIR=${BUILD_TARGET}-Cura-${BUILD_NAME}
+BUILD_NAME=12.11
+TARGET_DIR=Cura-${BUILD_NAME}-${BUILD_TARGET}
 
 ##Which versions of external programs to use
-PYPY_VERSION=c-jit-latest
+PYPY_VERSION=1.9
 WIN_PORTABLE_PY_VERSION=2.7.2.1
-WIN_PYSERIAL_VERSION=2.5
 
 #############################
 # Support functions
@@ -36,16 +35,77 @@ function checkTool
        fi
 }
 
+function downloadURL
+{
+       filename=`basename "$1"`
+       echo "Checking for $filename"
+       if [ ! -f "$filename" ]; then
+               echo "Downloading $1"
+               curl -L -O "$1"
+               if [ $? != 0 ]; then
+                       echo "Failed to download $1"
+                       exit 1
+               fi
+       fi
+}
+
+function extract
+{
+       echo "Extracting $*"
+       echo "7z x -y $*" >> log.txt
+       7z x -y $* >> log.txt
+}
+
 #############################
 # Actual build script
 #############################
 if [ "$BUILD_TARGET" = "all" ]; then
        $0 win32
        $0 linux
-       $0 osx64
+       $0 darwin
        exit
 fi
 
+#############################
+# Darwin
+#############################
+
+if [ "$BUILD_TARGET" = "darwin" ]; then
+       rm -rf scripts/darwin/build
+       rm -rf scripts/darwin/dist
+
+       python setup.py py2app
+       rc=$?
+       if [[ $rc != 0 ]]; then
+               echo "Cannot build app."
+               exit 1
+       fi
+
+       cd scripts/darwin
+
+       # Install QuickLook plugin
+       mkdir -p dist/Cura.app/Contents/Library/QuickLook
+       cp -a STLQuickLook.qlgenerator dist/Cura.app/Contents/Library/QuickLook/
+
+       # Archive app
+       $TAR cfp - dist/Cura.app | gzip --best -c > ../../${TARGET_DIR}.tar.gz
+
+       # Create sparse image for distribution
+       hdiutil detach /Volumes/Cura\ -\ Ultimaker/
+       rm -rf Cura.dmg.sparseimage
+       hdiutil convert DmgTemplateCompressed.dmg -format UDSP -o Cura.dmg
+       hdiutil resize -size 500m Cura.dmg.sparseimage
+       hdiutil attach Cura.dmg.sparseimage
+       cp -a dist/Cura.app /Volumes/Cura\ -\ Ultimaker/Cura/
+       hdiutil detach /Volumes/Cura\ -\ Ultimaker
+       hdiutil convert Cura.dmg.sparseimage -format UDZO -imagekey zlib-level=9 -ov -o ../../${TARGET_DIR}.dmg
+       exit
+fi
+
+#############################
+# Rest
+#############################
+
 # Change working directory to the directory the script is in
 # http://stackoverflow.com/a/246128
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -70,39 +130,18 @@ fi
 
 if [ $BUILD_TARGET = "win32" ]; then
        #Get portable python for windows and extract it. (Linux and Mac need to install python themselfs)
-       if [ ! -f "PortablePython_${WIN_PORTABLE_PY_VERSION}.exe" ]; then
-               curl -L -O http://ftp.nluug.nl/languages/python/portablepython/v2.7/PortablePython_${WIN_PORTABLE_PY_VERSION}.exe
-       fi
-       if [ ! -f pyserial-${WIN_PYSERIAL_VERSION}.exe ]; then
-               curl -L -O http://sourceforge.net/projects/pyserial/files/pyserial/${WIN_PYSERIAL_VERSION}/pyserial-${WIN_PYSERIAL_VERSION}.win32.exe/download
-               mv download pyserial-${WIN_PYSERIAL_VERSION}.exe
-       fi
-       if [ ! -f PyOpenGL-3.0.1.win32.exe ]; then
-               curl -L -O http://sourceforge.net/projects/pyopengl/files/PyOpenGL/3.0.1/PyOpenGL-3.0.1.win32.exe
-       fi
-       if [ ! -f numpy-1.6.2-win32-superpack-python2.7.exe ]; then
-               curl -L -O http://sourceforge.net/projects/numpy/files/NumPy/1.6.2/numpy-1.6.2-win32-superpack-python2.7.exe
-       fi
+       downloadURL http://ftp.nluug.nl/languages/python/portablepython/v2.7/PortablePython_${WIN_PORTABLE_PY_VERSION}.exe
+       downloadURL http://sourceforge.net/projects/pyserial/files/pyserial/2.5/pyserial-2.5.win32.exe
+       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://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 pypy
-       if [ ! -f "pypy-${PYPY_VERSION}-win32.zip" ]; then
-       #       curl -L -O https://bitbucket.org/pypy/pypy/downloads/pypy-${PYPY_VERSION}-win32.zip
-               curl -L -O http://buildbot.pypy.org/nightly/trunk/pypy-${PYPY_VERSION}-win32.zip
-       fi
+       downloadURL https://bitbucket.org/pypy/pypy/downloads/pypy-${PYPY_VERSION}-win32.zip
 else
-       if [ ! -f "pypy-${PYPY_VERSION}-${BUILD_TARGET}.tar.bz2" ]; then
-       #       curl -L -O https://bitbucket.org/pypy/pypy/downloads/pypy-${PYPY_VERSION}-${BUILD_TARGET}.tar.bz2
-               curl -L -O http://buildbot.pypy.org/nightly/trunk/pypy-${PYPY_VERSION}-${BUILD_TARGET}.tar.bz2
-       fi
-fi
-
-#Get our own version of Printrun
-if [ ! -d "Printrun" ]; then
-  git clone git://github.com/daid/Printrun.git
-else
-  echo "Updating Printrun"
-  cd Printrun
-  git pull
-  cd ..
+       downloadURL https://bitbucket.org/pypy/pypy/downloads/pypy-${PYPY_VERSION}-${BUILD_TARGET}.tar.bz2
 fi
 
 #############################
@@ -111,26 +150,40 @@ fi
 rm -rf ${TARGET_DIR}
 mkdir -p ${TARGET_DIR}
 
+rm -f log.txt
 if [ $BUILD_TARGET = "win32" ]; then
        #For windows extract portable python to include it.
-       7z x PortablePython_${WIN_PORTABLE_PY_VERSION}.exe \$_OUTDIR/App
-       7z x PortablePython_${WIN_PORTABLE_PY_VERSION}.exe \$_OUTDIR/Lib/site-packages
-       7z x pyserial-${WIN_PYSERIAL_VERSION}.exe PURELIB
-       7z x PyOpenGL-3.0.1.win32.exe PURELIB
-       7z x numpy-1.6.2-win32-superpack-python2.7.exe numpy-1.6.2-sse2.exe
-       7z x numpy-1.6.2-sse2.exe PLATLIB
+       extract PortablePython_${WIN_PORTABLE_PY_VERSION}.exe \$_OUTDIR/App
+       extract PortablePython_${WIN_PORTABLE_PY_VERSION}.exe \$_OUTDIR/Lib/site-packages
+       extract pyserial-2.5.win32.exe PURELIB
+       extract PyOpenGL-3.0.1.win32.exe PURELIB
+       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 comtypes-0.6.2.win32.exe
+       extract ejectmedia.zip Win32
 
        mkdir -p ${TARGET_DIR}/python
+       mkdir -p ${TARGET_DIR}/Cura/
        mv \$_OUTDIR/App/* ${TARGET_DIR}/python
        mv \$_OUTDIR/Lib/site-packages/wx* ${TARGET_DIR}/python/Lib/site-packages/
        mv PURELIB/serial ${TARGET_DIR}/python/Lib
        mv PURELIB/OpenGL ${TARGET_DIR}/python/Lib
+       mv PURELIB/comtypes ${TARGET_DIR}/python/Lib
        mv PLATLIB/numpy ${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 Win32/EjectMedia.exe ${TARGET_DIR}/Cura/
        rm -rf \$_OUTDIR
        rm -rf PURELIB
        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
+
        #Clean up portable python a bit, to keep the package size down.
        rm -rf ${TARGET_DIR}/python/PyScripter.*
        rm -rf ${TARGET_DIR}/python/Doc
@@ -146,44 +199,47 @@ fi
 
 #Extract pypy
 if [ $BUILD_TARGET = "win32" ]; then
-       7z x pypy-${PYPY_VERSION}-win32.zip -o${TARGET_DIR}
+       extract pypy-${PYPY_VERSION}-win32.zip -o${TARGET_DIR}
 else
        cd ${TARGET_DIR}; $TAR -xjf ../pypy-${PYPY_VERSION}-${BUILD_TARGET}.tar.bz2; cd ..
 fi
-mv ${TARGET_DIR}/pypy-*-${BUILD_TARGET} ${TARGET_DIR}/pypy
+mv ${TARGET_DIR}/pypy-* ${TARGET_DIR}/pypy
 #Cleanup pypy
 rm -rf ${TARGET_DIR}/pypy/lib-python/2.7/test
 
 #add Cura
-cp -a Cura ${TARGET_DIR}/Cura
+mkdir -p ${TARGET_DIR}/Cura
+cp -a Cura/* ${TARGET_DIR}/Cura
 #Add cura version file
 echo $BUILD_NAME > ${TARGET_DIR}/Cura/version
 
-#add printrun
-cp -a Printrun ${TARGET_DIR}/Printrun
-rm -rf ${TARGET_DIR}/Printrun/.git*
-
 #add script files
 if [ $BUILD_TARGET = "win32" ]; then
     cp -a scripts/${BUILD_TARGET}/*.bat $TARGET_DIR/
 else
     cp -a scripts/${BUILD_TARGET}/*.sh $TARGET_DIR/
-    cp -a scripts/${BUILD_TARGET}/*.command $TARGET_DIR/
 fi
 
 #package the result
 if (( ${ARCHIVE_FOR_DISTRIBUTION} )); then
        if [ $BUILD_TARGET = "win32" ]; then
-               rm ${TARGET_DIR}.zip
-               cd ${TARGET_DIR}
-               7z a ../${TARGET_DIR}.zip *
-               cd ..
-               
+               #rm ${TARGET_DIR}.zip
+               #cd ${TARGET_DIR}
+               #7z a ../${TARGET_DIR}.zip *
+               #cd ..
+
                if [ ! -z `which wine` ]; then
                        #if we have wine, try to run our nsis script.
                        rm -rf scripts/win32/dist
                        ln -sf `pwd`/${TARGET_DIR} scripts/win32/dist
-                       wine ~/.wine/drive_c/Program\ Files/NSIS/makensis.exe /DVERSION=${BUILD_NAME} scripts/win32/installer.nsi 
+                       wine ~/.wine/drive_c/Program\ Files/NSIS/makensis.exe /DVERSION=${BUILD_NAME} scripts/win32/installer.nsi
+                       mv scripts/win32/Cura_${BUILD_NAME}.exe ./
+               fi
+               if [ -f '/c/Program Files (x86)/NSIS/makensis.exe' ]; then
+                       rm -rf scripts/win32/dist
+                       mv `pwd`/${TARGET_DIR} scripts/win32/dist
+                       '/c/Program Files (x86)/NSIS/makensis.exe' -DVERSION=${BUILD_NAME} 'scripts/win32/installer.nsi' >> log.txt
+                       mv scripts/win32/Cura_${BUILD_NAME}.exe ./
                fi
        else
                echo "Archiving to ${TARGET_DIR}.tar.gz"
@@ -192,4 +248,3 @@ if (( ${ARCHIVE_FOR_DISTRIBUTION} )); then
 else
        echo "Installed into ${TARGET_DIR}"
 fi
-