From: Bill Bumgarner <bbum@mac.com>
Date: Sat, 10 Mar 2012 19:25:11 +0000 (-0800)
Subject: - build.sh now copies just the startup scripts, and not any editor turds.
X-Git-Tag: RC3~92^2~13
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8d78a0224f12fdf77264f4a89989eeacd83b341a;p=cura.git

- build.sh now copies just the startup scripts, and not any editor turds.

- startup scripts on Mac OS X are marked executable

- startup scripts now make sure that PyOpenGL is installed
---

diff --git a/build.sh b/build.sh
index 51a08c63..d3e1acd4 100755
--- a/build.sh
+++ b/build.sh
@@ -138,7 +138,11 @@ cp -a SkeinPyPy_NewUI ${TARGET_DIR}/SkeinPyPy
 mv Printrun ${TARGET_DIR}/Printrun
 
 #add script files
-cp -a scripts/${BUILD_TARGET}/* $TARGET_DIR/
+if [ $BUILD_TARGET = "win32" ]; then
+    cp -a scripts/${BUILD_TARGET}/*.bat $TARGET_DIR/
+else
+    cp -a scripts/${BUILD_TARGET}/*.sh $TARGET_DIR/
+fi
 
 #add readme file
 cp README ${TARGET_DIR}/README.txt
diff --git a/scripts/osx64/pronterface.sh b/scripts/osx64/pronterface.sh
old mode 100644
new mode 100755
diff --git a/scripts/osx64/skeinpypy.sh b/scripts/osx64/skeinpypy.sh
new file mode 100755
index 00000000..736b3018
--- /dev/null
+++ b/scripts/osx64/skeinpypy.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+python2.7 -c 'import OpenGL'
+if [ $? != 0 ]; then
+	echo "Requires PyOpenGL"
+	echo " sudo easy_install-2.7 PyOpenGL"
+	exit 1
+fi
+
+python2.7 -c 'import wx'
+if [ $? != 0 ]; then
+	echo "Requires wx. Download and install (the Cocoa/64-bit variant) from:"
+	echo " http://www.wxpython.org/download.php"
+	exit 1
+fi
+
+python2.7 -c 'import serial'
+if [ $? != 0 ]; then
+	echo "Requires pyserial."
+	echo " sudo easy_install-2.7 pyserial"
+	exit 1
+fi
+
+SCRIPT_DIR=`dirname $0`
+python2.7 ${SCRIPT_DIR}/SkeinPyPy/skeinpypy.py
+