chiark
/
gitweb
/
~ianmdlvl
/
cura.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0f00cf6
)
Remove references to the steamengine from the package script.
author
daid303
<daid303@gmail.com>
Thu, 16 May 2013 09:34:05 +0000
(11:34 +0200)
committer
daid303
<daid303@gmail.com>
Thu, 16 May 2013 09:34:05 +0000
(11:34 +0200)
package.sh
patch
|
blob
|
history
diff --git
a/package.sh
b/package.sh
index ea9ec2f499b1f3936291c019db0dea5f5ec20332..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
##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.0
4-SteamEngine
+BUILD_NAME=13.0
5
TARGET_DIR=Cura-${BUILD_NAME}-${BUILD_TARGET}
##Which versions of external programs to use
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
#############################
WIN_PORTABLE_PY_VERSION=2.7.2.1
#############################
@@
-105,7
+104,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
#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
SteamEngine scripts/darwin/dist/Cura.app/Contents/Resources/Steam
Engine
+ cp
CuraEngine scripts/darwin/dist/Cura.app/Contents/Resources/Cura
Engine
cd scripts/darwin
cd scripts/darwin
@@
-171,8
+170,6
@@
if [ $BUILD_TARGET = "win32" ]; then
#Get the power module for python
rm -rf Power
git clone https://github.com/GreatFruitOmsk/Power
#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
#############################
fi
#############################
@@
-240,7
+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/
#add script files
if [ $BUILD_TARGET = "win32" ]; then
cp -a scripts/${BUILD_TARGET}/*.bat $TARGET_DIR/
- cp
Steam
Engine.exe $TARGET_DIR
+ cp
Cura
Engine.exe $TARGET_DIR
else
cp -a scripts/${BUILD_TARGET}/*.sh $TARGET_DIR/
fi
else
cp -a scripts/${BUILD_TARGET}/*.sh $TARGET_DIR/
fi