X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=package.sh;h=3a604844ac18d6ea57cc3aa86b135646469fcfc5;hb=8250937337e4b8962a9c8082f0ae69b4214f93ca;hp=9c27ef38e067863fa05abfffc6847c68c06f106a;hpb=58e428b73301e5c474fc3e205aa367ab6e5b1b05;p=cura.git

diff --git a/package.sh b/package.sh
index 9c27ef38..3a604844 100755
--- a/package.sh
+++ b/package.sh
@@ -17,12 +17,17 @@ 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.06
+export BUILD_NAME=13.12-test
 TARGET_DIR=Cura-${BUILD_NAME}-${BUILD_TARGET}
 
 ##Which versions of external programs to use
 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
 #############################
@@ -105,7 +110,10 @@ 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
-    cp CuraEngine scripts/darwin/dist/Cura.app/Contents/Resources/CuraEngine
+	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
 
@@ -135,15 +143,26 @@ fi
 #############################
 
 if [ "$BUILD_TARGET" = "debian" ]; then
-	git clone https://github.com/GreatFruitOmsk/Power
+	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/DEBIAN/*
+	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
@@ -172,7 +191,7 @@ if [ $BUILD_TARGET = "win32" ]; then
 	rm -rf Power
 	git clone https://github.com/GreatFruitOmsk/Power
 	rm -rf CuraEngine
-	git clone https://github.com/Ultimaker/CuraEngine
+	git clone ${CURA_ENGINE_REPO}
 fi
 
 #############################