Remove references to the steamengine from the package script.

[cura.git] / package.sh

diff --git a/package.sh b/package.sh
index e92938b317a01b4970a7655bc13f5917913c45e6..ecba8fea281df8963728b1beea32f94166495c5d 100755 (executable)
--- a/package.sh
+++ b/package.sh
@@ -17,11 +17,10 @@ BUILD_TARGET=${1:-all}
 ##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.03
+BUILD_NAME=13.05
 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
 
 #############################
@@ -103,14 +102,9 @@ 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
+    cp CuraEngine scripts/darwin/dist/Cura.app/Contents/Resources/CuraEngine
 
        cd scripts/darwin
 
@@ -176,8 +170,6 @@ if [ $BUILD_TARGET = "win32" ]; then
        #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
 
 #############################
@@ -245,6 +237,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.exe $TARGET_DIR
 else
     cp -a scripts/${BUILD_TARGET}/*.sh $TARGET_DIR/
 fi