Forward port 2.6 branch changes to head.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,15 +1,23 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
PY_VERSION=$1
|
|
||||||
shift
|
|
||||||
|
|
||||||
unicode=no
|
unicode=no
|
||||||
debug=no
|
debug=no
|
||||||
|
reswig=no
|
||||||
|
all=no
|
||||||
|
|
||||||
|
if [ "$1" = "all" ]; then
|
||||||
|
all=yes
|
||||||
|
else
|
||||||
|
PY_VERSION=$1
|
||||||
|
fi
|
||||||
|
|
||||||
|
shift
|
||||||
|
|
||||||
for flag in $*; do
|
for flag in $*; do
|
||||||
case ${flag} in
|
case ${flag} in
|
||||||
debug) debug=yes ;;
|
debug) debug=yes ;;
|
||||||
unicode) unicode=yes ;;
|
unicode) unicode=yes ;;
|
||||||
|
reswig) reswig=yes ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
@@ -17,6 +25,13 @@ if [ "$WXWIN" = "" ]; then
|
|||||||
export WXWIN=`pwd`/../..
|
export WXWIN=`pwd`/../..
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ $all = yes ]; then
|
||||||
|
$WXWIN/wxPython/distrib/build_packages.sh 23
|
||||||
|
$WXWIN/wxPython/distrib/build_packages.sh 23 unicode
|
||||||
|
$WXWIN/wxPython/distrib/build_packages.sh 24
|
||||||
|
$WXWIN/wxPython/distrib/build_packages.sh 24 unicode
|
||||||
|
fi
|
||||||
|
|
||||||
echo "wxWidgets directory is: $WXWIN"
|
echo "wxWidgets directory is: $WXWIN"
|
||||||
|
|
||||||
if [ "$OSTYPE" = "cygwin" ]; then
|
if [ "$OSTYPE" = "cygwin" ]; then
|
||||||
@@ -71,7 +86,9 @@ if [ "$OSTYPE" = "cygwin" ]; then
|
|||||||
rm -rf wx/*.pyd
|
rm -rf wx/*.pyd
|
||||||
|
|
||||||
# re-generate SWIG files
|
# re-generate SWIG files
|
||||||
$WXWIN/wxPython/b $PY_VERSION t
|
if [ $reswig = yes ]; then
|
||||||
|
$WXWIN/wxPython/b $PY_VERSION t
|
||||||
|
fi
|
||||||
|
|
||||||
# build the hybrid extension
|
# build the hybrid extension
|
||||||
# NOTE: Win Python needs Windows-style pathnames, so we
|
# NOTE: Win Python needs Windows-style pathnames, so we
|
||||||
@@ -83,13 +100,20 @@ if [ "$OSTYPE" = "cygwin" ]; then
|
|||||||
|
|
||||||
# make the dev package
|
# make the dev package
|
||||||
$WXWIN/wxPython/distrib/makedev
|
$WXWIN/wxPython/distrib/makedev
|
||||||
|
$WXWIN/wxPython/distrib/makedocs
|
||||||
|
$WXWIN/wxPython/distrib/makedemo
|
||||||
|
|
||||||
$TOOLS/Python$PY_VERSION/python `cygpath -d $WXWIN/wxPython/distrib/make_installer_inno4.py` $UNICODE_FLAG
|
$TOOLS/Python$PY_VERSION/python `cygpath -d $WXWIN/wxPython/distrib/make_installer_inno4.py` $UNICODE_FLAG
|
||||||
elif [ "$OSTYPE" = "darwin" ]; then
|
elif [ "$OSTYPE" = "darwin" ]; then
|
||||||
cd $WXWIN/wxPython
|
cd $WXWIN/wxPython
|
||||||
|
|
||||||
|
if [ ! -d dist ]; then
|
||||||
|
mkdir dist
|
||||||
|
fi
|
||||||
# re-generate SWIG files
|
# re-generate SWIG files
|
||||||
$WXWIN/wxPython/b $PY_VERSION t
|
if [ $reswig = yes ]; then
|
||||||
|
$WXWIN/wxPython/b $PY_VERSION t
|
||||||
|
fi
|
||||||
|
|
||||||
PY_DOT_VER=2.3
|
PY_DOT_VER=2.3
|
||||||
if [ "$PY_VERSION" = "24" ]; then
|
if [ "$PY_VERSION" = "24" ]; then
|
||||||
@@ -101,13 +125,15 @@ elif [ "$OSTYPE" = "darwin" ]; then
|
|||||||
UNICODE_OPT=unicode
|
UNICODE_OPT=unicode
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sudo distrib/mac/wxPythonOSX/build $PY_DOT_VER panther inplace $UNICODE_OPT
|
#sudo $WXWIN/wxPython/distrib/makedocs
|
||||||
|
$WXWIN/wxPython/distrib/makedemo
|
||||||
|
export TARBALLDIR=$WXWIN/wxPython/dist
|
||||||
|
|
||||||
|
distrib/mac/wxPythonOSX/build $PY_DOT_VER panther inplace $UNICODE_OPT
|
||||||
else
|
else
|
||||||
echo "OSTYPE $OSTYPE not yet supported by this build script."
|
echo "OSTYPE $OSTYPE not yet supported by this build script."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Now make the demo and docs tarballs
|
# return to original dir
|
||||||
cd $WXWIN/wxPython
|
cd $WXWIN/wxPython/distrib
|
||||||
$WXWIN/wxPython/distrib/makedocs
|
|
||||||
$WXWIN/wxPython/distrib/makedemo
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user