X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=package.sh;h=e93d54db678dfd1195e2d807fd014eb498f7d590;hb=c3c35b32507bbf68d85876cb1491ecd59ac04bd4;hp=157d3ab021f224fab5a1acd7b5e4f4dfd0651b90;hpb=c4b3c26be13fdac27ca44a97e3f02bf4d4f9215b;p=cura.git

diff --git a/package.sh b/package.sh
index 157d3ab0..e93d54db 100755
--- a/package.sh
+++ b/package.sh
@@ -8,21 +8,26 @@
 #############################
 
 ##Select the build target
-# BUILD_TARGET=${1:-all}
+BUILD_TARGET=${1:-all}
 #BUILD_TARGET=win32
 #BUILD_TARGET=linux
-BUILD_TARGET=darwin
+#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.11
+export BUILD_NAME=13.11.2
 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
 #############################
@@ -66,29 +71,60 @@ if [ "$BUILD_TARGET" = "all" ]; then
 	exit
 fi
 
+# Change working directory to the directory the script is in
+# http://stackoverflow.com/a/246128
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd $SCRIPT_DIR
+
+checkTool git "git: http://git-scm.com/"
+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
+	TAR=tar
+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 setup.py py2app
+	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 STLQuickLook.qlgenerator dist/Cura.app/Contents/Library/QuickLook/
+	cp -a STLQuickLook.qlgenerator dist/Cura.app/Contents/Library/QuickLook/
 
 	# Archive app
-	$TAR cfp - dist/Cura.app | gzip --best -c > ../../${TARGET_DIR}.tar.gz
+	cd dist
+	$TAR cfp - Cura.app | gzip --best -c > ../../../${TARGET_DIR}.tar.gz
+	cd ..
 
 	# Create sparse image for distribution
 	hdiutil detach /Volumes/Cura\ -\ Ultimaker/
@@ -103,27 +139,40 @@ if [ "$BUILD_TARGET" = "darwin" ]; then
 fi
 
 #############################
-# Rest
+# Debian .deb
 #############################
 
-# Change working directory to the directory the script is in
-# http://stackoverflow.com/a/246128
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd $SCRIPT_DIR
-
-checkTool git "git: http://git-scm.com/"
-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/"
-fi
-#For building under MacOS we need gnutar instead of tar
-if [ -z `which gnutar` ]; then
-	TAR=tar
-else
-	TAR=gnutar
+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.
 #############################
@@ -138,10 +187,11 @@ if [ $BUILD_TARGET = "win32" ]; then
 	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
 	downloadURL http://www.uwe-sieber.de/files/ejectmedia.zip
-	#Get pypy
-	downloadURL https://bitbucket.org/pypy/pypy/downloads/pypy-${PYPY_VERSION}-win32.zip
-else
-	downloadURL https://bitbucket.org/pypy/pypy/downloads/pypy-${PYPY_VERSION}-${BUILD_TARGET}.tar.bz2
+	#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
 
 #############################
@@ -173,10 +223,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
@@ -195,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
@@ -216,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