projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added -bind_at_load linker option for Darwin/Mac OS X: executables must
[wxWidgets.git]
/
wxPython
/
b
diff --git
a/wxPython/b
b/wxPython/b
index edc7f6414586ece3251798c8d626562c4dc4e5d8..4ab9f9e4c6148b506c5492ec3939ea26a0106fdc 100755
(executable)
--- a/
wxPython/b
+++ b/
wxPython/b
@@
-20,9
+20,9
@@
shift
python$PYVER -c "import sys;print '\n', sys.version, '\n'"
python$PYVER -c "import sys;print '\n', sys.version, '\n'"
-##WXPYVER=`python$PYVER -c "import setup;print setup.VERSION"`
+
SETUP="python$PYVER -u setup.py"
SETUP="python$PYVER -u setup.py"
-FLAGS="USE_SWIG=1 IN_CVS_TREE=1"
+FLAGS="USE_SWIG=1 IN_CVS_TREE=1"
# BUILD_GLCANVAS=0"
OTHERFLAGS=""
OTHERFLAGS=""
@@
-42,7
+42,7
@@
elif [ "$1" = "d" ]; then
elif [ "$1" = "t" ]; then
shift
#CMD="set CMD=touch src\*.i; touch contrib\glcanvas\*.i; touch contrib\ogl\*.i; touch contrib\stc\*.i"
elif [ "$1" = "t" ]; then
shift
#CMD="set CMD=touch src\*.i; touch contrib\glcanvas\*.i; touch contrib\ogl\*.i; touch contrib\stc\*.i"
- CMD='find . -name "*.i" | xargs
-l
touch'
+ CMD='find . -name "*.i" | xargs touch'
# "i" --> install
elif [ "$1" = "i" ]; then
# "i" --> install
elif [ "$1" = "i" ]; then
@@
-56,19
+56,15
@@
elif [ "$1" = "s" ]; then
# "r" --> rpm dist
elif [ "$1" = "r" ]; then
# "r" --> rpm dist
elif [ "$1" = "r" ]; then
-
- for VER in
15 20 21
; do
+ WXPYVER=`python$PYVER -c "import setup;print setup.VERSION"`
+ for VER in
21 22
; do
getpyver $VER
echo "*****************************************************************"
echo "******* Building wxPython for Python $PYVER"
echo "*****************************************************************"
getpyver $VER
echo "*****************************************************************"
echo "******* Building wxPython for Python $PYVER"
echo "*****************************************************************"
- # NOTE: This assumes that /usr/local/bin is BEFORE /usr/bin on the PATH
- # AND that you have write access to it.
- rm -f /usr/local/bin/python
- ln -s /usr/bin/python$PYVER /usr/local/bin/python
- SETUP="/usr/local/bin/python -u setup.py"
+ SETUP="python$PYVER -u setup.py"
# save the original
cp setup.py setup.py.save
# save the original
cp setup.py setup.py.save
@@
-78,13
+74,15
@@
elif [ "$1" = "r" ]; then
sed "s/GL_ONLY = /GL_ONLY = 1 #/" < setup.py.temp > setup.py
# build wxPython-gl RPM
sed "s/GL_ONLY = /GL_ONLY = 1 #/" < setup.py.temp > setup.py
# build wxPython-gl RPM
- $SETUP $OTHERFLAGS bdist_rpm --binary-only --doc-files README.txt
+ $SETUP $OTHERFLAGS bdist_rpm --binary-only --doc-files README.txt --python=python$PYVER
+ ### --requires=python$PYVER
rm dist/wxPython-gl*.tar.gz
# Build wxPython RPM
cp setup.py setup.py.temp
sed "s/GL_ONLY = /GL_ONLY = 0 #/" < setup.py.temp > setup.py
rm dist/wxPython-gl*.tar.gz
# Build wxPython RPM
cp setup.py setup.py.temp
sed "s/GL_ONLY = /GL_ONLY = 0 #/" < setup.py.temp > setup.py
- $SETUP $OTHERFLAGS bdist_rpm --binary-only
+ $SETUP $OTHERFLAGS bdist_rpm --binary-only --python=python$PYVER
+ ### --requires=python$PYVER
# put the oringal setup.py back
cp setup.py.save setup.py
# put the oringal setup.py back
cp setup.py.save setup.py
@@
-95,8
+93,8
@@
elif [ "$1" = "r" ]; then
mv dist/wxPython-gl-$WXPYVER-1.i386.rpm dist/wxPython-gl-$WXPYVER-1-Py$VER.i386.rpm
done
mv dist/wxPython-gl-$WXPYVER-1.i386.rpm dist/wxPython-gl-$WXPYVER-1-Py$VER.i386.rpm
done
+
# rebuild the source dists without the munched up setup.py
# rebuild the source dists without the munched up setup.py
- $SETUP $OTHERFLAGS sdist
$SETUP $OTHERFLAGS bdist_rpm --source-only
exit 0
$SETUP $OTHERFLAGS bdist_rpm --source-only
exit 0