From: Bill Bumgarner <bbum@mac.com>
Date: Sat, 10 Mar 2012 19:01:46 +0000 (+0800)
Subject: - build.sh can now take an optional argument that is the architecture of the target... 
X-Git-Tag: RC1~99
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d7d543e199ca05f8e45546384d78e5b2a6318b6f;p=cura.git

- build.sh can now take an optional argument that is the architecture of the target platform.  I.e.:

  ./build.sh osx64

- updated to use the latest nightly pypy as it both seems relatively stable and the URL is subject to less rot

- updated pronterface.sh to push user to installing Cocoa variant of wxPython and to no longer launch in 32 bit mode
---

diff --git a/build.sh b/build.sh
index e6981c5e..51a08c63 100755
--- a/build.sh
+++ b/build.sh
@@ -9,7 +9,7 @@
 
 
 ##Select the build target
-BUILD_TARGET=win32
+BUILD_TARGET=${1:-win32}
 #BUILD_TARGET=linux
 #BUILD_TARGET=osx64
 
@@ -20,7 +20,7 @@ BUILD_NAME=NewUI-Beta4
 TARGET_DIR=${BUILD_TARGET}-SkeinPyPy-${BUILD_NAME}
 
 ##Which versions of external programs to use
-PYPY_VERSION=c-jit-53274-487174b08100
+PYPY_VERSION=c-jit-latest
 WIN_PORTABLE_PY_VERSION=2.7.2.1
 WIN_PYSERIAL_VERSION=2.5
 
@@ -126,7 +126,7 @@ if [ $BUILD_TARGET = "win32" ]; then
 	mv ${TARGET_DIR}/pypy-${PYPY_VERSION}* ${TARGET_DIR}/pypy
 else
 	cd ${TARGET_DIR}; $TAR -xjf ../pypy-${PYPY_VERSION}-${BUILD_TARGET}.tar.bz2; cd ..
-	mv ${TARGET_DIR}/pypy-${PYPY_VERSION}* ${TARGET_DIR}/pypy
+	mv ${TARGET_DIR}/pypy-*-${BUILD_TARGET} ${TARGET_DIR}/pypy
 fi
 #Cleanup pypy
 rm -rf ${TARGET_DIR}/pypy/lib-python/2.7/test
diff --git a/scripts/osx64/pronterface.sh b/scripts/osx64/pronterface.sh
index 93005942..83896aa0 100644
--- a/scripts/osx64/pronterface.sh
+++ b/scripts/osx64/pronterface.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-arch -arch i386 python2.7 -c 'import wx'
+python2.7 -c 'import wx'
 if [ $? != 0 ]; then
-	echo "Requires wx. Download and install from:"
+	echo "Requires wx. Download and install (the Cocoa/64-bit variant) from:"
 	echo " http://www.wxpython.org/download.php"
 	exit 1
 fi
@@ -15,5 +15,5 @@ if [ $? != 0 ]; then
 fi
 
 SCRIPT_DIR=`dirname $0`
-arch -arch i386 python2.7 ${SCRIPT_DIR}/Printrun/pronterface.py
+python2.7 ${SCRIPT_DIR}/Printrun/pronterface.py