- 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
This commit is contained in:
parent
34bc6c5b0b
commit
5a2d769c1b
2 changed files with 6 additions and 6 deletions
6
build.sh
6
build.sh
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
|
|
||||||
##Select the build target
|
##Select the build target
|
||||||
BUILD_TARGET=win32
|
BUILD_TARGET=${1:-win32}
|
||||||
#BUILD_TARGET=linux
|
#BUILD_TARGET=linux
|
||||||
#BUILD_TARGET=osx64
|
#BUILD_TARGET=osx64
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ BUILD_NAME=NewUI-Beta4
|
||||||
TARGET_DIR=${BUILD_TARGET}-SkeinPyPy-${BUILD_NAME}
|
TARGET_DIR=${BUILD_TARGET}-SkeinPyPy-${BUILD_NAME}
|
||||||
|
|
||||||
##Which versions of external programs to use
|
##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_PORTABLE_PY_VERSION=2.7.2.1
|
||||||
WIN_PYSERIAL_VERSION=2.5
|
WIN_PYSERIAL_VERSION=2.5
|
||||||
|
|
||||||
|
@ -126,7 +126,7 @@ if [ $BUILD_TARGET = "win32" ]; then
|
||||||
mv ${TARGET_DIR}/pypy-${PYPY_VERSION}* ${TARGET_DIR}/pypy
|
mv ${TARGET_DIR}/pypy-${PYPY_VERSION}* ${TARGET_DIR}/pypy
|
||||||
else
|
else
|
||||||
cd ${TARGET_DIR}; $TAR -xjf ../pypy-${PYPY_VERSION}-${BUILD_TARGET}.tar.bz2; cd ..
|
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
|
fi
|
||||||
#Cleanup pypy
|
#Cleanup pypy
|
||||||
rm -rf ${TARGET_DIR}/pypy/lib-python/2.7/test
|
rm -rf ${TARGET_DIR}/pypy/lib-python/2.7/test
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
arch -arch i386 python2.7 -c 'import wx'
|
python2.7 -c 'import wx'
|
||||||
if [ $? != 0 ]; then
|
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"
|
echo " http://www.wxpython.org/download.php"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
@ -15,5 +15,5 @@ if [ $? != 0 ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
SCRIPT_DIR=`dirname $0`
|
SCRIPT_DIR=`dirname $0`
|
||||||
arch -arch i386 python2.7 ${SCRIPT_DIR}/Printrun/pronterface.py
|
python2.7 ${SCRIPT_DIR}/Printrun/pronterface.py
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue