Fix the default example path, and add support for version file in frozen build.

[cura.git] / package.sh

diff --git a/package.sh b/package.sh
index acc7fc69d8e97fbdde157d063cded7ea8d06991b..12693f17ab79d45e7605ecd7df43c7ba395690a5 100755 (executable)
--- a/package.sh
+++ b/package.sh
@@ -100,6 +100,15 @@ if [ "$BUILD_TARGET" = "darwin" ]; then
                exit 1
        fi
 
+       downloadURL https://bitbucket.org/pypy/pypy/downloads/pypy-${PYPY_VERSION}-osx64.tar.bz2
+       $TAR -xjf pypy-${PYPY_VERSION}-osx64.tar.bz2
+       mv pypy-${PYPY_VERSION} scripts/darwin/dist/Cura.app/Contents/Resources/pypy
+       #For now, just copy all of Cura so pypy can find it
+       cp -a Cura scripts/darwin/dist/Cura.app/Contents/Resources/
+
+    #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
+
        cd scripts/darwin
 
        # Install QuickLook plugin
@@ -144,6 +153,9 @@ if [ $BUILD_TARGET = "win32" ]; then
        downloadURL http://www.uwe-sieber.de/files/ejectmedia.zip
        #Get pypy
        downloadURL https://bitbucket.org/pypy/pypy/downloads/pypy-${PYPY_VERSION}-win32.zip
+       #Get the power module for python
+       rm -rf Power
+       git clone https://github.com/GreatFruitOmsk/Power
 else
        downloadURL https://bitbucket.org/pypy/pypy/downloads/pypy-${PYPY_VERSION}-${BUILD_TARGET}.tar.bz2
 fi
@@ -177,10 +189,13 @@ 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