X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=package.sh;h=3a604844ac18d6ea57cc3aa86b135646469fcfc5;hb=8250937337e4b8962a9c8082f0ae69b4214f93ca;hp=c950a96a220a90bb03aa1ae2bee91b8f6d8a8e05;hpb=6e0c64c10e13ebbf6e9931b8a041c1fcd8fb7272;p=cura.git diff --git a/package.sh b/package.sh index c950a96a..3a604844 100755 --- a/package.sh +++ b/package.sh @@ -1,7 +1,7 @@ #!/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 @@ -11,18 +11,23 @@ BUILD_TARGET=${1:-all} #BUILD_TARGET=win32 #BUILD_TARGET=linux -#BUILD_TARGET=osx64 +#BUILD_TARGET=darwin +#BUILD_TARGET=debian ##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.10 +export BUILD_NAME=13.12-test TARGET_DIR=Cura-${BUILD_NAME}-${BUILD_TARGET} ##Which versions of external programs to use -PYPY_VERSION=1.9 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 ############################# @@ -62,7 +67,7 @@ function extract if [ "$BUILD_TARGET" = "all" ]; then $0 win32 $0 linux - $0 osx64 + $0 darwin exit fi @@ -76,6 +81,7 @@ checkTool curl "curl: http://curl.haxx.se/" if [ $BUILD_TARGET = "win32" ]; then #Check if we have 7zip, needed to extract and packup a bunch of packages for windows. checkTool 7z "7zip: http://www.7-zip.org/" + checkTool mingw32-make "mingw: http://www.mingw.org/" fi #For building under MacOS we need gnutar instead of tar if [ -z `which gnutar` ]; then @@ -84,6 +90,89 @@ else TAR=gnutar fi + +############################# +# Darwin +############################# + +if [ "$BUILD_TARGET" = "darwin" ]; then + TARGET_DIR=Cura-${BUILD_NAME}-MacOS + + rm -rf scripts/darwin/build + rm -rf scripts/darwin/dist + + python build_app.py py2app + rc=$? + if [[ $rc != 0 ]]; then + echo "Cannot build app." + exit 1 + fi + + #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 ${CURA_ENGINE_REPO} + make -C CuraEngine + cp CuraEngine/CuraEngine scripts/darwin/dist/Cura.app/Contents/Resources/CuraEngine + + 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 + cd dist + $TAR cfp - Cura.app | gzip --best -c > ../../../${TARGET_DIR}.tar.gz + cd .. + + # 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 + +############################# +# Debian .deb +############################# + +if [ "$BUILD_TARGET" = "debian" ]; then + 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 + 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 -R + sudo chmod 755 scripts/linux/debian/usr -R + sudo chmod 755 scripts/linux/debian/DEBIAN -R + cd scripts/linux + dpkg-deb --build debian ${TARGET_DIR}.deb + sudo chown `id -un`:`id -gn` debian -R + exit +fi + +############################# +# Rest +############################# + ############################# # Download all needed files. ############################# @@ -97,17 +186,12 @@ if [ $BUILD_TARGET = "win32" ]; then 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 - #Get pypy - downloadURL https://bitbucket.org/pypy/pypy/downloads/pypy-${PYPY_VERSION}-win32.zip -elif [ $BUILD_TARGET = "osx64" ]; then - downloadURL https://bitbucket.org/pypy/pypy/downloads/pypy-${PYPY_VERSION}-${BUILD_TARGET}.tar.bz2 - downloadURL http://python.org/ftp/python/2.7.3/python-2.7.3-macosx10.6.dmg - downloadURL http://sourceforge.net/projects/numpy/files/NumPy/1.6.2/numpy-1.6.2-py2.7-python.org-macosx10.3.dmg - downloadURL http://pypi.python.org/packages/source/p/pyserial/pyserial-2.6.tar.gz - downloadURL http://pypi.python.org/packages/source/P/PyOpenGL/PyOpenGL-3.0.2.tar.gz - downloadURL http://downloads.sourceforge.net/wxpython/wxPython2.9-osx-2.9.4.0-cocoa-py2.7.dmg -else - downloadURL https://bitbucket.org/pypy/pypy/downloads/pypy-${PYPY_VERSION}-${BUILD_TARGET}.tar.bz2 + 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 ${CURA_ENGINE_REPO} fi ############################# @@ -129,7 +213,8 @@ if [ $BUILD_TARGET = "win32" ]; then 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 @@ -138,16 +223,20 @@ if [ $BUILD_TARGET = "win32" ]; then mv PURELIB/OpenGL ${TARGET_DIR}/python/Lib mv PURELIB/comtypes ${TARGET_DIR}/python/Lib 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 Win32/EjectMedia.exe ${TARGET_DIR}/Cura/ + + rm -rf Power/ 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 @@ -159,17 +248,10 @@ if [ $BUILD_TARGET = "win32" ]; then rm -rf ${TARGET_DIR}/python/Lib/site-packages/wx-2.8-msw-unicode/wx/locale #Remove the gle files because they require MSVCR71.dll, which is not included. We also don't need gle, so it's safe to remove it. rm -rf ${TARGET_DIR}/python/Lib/OpenGL/DLLS/gle* -fi -#Extract pypy -if [ $BUILD_TARGET = "win32" ]; then - extract pypy-${PYPY_VERSION}-win32.zip -o${TARGET_DIR} -else - cd ${TARGET_DIR}; $TAR -xjf ../pypy-${PYPY_VERSION}-${BUILD_TARGET}.tar.bz2; cd .. + #Build the C++ engine + mingw32-make -C CuraEngine fi -mv ${TARGET_DIR}/pypy-* ${TARGET_DIR}/pypy -#Cleanup pypy -rm -rf ${TARGET_DIR}/pypy/lib-python/2.7/test #add Cura mkdir -p ${TARGET_DIR}/Cura @@ -180,6 +262,7 @@ echo $BUILD_NAME > ${TARGET_DIR}/Cura/version #add script files if [ $BUILD_TARGET = "win32" ]; then cp -a scripts/${BUILD_TARGET}/*.bat $TARGET_DIR/ + cp CuraEngine/CuraEngine.exe $TARGET_DIR else cp -a scripts/${BUILD_TARGET}/*.sh $TARGET_DIR/ fi @@ -191,12 +274,12 @@ if (( ${ARCHIVE_FOR_DISTRIBUTION} )); then #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 @@ -205,18 +288,6 @@ if (( ${ARCHIVE_FOR_DISTRIBUTION} )); then '/c/Program Files (x86)/NSIS/makensis.exe' -DVERSION=${BUILD_NAME} 'scripts/win32/installer.nsi' >> log.txt mv scripts/win32/Cura_${BUILD_NAME}.exe ./ fi - elif [ $BUILD_TARGET = "osx64" ]; then - echo "Building osx app" - mkdir -p scripts/osx64/Cura.app/Contents/Resources - mkdir -p scripts/osx64/Cura.app/Contents/Pkgs - rm -rf scripts/osx64/Cura.app/Contents/Resources/* - cp -a ${TARGET_DIR}/* scripts/osx64/Cura.app/Contents/Resources - cp python-2.7.3-macosx10.6.dmg scripts/osx64/Cura.app/Contents/Pkgs - cp numpy-1.6.2-py2.7-python.org-macosx10.3.dmg scripts/osx64/Cura.app/Contents/Pkgs - cp pyserial-2.6.tar.gz scripts/osx64/Cura.app/Contents/Pkgs - cp PyOpenGL-3.0.2.tar.gz scripts/osx64/Cura.app/Contents/Pkgs - cp wxPython2.9-osx-2.9.4.0-cocoa-py2.7.dmg scripts/osx64/Cura.app/Contents/Pkgs - $TAR cfp - scripts/osx64/ | gzip --best -c > ${TARGET_DIR}.tar.gz else echo "Archiving to ${TARGET_DIR}.tar.gz" $TAR cfp - ${TARGET_DIR} | gzip --best -c > ${TARGET_DIR}.tar.gz