This commit was manufactured by cvs2svn to create tag 'wxPy_2_6_4_0'.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/wxPy_2_6_4_0@44989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
@@ -84,6 +84,8 @@ wxPython/src/msw
|
||||
wxPython/wx
|
||||
wxPython/wx/build
|
||||
wxPython/wx/lib
|
||||
wxPython/wx/lib/analogclock
|
||||
wxPython/wx/lib/analogclock/lib_setup
|
||||
wxPython/wx/lib/colourchooser
|
||||
wxPython/wx/lib/editor
|
||||
wxPython/wx/lib/floatcanvas
|
||||
@@ -95,6 +97,7 @@ wxPython/wx/py/tests
|
||||
wxPython/wx/tools
|
||||
wxPython/wx/tools/XRCed
|
||||
wxPython/wx/tools/XRCed/src-images
|
||||
wxPython/wxaddons
|
||||
wxPython/wxPython
|
||||
wxPython/wxPython/lib
|
||||
wxPython/wxPython/lib/colourchooser
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
README for wxPython-src-2.6.*.tar.gz
|
||||
====================================
|
||||
README for wxPython-src-2.6.*.tar.bz2
|
||||
=====================================
|
||||
|
||||
|
||||
This archive contains the source code and other files for both
|
||||
|
||||
@@ -12,15 +12,15 @@ page for more information about managing multiple installs:
|
||||
|
||||
In addition to the wxPython modules, several tools scripts (such as
|
||||
XRCed and PyShell) and batch file launchers have been installed to
|
||||
Python's Scripts directory. (For example, c:\Python23\Scripts.) IF
|
||||
Python's Scripts directory. (For example, c:\Python23\Scripts.) If
|
||||
you have multiple versions of wxPython installed these tool scripts
|
||||
will use whichever is the default install. If you would like to
|
||||
control which version is used then follow the directions at the wiki
|
||||
page for using wxversion.
|
||||
|
||||
This installer does *not* include the wxPython documentation, the
|
||||
wxPython demo and other sample applications are provided as part of
|
||||
wxPython. Those are available in a separate installer named
|
||||
wxPython demo and other sample applications that are provided as part
|
||||
of wxPython. Those are available in a separate installer named
|
||||
wxPython2.6-win32-docs-demos-*.exe which should also be located from
|
||||
wherever you downloaded this package from. The Docs and Demos
|
||||
installer will also create Start Menu shortcuts for the tool scripts
|
||||
|
||||
@@ -48,6 +48,7 @@ config.WIN_BUILD = "/c/BUILD"
|
||||
|
||||
|
||||
# Just like the above
|
||||
config.OSX_HOST_tiger = "smallfry"
|
||||
config.OSX_HOST_panther = "bigmac"
|
||||
config.OSX_HOST_jaguar = "whopper"
|
||||
config.OSX_BUILD = "/BUILD"
|
||||
@@ -94,37 +95,55 @@ initialTask = Task([ Job("", ["distrib/all/build-setup", CFGFILE]),
|
||||
# on the nature of the build machines configurations...) is a separate
|
||||
# task.
|
||||
|
||||
jaguarTask = Task( Job("whopper.23",
|
||||
["distrib/all/build-osx", CFGFILE, config.OSX_HOST_jaguar, "jaguar", "2.3"]) )
|
||||
jaguarTask = Task( Job("whopper.23", ["distrib/all/build-osx",
|
||||
CFGFILE,
|
||||
config.OSX_HOST_jaguar,
|
||||
"2.3", "ansi"]) )
|
||||
|
||||
pantherTask = Task([ Job("bigmac.23",
|
||||
["distrib/all/build-osx", CFGFILE, config.OSX_HOST_panther, "panther", "2.3"]),
|
||||
Job("bigmac.24",
|
||||
["distrib/all/build-osx", CFGFILE, config.OSX_HOST_panther, "panther", "2.4"])
|
||||
pantherTask = Task([ Job("bigmac.23", ["distrib/all/build-osx",
|
||||
CFGFILE,
|
||||
config.OSX_HOST_panther,
|
||||
"2.3", "both"]),
|
||||
Job("bigmac.24", ["distrib/all/build-osx",
|
||||
CFGFILE,
|
||||
config.OSX_HOST_panther,
|
||||
"2.4", "both"])
|
||||
])
|
||||
|
||||
tigerTask = Task([ #Job("smallfry.23", ["distrib/all/build-osx",
|
||||
# CFGFILE,
|
||||
# config.OSX_HOST_tiger,
|
||||
# "2.3", "both"]),
|
||||
Job("smallfry.24", ["distrib/all/build-osx",
|
||||
CFGFILE,
|
||||
config.OSX_HOST_tiger,
|
||||
"2.4", "both", "universal"]),
|
||||
Job("smallfry.25", ["distrib/all/build-osx",
|
||||
CFGFILE,
|
||||
config.OSX_HOST_tiger,
|
||||
"2.5", "both", "universal"])
|
||||
])
|
||||
|
||||
|
||||
beastTask1 = Task([ Job("beast.23", ["distrib/all/build-windows", CFGFILE, "2.3"]),
|
||||
Job("co-rh9.23", ["distrib/all/build-rpm", CFGFILE, "beast", "co-rh9", "rh9", "2.3"]),
|
||||
Job("beast.24", ["distrib/all/build-windows", CFGFILE, "2.4"]),
|
||||
Job("co-mdk102.24", ["distrib/all/build-rpm", CFGFILE, "beast", "co-mdk102","mdk102","2.4"]),
|
||||
Job("co-rh9.24", ["distrib/all/build-rpm", CFGFILE, "beast", "co-rh9", "rh9", "2.4"]),
|
||||
Job("beast.25", ["distrib/all/build-windows", CFGFILE, "2.5"]),
|
||||
])
|
||||
|
||||
beastTask2 = Task([ Job("co-fc2.23", ["distrib/all/build-rpm", CFGFILE, "beast", "co-fc2", "fc2", "2.3"]),
|
||||
Job("co-mdk101.23", ["distrib/all/build-rpm", CFGFILE, "beast", "co-mdk101","mdk101","2.3"]),
|
||||
Job("co-fc2.24", ["distrib/all/build-rpm", CFGFILE, "beast", "co-fc2", "fc2", "2.4"]),
|
||||
#Job("co-mdk101.24", ["distrib/all/build-rpm", CFGFILE, "beast", "co-mdk101","mdk101","2.4"]),
|
||||
Job("co-fc4.24", ["distrib/all/build-rpm", CFGFILE, "beast", "co-fc4", "fc4", "2.4"]),
|
||||
Job("co-mdk102.24", ["distrib/all/build-rpm", CFGFILE, "beast", "co-mdk102","mdk102","2.4"]),
|
||||
Job("co-mdk2006.24",["distrib/all/build-rpm", CFGFILE, "beast", "co-mdk2006","mdk2006","2.4"]),
|
||||
])
|
||||
|
||||
cyclopsTask = Task([ Job("co-mdk92.23", ["distrib/all/build-rpm", CFGFILE, "cyclops", "co-mdk92", "mdk92", "2.3"]),
|
||||
Job("co-rh9.23", ["distrib/all/build-rpm", CFGFILE, "cyclops", "co-rh9", "rh9", "2.3"]),
|
||||
Job("co-mdk92.24", ["distrib/all/build-rpm", CFGFILE, "cyclops", "co-mdk92", "mdk92", "2.4"]),
|
||||
Job("co-rh9.24", ["distrib/all/build-rpm", CFGFILE, "cyclops", "co-rh9", "rh9", "2.4"]),
|
||||
])
|
||||
|
||||
buildTasks = [ jaguarTask,
|
||||
pantherTask,
|
||||
tigerTask,
|
||||
beastTask1,
|
||||
beastTask2,
|
||||
cyclopsTask,
|
||||
]
|
||||
|
||||
# Finalization. This is for things that must wait until all the
|
||||
|
||||
@@ -22,14 +22,14 @@ if [ $skipdocs != yes ]; then
|
||||
# build the doc and demo tarballs
|
||||
distrib/makedemo
|
||||
distrib/makedocs
|
||||
mv dist/wxPython-docs-$VERSION.tar.gz $STAGING_DIR
|
||||
mv dist/wxPython-demo-$VERSION.tar.gz $STAGING_DIR
|
||||
mv dist/wxPython-docs-$VERSION.tar.bz2 $STAGING_DIR
|
||||
mv dist/wxPython-demo-$VERSION.tar.bz2 $STAGING_DIR
|
||||
|
||||
|
||||
# build the new docs too
|
||||
if [ $skipnewdocs != yes ]; then
|
||||
docs/bin/everything
|
||||
mv dist/wxPython-newdocs-$VERSION.tar.gz $STAGING_DIR
|
||||
mv dist/wxPython-newdocs-$VERSION.tar.bz2 $STAGING_DIR
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ if [ $KIND = daily ]; then
|
||||
destdir=$UPLOAD_DAILY_ROOT/$DAILY
|
||||
echo "Copying to the starship at $destdir..."
|
||||
ssh $UPLOAD_HOST "mkdir -p $destdir"
|
||||
scp $STAGING_DIR/* $UPLOAD_HOST:/$destdir
|
||||
scp -p $STAGING_DIR/* $UPLOAD_HOST:/$destdir
|
||||
ssh $UPLOAD_HOST "cd $destdir && ls -al"
|
||||
|
||||
|
||||
@@ -79,7 +79,7 @@ if [ $KIND = release ]; then
|
||||
echo "Copying to the starship..."
|
||||
destdir=$UPLOAD_PREVIEW_ROOT/$VERSION
|
||||
ssh $UPLOAD_HOST "mkdir -p $destdir"
|
||||
scp $STAGING_DIR/* $UPLOAD_HOST:/$destdir
|
||||
scp -p $STAGING_DIR/* $UPLOAD_HOST:/$destdir
|
||||
|
||||
# Send email to wxPython-dev
|
||||
DATE=`date`
|
||||
|
||||
@@ -8,31 +8,32 @@ set -o errexit
|
||||
|
||||
|
||||
host=$2
|
||||
flavor=$3
|
||||
pyver=$4
|
||||
pyver=$3
|
||||
chartype=$4
|
||||
flags=$5
|
||||
|
||||
if [ $skiposx != yes ]; then
|
||||
# test if the target machine is online
|
||||
if ping -q -c1 -w1 $host > /dev/null; then
|
||||
echo " The $host machine is online, OSX-$flavor build continuing..."
|
||||
echo " The $host machine is online, OSX build continuing..."
|
||||
else
|
||||
echo "The $host machine is **OFFLINE**, skipping the OSX-$flavor build."
|
||||
echo "The $host machine is **OFFLINE**, skipping the OSX build."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "Copying source files and build script..."
|
||||
ssh root@$host "mkdir -p $OSX_BUILD && rm -rf $OSX_BUILD/* || true"
|
||||
|
||||
scp $STAGING_DIR/wxPython-src-$VERSION.tar.gz \
|
||||
$STAGING_DIR/wxPython-docs-$VERSION.tar.gz \
|
||||
$STAGING_DIR/wxPython-demo-$VERSION.tar.gz \
|
||||
scp $STAGING_DIR/wxPython-src-$VERSION.tar.bz2 \
|
||||
$STAGING_DIR/wxPython-docs-$VERSION.tar.bz2 \
|
||||
$STAGING_DIR/wxPython-demo-$VERSION.tar.bz2 \
|
||||
distrib/all/do-build-osx \
|
||||
root@$host:$OSX_BUILD
|
||||
|
||||
echo "Running build script on $host..."
|
||||
wxdir=$OSX_BUILD/wxPython-src-$VERSION
|
||||
cmd=./do-build-osx
|
||||
ssh root@$host "cd $OSX_BUILD && $cmd $wxdir $OSX_BUILD $skipclean $VERSION $flavor $pyver && rm $cmd"
|
||||
ssh root@$host "cd $OSX_BUILD && $cmd $wxdir $OSX_BUILD $skipclean $VERSION $pyver $chartype $flags && rm $cmd"
|
||||
|
||||
echo "Fetching the results..."
|
||||
scp "root@$host:$OSX_BUILD/wxPython*-osx*" $STAGING_DIR
|
||||
|
||||
@@ -18,7 +18,7 @@ if [ $skipwin != yes ]; then
|
||||
fi
|
||||
|
||||
echo "Copying source file and build script..."
|
||||
scp $STAGING_DIR/wxPython-src-$VERSION.tar.gz \
|
||||
scp $STAGING_DIR/wxPython-src-$VERSION.tar.bz2 \
|
||||
distrib/all/do-build-windows \
|
||||
$WIN_HOST:$WIN_BUILD
|
||||
|
||||
|
||||
@@ -9,8 +9,9 @@
|
||||
# 2. the path of where to put the resulting installers
|
||||
# 3. skipclean flag (yes|no)
|
||||
# 4. the VERSION
|
||||
# 5. the KIND (panther or jaguar)
|
||||
# *. the remaining args are the versions of Python to build for
|
||||
# 5. the version of Python to build for
|
||||
# 6. the character type (ansi|unicode|both)
|
||||
# 7. optional flags to pass on to the build script
|
||||
#
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
@@ -20,7 +21,7 @@ set -o errexit
|
||||
echo "-=-=-=- Hello from $HOSTNAME -=-=-=-"
|
||||
|
||||
if [ $# -lt 6 ]; then
|
||||
echo "Usage: $0 WXDIR DESTDIR SKIPCLEAN VERSION KIND PYVER"
|
||||
echo "Usage: $0 WXDIR DESTDIR SKIPCLEAN VERSION PYVER CHARTYPE [FLAGS]"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -28,8 +29,9 @@ WXDIR=$1
|
||||
DESTDIR=$2
|
||||
SKIPCLEAN=$3
|
||||
VERSION=$4
|
||||
KIND=$5
|
||||
PYVER=$6
|
||||
PYVER=$5
|
||||
CHARTYPE=$6
|
||||
FLAGS=$7
|
||||
|
||||
|
||||
#export PATH=/sw/bin:/usr/local/bin:$PATH
|
||||
@@ -39,21 +41,22 @@ echo "which gcc = " `which gcc`
|
||||
#exit 0
|
||||
|
||||
# untar the source
|
||||
echo "Unarchiving wxPython-src-$VERSION.tar.gz"
|
||||
echo "Unarchiving wxPython-src-$VERSION.tar.bz2"
|
||||
cd $DESTDIR
|
||||
tar xzf wxPython-src-$VERSION.tar.gz
|
||||
rm wxPython-src-$VERSION.tar.gz
|
||||
tar xjf wxPython-src-$VERSION.tar.bz2
|
||||
rm wxPython-src-$VERSION.tar.bz2
|
||||
|
||||
|
||||
echo "Invoking wxPythonOSX build script..."
|
||||
cd $WXDIR/wxPython
|
||||
export TARBALLDIR=$DESTDIR
|
||||
mkdir -p dist
|
||||
if [ $KIND = panther ]; then
|
||||
distrib/mac/wxPythonOSX/build $PYVER $KIND inplace unicode
|
||||
if [ $CHARTYPE = both ]; then
|
||||
distrib/mac/wxPythonOSX/build $PYVER inplace unicode $FLAGS
|
||||
distrib/mac/wxPythonOSX/build $PYVER inplace ansi $FLAGS
|
||||
else
|
||||
distrib/mac/wxPythonOSX/build $PYVER inplace $CHARTYPE $FLAGS
|
||||
fi
|
||||
distrib/mac/wxPythonOSX/build $PYVER $KIND inplace
|
||||
|
||||
|
||||
echo "Copying installers to $DESTDIR..."
|
||||
cp dist/*.dmg $DESTDIR
|
||||
@@ -63,8 +66,8 @@ cd $DESTDIR
|
||||
if [ $SKIPCLEAN != yes ]; then
|
||||
echo "Cleaning up..."
|
||||
rm -r $WXDIR || true
|
||||
rm wxPython-docs-$VERSION.tar.gz
|
||||
rm wxPython-demo-$VERSION.tar.gz
|
||||
rm wxPython-docs-$VERSION.tar.bz2
|
||||
rm wxPython-demo-$VERSION.tar.bz2
|
||||
fi
|
||||
|
||||
echo "-=-=-=- Goodbye! -=-=-=-"
|
||||
|
||||
@@ -69,7 +69,7 @@ for dir in SPECS BUILD RPMS SOURCES SRPMS tmp; do
|
||||
fi
|
||||
done
|
||||
|
||||
cp wxPython-src-$VERSION.tar.gz $rpmtop/SOURCES
|
||||
cp wxPython-src-$VERSION.tar.bz2 $rpmtop/SOURCES
|
||||
|
||||
echo "******************** PYVER = " $PYVER
|
||||
for ver in $PYVER; do
|
||||
@@ -93,7 +93,7 @@ if [ $SKIPCLEAN != yes ]; then
|
||||
rm -rf $rpmtop
|
||||
|
||||
echo "Cleaning up..."
|
||||
rm *.spec *.tar.gz
|
||||
rm *.spec *.tar.bz2
|
||||
fi
|
||||
|
||||
echo "-=-=-=- Goodbye! -=-=-=-"
|
||||
|
||||
@@ -31,11 +31,10 @@ PYVER=$5
|
||||
|
||||
|
||||
# WXDIR is the cygwin path, WXWIN is the DOS path
|
||||
WXWIN_OLD=$WXWIN
|
||||
WXWIN=`cygpath -w $WXDIR`
|
||||
export WXWIN
|
||||
|
||||
|
||||
export WXDIR
|
||||
export TOOLS=/cygdrive/c/TOOLS
|
||||
|
||||
# setup the compiler
|
||||
if [ $PYVER = 2.3 ]; then
|
||||
@@ -50,10 +49,10 @@ fi
|
||||
|
||||
|
||||
# untar the source
|
||||
echo "Unarchiving wxPython-src-$VERSION.tar.gz"
|
||||
echo "Unarchiving wxPython-src-$VERSION.tar.bz2"
|
||||
cd $DESTDIR
|
||||
tar xzf wxPython-src-$VERSION.tar.gz
|
||||
rm wxPython-src-$VERSION.tar.gz
|
||||
tar xjf wxPython-src-$VERSION.tar.bz2
|
||||
rm wxPython-src-$VERSION.tar.bz2
|
||||
|
||||
|
||||
# Fix line endings
|
||||
@@ -93,13 +92,35 @@ echo "Building the wx DLLs..."
|
||||
.make hybrid-uni
|
||||
|
||||
|
||||
#echo "Building the wx tools..."
|
||||
#.make_tools
|
||||
echo "Building tex2rtf..."
|
||||
cd $WXDIR/utils/tex2rtf/src
|
||||
$WXDIR/build/msw/.mymake hybrid
|
||||
cp vc_mswhdll/tex2rtf.exe $WXDIR/lib/vc_dll/tex2rtf.exe
|
||||
|
||||
echo "Building the HTMLHelp file..."
|
||||
DOCDIR=$WXDIR/docs
|
||||
cd $DOCDIR/latex/wx
|
||||
mkdir -p $DOCDIR/html/wx
|
||||
cp *.gif $DOCDIR/html/wx
|
||||
cp *.css $DOCDIR/html/wx
|
||||
DOCSRC=`cygpath -w $DOCDIR/latex/wx/manual.tex`
|
||||
DOCDEST=`cygpath -w $DOCDIR/html/wx/wx.htm`
|
||||
DOCINI=`cygpath -w $DOCDIR/latex/wx/tex2rtf_css.ini`
|
||||
|
||||
$WXDIR/lib/vc_dll/tex2rtf.exe $DOCSRC $DOCDEST -twice -html -macros $DOCINI
|
||||
|
||||
cd $DOCDIR/html/wx
|
||||
cp $DOCDIR/latex/wx/wx.css .
|
||||
$TOOLS/HTMLHelpWorkshop/hhc.exe wx.hhp || true
|
||||
mkdir -p ../../htmlhelp
|
||||
mv wx.chm ../../htmlhelp
|
||||
|
||||
# rm -f $DOCDIR/html/wx/*.con
|
||||
# rm -f $DOCDIR/html/wx/*.ref
|
||||
# rm -f $DOCDIR/latex/wx/*.con
|
||||
# rm -f $DOCDIR/latex/wx/*.ref
|
||||
|
||||
|
||||
# cheat and just copy the .CHM files from the regular project dir
|
||||
# TODO: Copy over the wxPython-docs fle and run hhc on the contents of that.
|
||||
mkdir -p $WXDIR/docs/htmlhelp
|
||||
cp `cygpath $WXWIN_OLD/docs/htmlhelp`/*.chm $WXDIR/docs/htmlhelp
|
||||
|
||||
|
||||
echo "Building wxPython and installers..."
|
||||
@@ -108,9 +129,9 @@ mkdir -p dist
|
||||
|
||||
for ver in $PYVER; do
|
||||
echo $ver
|
||||
b $ver d USE_SWIG=0
|
||||
b $ver h USE_SWIG=0 EP_ADD_OPTS=1
|
||||
b $ver r USE_SWIG=0
|
||||
b $ver d UNICODE=0 USE_SWIG=0
|
||||
b $ver h UNICODE=0 USE_SWIG=0 EP_ADD_OPTS=1
|
||||
b $ver r UNICODE=0 USE_SWIG=0
|
||||
b $ver d UNICODE=1 USE_SWIG=0
|
||||
b $ver h UNICODE=1 USE_SWIG=0 EP_ADD_OPTS=1
|
||||
b $ver r UNICODE=1 USE_SWIG=0
|
||||
@@ -119,7 +140,7 @@ done
|
||||
echo "Building the developer package..."
|
||||
WXWIN=`cygpath -w $WXDIR`
|
||||
export WXWIN
|
||||
4nt /c distrib/makedev.bat $VERSION
|
||||
$TOOLS/4dos/4nt /c distrib/makedev.bat $VERSION
|
||||
|
||||
|
||||
echo "Copying installers to $DESTDIR..."
|
||||
|
||||
@@ -1,12 +1,37 @@
|
||||
#!/bin/bash
|
||||
|
||||
PY_VERSION=$1
|
||||
shift
|
||||
unicode=no
|
||||
debug=no
|
||||
reswig=no
|
||||
all=no
|
||||
|
||||
if [ "$1" = "all" ]; then
|
||||
all=yes
|
||||
else
|
||||
PY_VERSION=$1
|
||||
fi
|
||||
|
||||
shift
|
||||
|
||||
for flag in $*; do
|
||||
case ${flag} in
|
||||
debug) debug=yes ;;
|
||||
unicode) unicode=yes ;;
|
||||
reswig) reswig=yes ;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [ "$WXWIN" = "" ]; then
|
||||
export WXWIN=`pwd`/../..
|
||||
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"
|
||||
|
||||
if [ "$OSTYPE" = "cygwin" ]; then
|
||||
@@ -19,72 +44,105 @@ if [ "$OSTYPE" = "cygwin" ]; then
|
||||
export SWIGDIR=$TOOLS/SWIG-1.3.24
|
||||
fi
|
||||
|
||||
DEBUG_FLAG=
|
||||
UNICODE_FLAG=
|
||||
if [ $debug = yes ]; then
|
||||
DEBUG_FLAG=--debug
|
||||
fi
|
||||
if [ $unicode = yes ]; then
|
||||
UNICODE_FLAG="UNICODE=1"
|
||||
fi
|
||||
|
||||
# copy wxPython build scripts
|
||||
cp $WXWIN/wxPython/distrib/msw/.m* $WXWIN/build/msw
|
||||
|
||||
# setup wxPython defines
|
||||
cp $WXWIN/include/wx/msw/setup0.h $WXWIN/include/wx/msw/setup.h
|
||||
$TOOLS/Python$PY_VERSION/python `cygpath -d $WXWIN/wxPython/distrib/create_setup.h.py` $@
|
||||
$TOOLS/Python$PY_VERSION/python `cygpath -d $WXWIN/wxPython/distrib/create_setup.h.py` $UNICODE_FLAG
|
||||
|
||||
export PATH=${PATH}:${WXWIN}/lib/vc_dll
|
||||
export PATH=${PATH}:${WXWIN}/lib/vc_dll:${TOOLS}/Python${PY_VERSION}
|
||||
|
||||
cd $WXWIN/build/msw
|
||||
# remove old build files
|
||||
rm -rf vc_msw*
|
||||
UNI=
|
||||
if [ "$UNICODE" != "" ]; then
|
||||
if [ $unicode = yes ]; then
|
||||
UNI=-uni
|
||||
fi
|
||||
./.make hybrid$UNI
|
||||
|
||||
# make tools for docs creation, etc.
|
||||
./.make_tools
|
||||
|
||||
# update the language files
|
||||
cd $WXWIN/locale
|
||||
make allmo
|
||||
|
||||
# TODO: Make the documentation
|
||||
cd $WXWIN/wxPython
|
||||
#distrib/makedocs
|
||||
|
||||
$TOOLS/Python$PY_VERSION/python `cygpath -d distrib/makemo.py`
|
||||
|
||||
# update the language files
|
||||
$TOOLS/Python$PY_VERSION/python `cygpath -d $WXWIN/wxPython/distrib/makemo.py`
|
||||
rm -rf build build.unicode
|
||||
rm -rf wx/*.pyd
|
||||
|
||||
# re-generate SWIG files
|
||||
b $PY_VERSION t
|
||||
if [ $reswig = yes ]; then
|
||||
$WXWIN/wxPython/b $PY_VERSION t
|
||||
fi
|
||||
|
||||
# build the hybrid extension
|
||||
# NOTE: Win Python needs Windows-style pathnames, so we
|
||||
# need to convert
|
||||
export WXWIN=`cygpath -d $WXWIN`
|
||||
export SWIGDIR=`cygpath -d $SWIGDIR`
|
||||
export WXWIN=`cygpath -w $WXWIN`
|
||||
export SWIGDIR=`cygpath -w $SWIGDIR`
|
||||
|
||||
DEBUG_FLAG=
|
||||
UNICODE_FLAG=
|
||||
if [ "$DEBUG" != "" ]; then
|
||||
DEBUG_FLAG=--debug
|
||||
fi
|
||||
if [ "$UNICODE" != "" ]; then
|
||||
UNICODE_FLAG="UNICODE=1"
|
||||
fi
|
||||
b $PY_VERSION h $DEBUG_FLAG $UNICODE_FLAG
|
||||
$WXWIN/wxPython/b $PY_VERSION h $DEBUG_FLAG $UNICODE_FLAG
|
||||
|
||||
# make the dev package
|
||||
#distrib/makedev
|
||||
$WXWIN/wxPython/distrib/makedev
|
||||
$WXWIN/wxPython/distrib/makedocs
|
||||
$WXWIN/wxPython/distrib/makedemo
|
||||
|
||||
$TOOLS/Python$PY_VERSION/python distrib/make_installer_inno4.py $UNICODE_FLAG
|
||||
exit
|
||||
$TOOLS/Python$PY_VERSION/python `cygpath -d $WXWIN/wxPython/distrib/make_installer_inno4.py` $UNICODE_FLAG
|
||||
elif [ "$OSTYPE" = "darwin" ]; then
|
||||
OSX_VERSION=`sw_vers -productVersion`
|
||||
echo "OS X Version: ${OSX_VERSION:0:4}"
|
||||
cd $WXWIN/wxPython
|
||||
|
||||
if [ ! -d dist ]; then
|
||||
mkdir dist
|
||||
fi
|
||||
# re-generate SWIG files
|
||||
./b $PY_VERSION t
|
||||
RESWIG=
|
||||
if [ $reswig = yes ]; then
|
||||
RESWIG=reswig
|
||||
fi
|
||||
|
||||
sudo distrib/mac/wxPythonOSX/build 2.3 panther inplace
|
||||
exit
|
||||
PY_DOT_VER=2.3
|
||||
if [ "$PY_VERSION" = "24" ]; then
|
||||
PY_DOT_VER=2.4
|
||||
fi
|
||||
|
||||
UNICODE_OPT=
|
||||
if [ $unicode = yes ]; then
|
||||
UNICODE_OPT=unicode
|
||||
fi
|
||||
|
||||
DEBUG_OPT=
|
||||
if [ $debug = yes ]; then
|
||||
DEBUG_OPT=debug
|
||||
fi
|
||||
# On Tiger, build Universal.
|
||||
UNIV_OPT=
|
||||
if [ ${OSX_VERSION:0:4} = "10.4" ]; then
|
||||
UNIV_OPT="universal"
|
||||
fi
|
||||
|
||||
#$WXWIN/wxPython/distrib/makedocs
|
||||
$WXWIN/wxPython/distrib/makedemo
|
||||
export TARBALLDIR=$WXWIN/wxPython/dist
|
||||
echo "distrib/mac/wxPythonOSX/build $PY_DOT_VER inplace $UNICODE_OPT $RESWIG"
|
||||
|
||||
distrib/mac/wxPythonOSX/build $PY_DOT_VER inplace $UNICODE_OPT $DEBUG_OPT $RESWIG $UNIV_OPT
|
||||
else
|
||||
echo "OSTYPE $OSTYPE not yet supported by this build script."
|
||||
fi
|
||||
|
||||
# return to original dir
|
||||
cd $WXWIN/wxPython/distrib
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
# Build wxMac and wxPythonOSX from the tarball and then make an
|
||||
# Installer package out of it.
|
||||
|
||||
##set -x
|
||||
#set -o xtrace
|
||||
|
||||
spectemplate=distrib/wxPythonFull.spec.in
|
||||
|
||||
@@ -24,17 +24,18 @@ fi
|
||||
|
||||
function usage {
|
||||
echo ""
|
||||
echo "Usage: $0 PYVER [jaguar|panther] [command flags...]"
|
||||
echo "Usage: $0 PYVER [command flags...]"
|
||||
echo ""
|
||||
echo " PYVER Python version to use to do the build"
|
||||
echo ""
|
||||
echo " panther Build for Apple's python in /usr/bin, such as on Panther"
|
||||
echo " jaguar Build for a python in /usr/local/bin, such as on Jaguar"
|
||||
echo " PYVER Python version to use to do the build. A"
|
||||
echo " matching python\$PYVER must be found on the PATH"
|
||||
echo ""
|
||||
echo "optional command flags:"
|
||||
echo " skiptar Don't unpack the tarball"
|
||||
echo " inplace Don't use the tarball, build from the CVS tree instead"
|
||||
echo " (The Docs and Demo tarballs are still required for a full build.)"
|
||||
echo " reswig Regenerate SWIG wrappers"
|
||||
echo " universal Generate Universal wxWidgets binary (requires Universal Python "
|
||||
echo " to general Universal wxPython)."
|
||||
echo " unicode Make a unicode build"
|
||||
echo " skipconfig Don't run configure"
|
||||
echo " skipbuild Don't build wxWidgets or wxPython"
|
||||
@@ -45,13 +46,8 @@ function usage {
|
||||
}
|
||||
|
||||
|
||||
if [ $# -lt 2 ]; then
|
||||
usage
|
||||
exit 1
|
||||
fi
|
||||
|
||||
PYVER=$1
|
||||
if which python$PYVER && which pythonw$PYVER; then
|
||||
if [ "$PYVER" != "" ] && which python$PYVER && which pythonw$PYVER; then
|
||||
PYTHON=`which python$PYVER`
|
||||
PYTHONW=`which pythonw$PYVER`
|
||||
else
|
||||
@@ -59,14 +55,7 @@ else
|
||||
exit 1
|
||||
fi
|
||||
|
||||
KIND=$2
|
||||
case $KIND in
|
||||
panther) TAG=macosx10.3 ;;
|
||||
jaguar) TAG=macosx10.2 ;;
|
||||
*) usage; exit 1 ;;
|
||||
esac
|
||||
|
||||
shift;shift
|
||||
shift
|
||||
|
||||
skiptar=no
|
||||
skipconfig=no
|
||||
@@ -76,6 +65,9 @@ skipdmg=no
|
||||
skipclean=no
|
||||
inplace=no
|
||||
unicode=no
|
||||
debug=no
|
||||
reswig=no
|
||||
universal=no
|
||||
|
||||
for flag in $*; do
|
||||
case ${flag} in
|
||||
@@ -83,11 +75,14 @@ for flag in $*; do
|
||||
skipconfig) skipconfig=yes; skiptar=yes ;;
|
||||
skipbuild) skipbuild=yes; skipconfig=yes; skiptar=yes ;;
|
||||
skipinstall) skipinstall=yes ;;
|
||||
skipdmg) skipdmg=yes ;;
|
||||
skipdmg) skipdmg=yes ;;
|
||||
skipclean) skipclean=yes ;;
|
||||
inplace) inplace=yes; skiptar=yes ;;
|
||||
unicode) unicode=yes ;;
|
||||
|
||||
ansi) unicode=no ;;
|
||||
debug) debug=yes ;;
|
||||
reswig) reswig=yes ;;
|
||||
universal) universal=yes ;;
|
||||
*) echo "Unknown flag \"${flag}\""
|
||||
usage
|
||||
exit 1
|
||||
@@ -95,6 +90,23 @@ for flag in $*; do
|
||||
done
|
||||
|
||||
|
||||
|
||||
OSX_VERSION=`sw_vers -productVersion`
|
||||
OSX_VERSION=${OSX_VERSION:0:4}
|
||||
|
||||
case $OSX_VERSION in
|
||||
10.4) TAG=macosx10.4 ;;
|
||||
10.3) TAG=macosx10.3 ;;
|
||||
10.2) TAG=macosx10.2 ;;
|
||||
*) usage; exit 1 ;;
|
||||
esac
|
||||
|
||||
if [ $universal = yes ]; then
|
||||
TAG=universal10.4
|
||||
fi
|
||||
|
||||
|
||||
|
||||
VERSION=`$PYTHON -c "import setup;print setup.VERSION"`
|
||||
SHORTVER=`echo $VERSION | cut -c 1,2,3`
|
||||
PYPREFIX=`$PYTHON -c "import sys; print sys.exec_prefix"`
|
||||
@@ -111,6 +123,14 @@ else
|
||||
PYUNICODEOPT=0
|
||||
fi
|
||||
|
||||
if [ $debug == yes ]; then
|
||||
DEBUG_FLAG=--enable-debug
|
||||
PYDEBUGOPT=--debug
|
||||
else
|
||||
DEBUG_FLAG=--enable-debug_flag
|
||||
PYDEBUGOPT=
|
||||
fi
|
||||
|
||||
|
||||
# Test if the python we are using is the System installed framework
|
||||
# or one that was installed by the user. This changes where the
|
||||
@@ -128,21 +148,21 @@ if [ -z "$TARBALLDIR" ]; then
|
||||
# TARBALLDIR before invoking this script...
|
||||
TARBALLDIR=/stuff/Development/wxPython/dist/$VERSION
|
||||
fi
|
||||
TARBALL=$TARBALLDIR/wxPython-src-$VERSION.tar.gz
|
||||
TARBALL=$TARBALLDIR/wxPython-src-$VERSION.tar.bz2
|
||||
|
||||
if [ ! -e $TARBALLDIR/wxPython-demo-$VERSION.tar.gz ]; then
|
||||
if [ ! -e $TARBALLDIR/wxPython-demo-$VERSION.tar.bz2 ]; then
|
||||
echo "-------------------------------------------------------"
|
||||
echo " WARNING: Demo tarball not found, will skip building "
|
||||
echo " the Demo app bundle and etc."
|
||||
echo " $TARBALLDIR/wxPython-demo-$VERSION.tar.gz"
|
||||
echo " $TARBALLDIR/wxPython-demo-$VERSION.tar.bz2"
|
||||
echo "-------------------------------------------------------"
|
||||
fi
|
||||
|
||||
if [ ! -e $TARBALLDIR/wxPython-docs-$VERSION.tar.gz ]; then
|
||||
if [ ! -e $TARBALLDIR/wxPython-docs-$VERSION.tar.bz2 ]; then
|
||||
echo "-------------------------------------------------------"
|
||||
echo " WARNING: Docs tarball not found, will skip building "
|
||||
echo " the the wxDocsViewer app bundle and etc."
|
||||
echo " $TARBALLDIR/wxPython-docs-$VERSION.tar.gz"
|
||||
echo " $TARBALLDIR/wxPython-docs-$VERSION.tar.bz2"
|
||||
echo "-------------------------------------------------------"
|
||||
fi
|
||||
|
||||
@@ -152,6 +172,7 @@ fi
|
||||
PREFIX=/usr/local/lib/wxPython-$CHARTYPE-$VERSION
|
||||
BINPREFIX=/usr/local/bin
|
||||
|
||||
SWIGBIN=/opt/swig/bin/swig
|
||||
WXROOT=`dirname $PWD`
|
||||
PROGDIR="`dirname \"$0\"`"
|
||||
TMPDIR=$PWD/_build_dmg
|
||||
@@ -182,6 +203,9 @@ mkdir -p $DMGROOT
|
||||
mkdir -p $DMGAPPS/Docs
|
||||
mkdir -p $DMGAPPS/Samples
|
||||
|
||||
if [ ! -d $DESTDIR ]; then
|
||||
mkdir $DESTDIR
|
||||
fi
|
||||
|
||||
pushd $BUILDROOT
|
||||
|
||||
@@ -191,7 +215,7 @@ pushd $BUILDROOT
|
||||
|
||||
if [ $skiptar != yes ]; then
|
||||
echo Unarchiving tarball...
|
||||
tar xzf $TARBALL
|
||||
tar xjf $TARBALL
|
||||
fi
|
||||
|
||||
if [ $inplace = no ]; then
|
||||
@@ -219,12 +243,12 @@ echo "Using source tree: $WXDIR"
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
if [ $KIND = panther ]; then
|
||||
if [ $OSX_VERSION = 10.3 -o $OSX_VERSION = 10.4 ]; then
|
||||
OTHER_CFG_OPTS=--enable-mediactrl
|
||||
fi
|
||||
|
||||
# Configure wxWidgets
|
||||
if [ $skipconfig != yes ]; then
|
||||
if [ $skipconfig != yes -a $universal != yes ]; then
|
||||
$WXDIR/configure \
|
||||
--prefix=$PREFIX \
|
||||
--with-mac \
|
||||
@@ -233,10 +257,11 @@ if [ $skipconfig != yes ]; then
|
||||
--enable-sound \
|
||||
--enable-display \
|
||||
--enable-geometry \
|
||||
--enable-debug_flag \
|
||||
$DEBUG_FLAG \
|
||||
--enable-precomp=no \
|
||||
--enable-optimise \
|
||||
--disable-debugreport \
|
||||
--disable-precompiled-headers \
|
||||
$UNICODEOPT $OTHER_CFG_OPTS
|
||||
|
||||
fi
|
||||
@@ -245,22 +270,23 @@ fi
|
||||
if [ $skipbuild != yes ]; then
|
||||
|
||||
# Make wxWidgets and some contribs
|
||||
|
||||
# # For some reason Rez and DeRez have started locking up if run via
|
||||
# # an ssh terminal. Figure out why, but in the meantime...
|
||||
# if [ "$CHARTYPE" = "ansi" ]; then
|
||||
# echo cp /projects/wx2.5/bld/lib/libwx_macd-2.5.?.r* lib
|
||||
# cp /projects/wx2.5/bld/lib/libwx_macd-2.5.?.r* lib
|
||||
# else
|
||||
# echo cp /projects/wx2.5/bld-unicode/lib/libwx_macud-2.5.?.r* lib
|
||||
# cp /projects/wx2.5/bld-unicode/lib/libwx_macud-2.5.?.r* lib
|
||||
# fi
|
||||
# touch lib/libwx*.r*
|
||||
|
||||
make $MAKEJOBS
|
||||
make $MAKEJOBS -C contrib/src/animate
|
||||
make $MAKEJOBS -C contrib/src/gizmos
|
||||
make $MAKEJOBS -C contrib/src/stc
|
||||
WXBLD_CONFIG="$WXBLD/wx-config"
|
||||
if [ $universal = yes ]; then
|
||||
export WXROOT
|
||||
export BUILDPREFIX=$PREFIX
|
||||
export INSTALLDIR=$INSTALLROOT$PREFIX
|
||||
$WXDIR/distrib/scripts/mac/macbuild wxpython universal $CHARTYPE
|
||||
else
|
||||
make $MAKEJOBS
|
||||
make $MAKEJOBS -C contrib/src/animate
|
||||
make $MAKEJOBS -C contrib/src/gizmos
|
||||
make $MAKEJOBS -C contrib/src/stc
|
||||
fi
|
||||
|
||||
SWIGIT=0
|
||||
if [ $reswig = yes ]; then
|
||||
SWIGIT=1
|
||||
fi
|
||||
|
||||
# Build wxPython
|
||||
cd $WXROOT/wxPython
|
||||
@@ -268,8 +294,10 @@ if [ $skipbuild != yes ]; then
|
||||
UNICODE=$PYUNICODEOPT \
|
||||
NO_SCRIPTS=1 \
|
||||
EP_ADD_OPTS=1 \
|
||||
WX_CONFIG="$WXBLD/wx-config --inplace" \
|
||||
WX_CONFIG="$WXBLD_CONFIG --inplace" \
|
||||
BUILD_BASE=$WXBLD/wxPython \
|
||||
SWIG=$SWIGBIN \
|
||||
USE_SWIG=$SWIGIT \
|
||||
build
|
||||
fi
|
||||
|
||||
@@ -278,11 +306,12 @@ fi
|
||||
if [ $skipinstall != yes ]; then
|
||||
# Install wxWidgets
|
||||
cd $WXBLD
|
||||
make prefix=$INSTALLROOT$PREFIX install
|
||||
make -C contrib/src/animate prefix=$INSTALLROOT$PREFIX install
|
||||
make -C contrib/src/gizmos prefix=$INSTALLROOT$PREFIX install
|
||||
make -C contrib/src/stc prefix=$INSTALLROOT$PREFIX install
|
||||
|
||||
if [ $universal != yes ]; then
|
||||
make prefix=$INSTALLROOT$PREFIX install
|
||||
make -C contrib/src/animate prefix=$INSTALLROOT$PREFIX install
|
||||
make -C contrib/src/gizmos prefix=$INSTALLROOT$PREFIX install
|
||||
make -C contrib/src/stc prefix=$INSTALLROOT$PREFIX install
|
||||
fi
|
||||
|
||||
# relink wx-config with a relative link
|
||||
cd $INSTALLROOT$PREFIX/bin
|
||||
@@ -295,7 +324,7 @@ if [ $skipinstall != yes ]; then
|
||||
UNICODE=$PYUNICODEOPT \
|
||||
NO_SCRIPTS=1 \
|
||||
EP_ADD_OPTS=1 \
|
||||
WX_CONFIG="$INSTALLROOT/$PREFIX/bin/wx-config --prefix=$INSTALLROOT/$PREFIX" \
|
||||
WX_CONFIG="$INSTALLROOT$PREFIX/bin/wx-config --prefix=$INSTALLROOT$PREFIX" \
|
||||
BUILD_BASE=$WXBLD/wxPython \
|
||||
install \
|
||||
--root=$INSTALLROOT
|
||||
@@ -350,10 +379,15 @@ if [ $skipdmg != yes ]; then
|
||||
# The main runtime installer package
|
||||
|
||||
# Make the welcome message
|
||||
case $KIND in
|
||||
panther) W_MSG="the Panther (OS X 10.3.x) version of" ;;
|
||||
jaguar) W_MSG="the Jaguar (OS X 10.2.x) version of" ;;
|
||||
case $OSX_VERSION in
|
||||
10.4) W_MSG="the Tiger (OS X 10.4.x Intel) version of" ;;
|
||||
10.3) W_MSG="the Panther (OS X 10.3.x) version of" ;;
|
||||
10.2) W_MSG="the Jaguar (OS X 10.2.x) version of" ;;
|
||||
esac
|
||||
|
||||
if [ $universal == yes ]; then
|
||||
W_MSG="the Universal (OS X 10.4.x and above) version of"
|
||||
fi
|
||||
|
||||
|
||||
cat > $RESOURCEDIR/Welcome.txt <<EOF
|
||||
@@ -401,9 +435,9 @@ EOF
|
||||
|
||||
|
||||
# Build the main Installer Package...
|
||||
PKGNAME=wxPython${SHORTVER}-osx-$CHARTYPE-$KIND
|
||||
PKGNAME=wxPython${SHORTVER}-osx-$CHARTYPE-$TAG
|
||||
if [ $PYVER != 2.3 ]; then
|
||||
PKGNAME=wxPython${SHORTVER}-osx-$CHARTYPE-$KIND-py$PYVER
|
||||
PKGNAME=wxPython${SHORTVER}-osx-$CHARTYPE-$TAG-py$PYVER
|
||||
fi
|
||||
rm -rf $PKGNAME.pkg
|
||||
$PYTHON $PROGDIR/../buildpkg.py \
|
||||
@@ -416,7 +450,7 @@ EOF
|
||||
$INSTALLROOT \
|
||||
$RESOURCEDIR
|
||||
|
||||
mv $PKGNAME.pkg $DMGROOT
|
||||
mv $PKGNAME.pkg $DMGROOT/$PKGNAME.pkg
|
||||
|
||||
rm $RESOURCEDIR/postflight
|
||||
rm $RESOURCEDIR/preflight
|
||||
@@ -470,7 +504,7 @@ EOF
|
||||
$PROGDIR/../makedmg $DMGROOT $DMGDIR $dmgname
|
||||
|
||||
echo Moving $DMGDIR/$dmgname.dmg to $DESTDIR
|
||||
mv $DMGDIR/$dmgname.dmg $DESTDIR
|
||||
mv $DMGDIR/$dmgname.dmg $DESTDIR/$dmgname.dmg
|
||||
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
@@ -521,7 +555,7 @@ EOF
|
||||
|
||||
|
||||
# wxDocs
|
||||
if [ ! -e $TARBALLDIR/wxPython-docs-$VERSION.tar.gz ]; then
|
||||
if [ ! -e $TARBALLDIR/wxPython-docs-$VERSION.tar.bz2 ]; then
|
||||
cat > "$DMGAPPS/Docs/Build ERROR.txt" <<EOF
|
||||
|
||||
The wxPython-docs tarball was not found when building this disk image!
|
||||
@@ -530,7 +564,7 @@ EOF
|
||||
|
||||
else
|
||||
pushd $BUILDROOT
|
||||
tar xzvf $TARBALLDIR/wxPython-docs-$VERSION.tar.gz
|
||||
tar xjvf $TARBALLDIR/wxPython-docs-$VERSION.tar.bz2
|
||||
popd
|
||||
|
||||
# Make an app to launch viewdocs.py
|
||||
@@ -563,10 +597,10 @@ EOF
|
||||
popd
|
||||
|
||||
|
||||
if [ ! -e $TARBALLDIR/wxPython-demo-$VERSION.tar.gz ]; then
|
||||
if [ ! -e $TARBALLDIR/wxPython-demo-$VERSION.tar.bz2 ]; then
|
||||
cat > "$DMGAPPS/Samples/Build ERROR.txt" <<EOF
|
||||
|
||||
The wxPython-demo tarball was not found when building this disk image!
|
||||
The wxPython-$VERSION-demo tarball was not found when building this disk image!
|
||||
|
||||
EOF
|
||||
cp "$DMGAPPS/Samples/Build ERROR.txt" $DMGAPPS
|
||||
@@ -575,10 +609,10 @@ EOF
|
||||
|
||||
# Copy the demo and samples to the disk image from the tarball
|
||||
pushd $DMGAPPS/Samples
|
||||
tar xzvf $TARBALLDIR/wxPython-demo-$VERSION.tar.gz
|
||||
tar xjvf $TARBALLDIR/wxPython-demo-$VERSION.tar.bz2
|
||||
mv wxPython-$VERSION/* .
|
||||
rm -rf wxPython-$VERSION
|
||||
rm demo/b demo/.setup.sh
|
||||
rm -f demo/b demo/.setup.sh
|
||||
mv demo/demo.py demo/demo.pyw
|
||||
popd
|
||||
|
||||
@@ -626,7 +660,7 @@ EOF
|
||||
$PROGDIR/../makedmg $DMGAPPS $DMGDIR $dmgname
|
||||
|
||||
echo Moving $DMGDIR/$dmgname.dmg to $DESTDIR
|
||||
mv $DMGDIR/$dmgname.dmg $DESTDIR
|
||||
mv $DMGDIR/$dmgname.dmg $DESTDIR/$dmgname.dmg
|
||||
fi
|
||||
|
||||
|
||||
@@ -638,3 +672,4 @@ else
|
||||
echo "Cleanup is disabled. You should remove $TMPDIR when finished"
|
||||
fi
|
||||
|
||||
exit 0
|
||||
|
||||
@@ -102,6 +102,8 @@ Source: "wx\_xrc.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; C
|
||||
Source: "wx\*.py"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
|
||||
Source: "wx\build\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\build"; Components: core
|
||||
Source: "wx\lib\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib"; Components: core
|
||||
Source: "wx\lib\analogclock\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib\analogclock"; Components: core
|
||||
Source: "wx\lib\analogclock\lib_setup\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib\analogclock\lib_setup"; Components: core
|
||||
Source: "wx\lib\colourchooser\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib\colourchooser"; Components: core
|
||||
Source: "wx\lib\editor\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib\editor"; Components: core
|
||||
Source: "wx\lib\editor\*.txt"; DestDir: "{app}\%(PKGDIR)s\wx\lib\editor"; Components: core
|
||||
@@ -136,6 +138,7 @@ Source: "wxPython\tools\*.py"; DestDir: "{app}\%(PKGDIR)s\wxP
|
||||
Source: "src\winxp.manifest"; DestDir: "{code:GetPythonDir}"; DestName: "python.exe.manifest"; Flags: sharedfile; Components: manifest
|
||||
Source: "src\winxp.manifest"; DestDir: "{code:GetPythonDir}"; DestName: "pythonw.exe.manifest"; Flags: sharedfile; Components: manifest
|
||||
Source: "wxversion\wxversion.py"; DestDir: "{app}"; Flags: sharedfile; Components: core
|
||||
Source: "wxaddons\*.py"; DestDir: "{app}\wxaddons"; Flags: sharedfile; Components: core
|
||||
Source: "src\wx.pth"; DestDir: "{app}"; Flags: sharedfile; Components: pthfile
|
||||
|
||||
%(LOCALE)s
|
||||
@@ -185,6 +188,10 @@ Type: files; Name: "{app}\%(PKGDIR)s\wx\build\*.pyc";
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wx\build\*.pyo";
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\*.pyc";
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\*.pyo";
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\analogclock\*.pyc";
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\analogclock\*.pyo";
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\analogclock\lib_setup\*.pyc";
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\analogclock\lib_setup\*.pyo";
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\colourchooser\*.pyc";
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\colourchooser\*.pyo";
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\editor\*.pyc";
|
||||
@@ -221,6 +228,12 @@ Type: files; Name: "{app}\%(PKGDIR)s\wxPython\lib\mixins\*.pyo";
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wxPython\tools\*.pyc";
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wxPython\tools\*.pyo";
|
||||
|
||||
Type: files; Name: "{app}\wxversion.pyc";
|
||||
Type: files; Name: "{app}\wxversion.pyo";
|
||||
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wxaddons\*.pyc";
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wxaddons\*.pyo";
|
||||
|
||||
%(UNINSTALL_BATCH)s
|
||||
|
||||
'''
|
||||
@@ -361,7 +374,8 @@ LicenseFile = licence\licence.txt
|
||||
Source: "demo\demo.py"; DestDir: "{app}\demo"; DestName: "demo.pyw";
|
||||
Source: "demo\*.py"; DestDir: "{app}\demo";
|
||||
Source: "demo\*.xml"; DestDir: "{app}\demo";
|
||||
Source: "demo\*.txt"; DestDir: "{app}\demo";
|
||||
Source: "demo\*.txt"; DestDir: "{app}\demo";
|
||||
Source: "demo\*.ico"; DestDir: "{app}\demo";
|
||||
|
||||
Source: "demo\bitmaps\*.bmp"; DestDir: "{app}\demo\bitmaps";
|
||||
Source: "demo\bitmaps\*.gif"; DestDir: "{app}\demo\bitmaps";
|
||||
@@ -587,7 +601,7 @@ def get_batch_files():
|
||||
runtime_template = 'Source: "%s"; DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core'
|
||||
|
||||
def get_runtime_dlls(PYVER):
|
||||
if PYVER == "py24":
|
||||
if PYVER >= "py24":
|
||||
source = [ r"distrib\msw\msvcr71.dll",
|
||||
r"distrib\msw\msvcp71.dll" ]
|
||||
else:
|
||||
|
||||
@@ -23,17 +23,11 @@ will be created.
|
||||
import sys, os, time
|
||||
|
||||
KEEP_TEMPS = 1
|
||||
ISCC = r"%s\InnoSetup2Ex\ISCC.exe %s"
|
||||
# default InnoSetup installer location
|
||||
ISCC = r"C:\progra~1\innose~1\ISCC.exe %s"
|
||||
|
||||
# see if we can find Inno Setup 4 and use that if so
|
||||
USING_INNO4=False
|
||||
try:
|
||||
import _winreg as wreg
|
||||
key = wreg.OpenKey(wreg.HKEY_CURRENT_USER, "Software\Bjornar Henden\ISTool4\Prefs")
|
||||
INNO_FOLDER = wreg.QueryValueEx(key,'InnoFolder')[0]
|
||||
USING_INNO4=True
|
||||
except:
|
||||
pass
|
||||
if os.environ.has_key("INNO4"):
|
||||
ISCC = os.environ["INNO4"]
|
||||
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
@@ -112,6 +106,8 @@ Source: "wx\_xrc.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; C
|
||||
Source: "wx\*.py"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
|
||||
Source: "wx\build\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\build"; Components: core
|
||||
Source: "wx\lib\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib"; Components: core
|
||||
Source: "wx\lib\analogclock\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib\analogclock"; Components: core
|
||||
Source: "wx\lib\analogclock\lib_setup\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib\analogclock\lib_setup"; Components: core
|
||||
Source: "wx\lib\colourchooser\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib\colourchooser"; Components: core
|
||||
Source: "wx\lib\editor\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib\editor"; Components: core
|
||||
Source: "wx\lib\editor\*.txt"; DestDir: "{app}\%(PKGDIR)s\wx\lib\editor"; Components: core
|
||||
@@ -146,6 +142,7 @@ Source: "wxPython\tools\*.py"; DestDir: "{app}\%(PKGDIR)s\wxP
|
||||
Source: "src\winxp.manifest"; DestDir: "{code:GetPythonDir}"; DestName: "python.exe.manifest"; Flags: sharedfile; Components: manifest
|
||||
Source: "src\winxp.manifest"; DestDir: "{code:GetPythonDir}"; DestName: "pythonw.exe.manifest"; Flags: sharedfile; Components: manifest
|
||||
Source: "wxversion\wxversion.py"; DestDir: "{app}"; Flags: sharedfile; Components: core
|
||||
Source: "wxaddons\*.py"; DestDir: "{app}\wxaddons"; Flags: sharedfile; Components: core
|
||||
Source: "src\wx.pth"; DestDir: "{app}"; Flags: sharedfile; Components: pthfile
|
||||
|
||||
%(LOCALE)s
|
||||
@@ -195,6 +192,10 @@ Type: files; Name: "{app}\%(PKGDIR)s\wx\build\*.pyc";
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wx\build\*.pyo";
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\*.pyc";
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\*.pyo";
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\analogclock\*.pyc";
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\analogclock\*.pyo";
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\analogclock\lib_setup\*.pyc";
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\analogclock\lib_setup\*.pyo";
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\colourchooser\*.pyc";
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\colourchooser\*.pyo";
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\editor\*.pyc";
|
||||
@@ -231,6 +232,12 @@ Type: files; Name: "{app}\%(PKGDIR)s\wxPython\lib\mixins\*.pyo";
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wxPython\tools\*.pyc";
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wxPython\tools\*.pyo";
|
||||
|
||||
Type: files; Name: "{app}\wxversion.pyc";
|
||||
Type: files; Name: "{app}\wxversion.pyo";
|
||||
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wxaddons\*.pyc";
|
||||
Type: files; Name: "{app}\%(PKGDIR)s\wxaddons\*.pyo";
|
||||
|
||||
%(UNINSTALL_BATCH)s
|
||||
|
||||
'''
|
||||
@@ -403,7 +410,7 @@ Source: "demo\data\*.mpg"; DestDir: "{app}\demo\data";
|
||||
;;Source: "demo\dllwidget\makefile.*"; DestDir: "{app}\demo\dllwidget";
|
||||
|
||||
Source: "licence\*.txt"; DestDir: "{app}\docs\licence";
|
||||
Source: "%(WXDIR)s\docs\htmlhelp\wx.chm"; DestDir: "{app}\docs";
|
||||
;;Source: "%(WXDIR)s\docs\htmlhelp\wx.chm"; DestDir: "{app}\docs";
|
||||
;;Source: "%(WXDIR)s\docs\htmlhelp\ogl.chm"; DestDir: "{app}\docs";
|
||||
Source: "docs\README.txt"; DestDir: "{app}\docs"; Flags: isreadme;
|
||||
Source: "docs\*.txt"; DestDir: "{app}\docs";
|
||||
@@ -627,9 +634,8 @@ def main():
|
||||
ISSFILE = "__wxPython.iss"
|
||||
ISSDEMOFILE = "__wxPythonDemo.iss"
|
||||
IFSFILE = "__wxPython.ifs"
|
||||
IFSFILEREF = "CodeFile = " + IFSFILE
|
||||
if USING_INNO4:
|
||||
IFSFILEREF = ""
|
||||
IFSFILEREF = "CodeFile = " + IFSFILE
|
||||
IFSFILEREF = ""
|
||||
UNINSTALL_BATCH = get_batch_files()
|
||||
PKGDIR = open('src/wx.pth').read()
|
||||
LOCALE = build_locale_string(PKGDIR)
|
||||
@@ -669,18 +675,12 @@ def main():
|
||||
global IFS_Template
|
||||
global ISS_DocDemo_Template
|
||||
|
||||
if USING_INNO4:
|
||||
ISS_Template = ISS_Template + "\n[Code]\n" + IFS_Template
|
||||
ISS_Template = ISS_Template + "\n[Code]\n" + IFS_Template
|
||||
|
||||
f = open(ISSFILE, "w")
|
||||
f.write(ISS_Template % vars())
|
||||
f.close()
|
||||
|
||||
if not USING_INNO4:
|
||||
f = open(IFSFILE, "w")
|
||||
f.write(IFS_Template % vars())
|
||||
f.close()
|
||||
|
||||
f = open(ISSDEMOFILE, "w")
|
||||
f.write(ISS_DocDemo_Template % vars())
|
||||
f.close()
|
||||
@@ -688,16 +688,9 @@ def main():
|
||||
TOOLS = os.environ['TOOLS']
|
||||
if TOOLS.startswith('/cygdrive'):
|
||||
TOOLS = r"c:\TOOLS" # temporary hack until I convert everything over to bash
|
||||
if USING_INNO4:
|
||||
print "Hello world!"
|
||||
ISCC = os.path.join(INNO_FOLDER, "iscc.exe")
|
||||
ISCC = r'"' + ISCC + '" %s'
|
||||
os.system(ISCC % (ISSFILE))
|
||||
#os.system(ISCC % (ISSDEMOFILE))
|
||||
else:
|
||||
print "not found..."
|
||||
os.system(ISCC % (TOOLS, ISSFILE))
|
||||
os.system(ISCC % (TOOLS, ISSDEMOFILE))
|
||||
|
||||
os.system(ISCC % (ISSFILE))
|
||||
os.system(ISCC % (ISSDEMOFILE))
|
||||
|
||||
if not KEEP_TEMPS:
|
||||
time.sleep(1)
|
||||
|
||||
@@ -29,7 +29,7 @@ rm -f `find _distrib_tgz/wxPython-$VERSION -name ".#*"`
|
||||
cd _distrib_tgz
|
||||
|
||||
tar cvf ../dist/wxPython-demo-$VERSION.tar wxPython-$VERSION
|
||||
gzip -9 ../dist/wxPython-demo-$VERSION.tar
|
||||
bzip2 -9 -f ../dist/wxPython-demo-$VERSION.tar
|
||||
|
||||
cd ..
|
||||
rm -r _distrib_tgz
|
||||
|
||||
@@ -69,7 +69,7 @@ rm del-dirs
|
||||
|
||||
rem *** bundle it all up TODO: don't hard-code the 2.6
|
||||
tar cvf ../dist/wxPython2.6-win32-devel-%1.tar wxPython-%1
|
||||
gzip -9 ../dist/wxPython2.6-win32-devel-%1.tar
|
||||
bzip2 -9 ../dist/wxPython2.6-win32-devel-%1.tar
|
||||
|
||||
rem *** cleanup
|
||||
cd ..
|
||||
|
||||
@@ -9,7 +9,7 @@ fi
|
||||
|
||||
|
||||
VERSION=`python -c "import setup;print setup.VERSION"`
|
||||
CONTRIBS="ogl gizmos"
|
||||
CONTRIBS="gizmos"
|
||||
DEST=wxPython-$VERSION/docs
|
||||
|
||||
|
||||
@@ -17,8 +17,9 @@ DEST=wxPython-$VERSION/docs
|
||||
mkdir -p _build_docs/$DEST
|
||||
cd _build_docs
|
||||
mkdir $DEST/wx
|
||||
#DEST=`python -c "import os; print os.path.abspath('$DEST')"`
|
||||
|
||||
WXDIR=../..
|
||||
WXDIR=`python -c "import os; print os.path.abspath('../..')"`
|
||||
INI=$WXDIR/docs/latex/wx/tex2rtf.ini
|
||||
|
||||
# **** Build the main docs using tex2rtf
|
||||
@@ -30,14 +31,12 @@ cp $DEST/wx/wx_contents.html $DEST/wx/index.html
|
||||
cp $DEST/wx/* $WXDIR/docs/html/wx
|
||||
|
||||
# **** and the contribs
|
||||
for c in $CONTRIBS; do
|
||||
echo "****" $c "****"
|
||||
mkdir $DEST/$c
|
||||
cp $WXDIR/contrib/docs/latex/$c/*.gif $DEST/$c
|
||||
cp $WXDIR/contrib/docs/latex/$c/*.bmp $DEST/$c
|
||||
tex2rtf $WXDIR/contrib/docs/latex/$c/$c.tex $DEST/$c/$c.html -twice -html -macros $INI
|
||||
cp $DEST/$c/$c.html $DEST/$c/index.html || cp $DEST/$c/${c}_contents.html $DEST/$c/index.html
|
||||
done
|
||||
echo "**** gizmos ****"
|
||||
mkdir $DEST/gizmos
|
||||
cp $WXDIR/contrib/docs/latex/gizmos/*.gif $DEST/gizmos
|
||||
cp $WXDIR/contrib/docs/latex/gizmos/*.bmp $DEST/gizmos
|
||||
tex2rtf $WXDIR/contrib/docs/latex/gizmos/manual.tex $DEST/gizmos/gizmos.html -twice -html -macros $INI
|
||||
cp $DEST/gizmos/gizmos.html $DEST/gizmos/index.html || cp $DEST/gizmos/gizmos_contents.html $DEST/gizmos/index.html
|
||||
|
||||
|
||||
# **** zip the docs into "books"
|
||||
@@ -57,11 +56,11 @@ done
|
||||
popd
|
||||
cp ../distrib/viewdocs.py $DEST
|
||||
cp ../distrib/README.viewdocs.txt $DEST/README.txt
|
||||
cp ../docs/xml/wxPython-metadata.xml $DEST
|
||||
##cp ../docs/xml/wxPython-metadata.xml $DEST
|
||||
|
||||
rm -f ../dist/wxPython-docs-$VERSION.tar.gz
|
||||
rm -f ../dist/wxPython-docs-$VERSION.tar.bz2
|
||||
tar cvf ../dist/wxPython-docs-$VERSION.tar $DEST
|
||||
gzip -9 ../dist/wxPython-docs-$VERSION.tar
|
||||
bzip2 -9 ../dist/wxPython-docs-$VERSION.tar
|
||||
|
||||
|
||||
# **** Cleanup
|
||||
|
||||
14
wxPython/distrib/makemo.py
Normal file
14
wxPython/distrib/makemo.py
Normal file
@@ -0,0 +1,14 @@
|
||||
import os, glob, shutil
|
||||
|
||||
wx_dir = os.environ["WXWIN"]
|
||||
locale_dir = os.path.join(wx_dir, "locale")
|
||||
print "WX Locale dir is: " + locale_dir
|
||||
for mo in glob.glob(os.path.join(locale_dir, "*.mo")):
|
||||
mofile = os.path.basename(mo)
|
||||
moname = os.path.splitext(mofile)[0]
|
||||
modir = os.path.join(locale_dir, moname, "LC_MESSAGES")
|
||||
print "Making: " + modir
|
||||
if not os.path.exists(modir):
|
||||
os.makedirs(modir)
|
||||
shutil.copyfile(os.path.join(locale_dir, mofile), os.path.join(modir, "wxstd.mo"))
|
||||
|
||||
@@ -41,7 +41,7 @@ cd ..
|
||||
rem *** bundle it all up
|
||||
cd _distrib_zip
|
||||
tar cvf ../dist/wxPythonWIN32-preview-%1.tar wxPython-%1
|
||||
gzip -9 ../dist/wxPythonWIN32-preview-%1.tar
|
||||
bzip2 -9 ../dist/wxPythonWIN32-preview-%1.tar
|
||||
mv ../dist/wxPythonWIN32-preview-%1.tar.gz ../dist/wxPythonWIN32-preview-%1.tgz
|
||||
|
||||
rem *** cleanup
|
||||
|
||||
@@ -134,21 +134,17 @@ if [ -z "${skipcopy}" ]; then
|
||||
# copy root dir contents
|
||||
cp -pf --link ${wxdir}/* ${tarver} > /dev/null 2>&1
|
||||
|
||||
# copy all top dirs except CVS, build, demos, samples, utils, and wxPython
|
||||
for d in art build contrib debian distrib docs include lib locale misc patches src; do
|
||||
# copy all top dirs except CVS, demos, samples, and wxPython
|
||||
for d in art build contrib debian docs include lib locale patches samples src utils; do
|
||||
if [ -e ${wxdir}/$d ]; then
|
||||
cp -Rpf --link ${wxdir}/$d ${tarver} #> /dev/null 2>&1
|
||||
fi
|
||||
done
|
||||
mkdir ${tarver}/distrib
|
||||
cp -Rpf --link ${wxdir}/distrib/scripts ${tarver}/distrib
|
||||
|
||||
# # and tex2rtf too
|
||||
# mkdir ${tarver}/utils
|
||||
# cp -Rpf --link ${wxdir}/utils/tex2rtf ${tarver}/utils
|
||||
# # tex2rtf needs these files
|
||||
# mkdir ${tarver}/samples
|
||||
# cp -Rpf --link ${wxdir}/samples/sample.* ${tarver}/samples
|
||||
|
||||
# now do the same thing for wxPython, skipping it's build dirs and such
|
||||
# now do the same thing for wxPython, but use the DIRLIST to select dirs to copy
|
||||
for dir in `grep -v '#' ${wxdir}/wxPython/distrib/DIRLIST`; do
|
||||
mkdir ${tarver}/${dir}
|
||||
##echo "cp -pf --link ${wxdir}/${dir}/* ${tarver}/${dir}"
|
||||
@@ -172,9 +168,9 @@ if [ -z "${skipcopy}" ]; then
|
||||
rm *.spec
|
||||
rm -rf distrib/msw/tmake
|
||||
rm -rf docs/html
|
||||
rm -rf docs/latex
|
||||
rm -rf contrib/docs
|
||||
rm -rf contrib/samples
|
||||
#rm -rf docs/latex
|
||||
#rm -rf contrib/docs
|
||||
#rm -rf contrib/samples
|
||||
rm locale/*.mo
|
||||
cleanup ".#*"
|
||||
cleanup "#*#"
|
||||
@@ -184,6 +180,8 @@ if [ -z "${skipcopy}" ]; then
|
||||
cleanup "*.pyc"
|
||||
cleanup core
|
||||
cleanup "core.[0-9]*"
|
||||
rm -f wxPython/samples/embedded/embedded
|
||||
rm -f wxPython/samples/embedded/embedded.o
|
||||
|
||||
# ports that are not supported yet
|
||||
cleanup cocoa
|
||||
@@ -191,6 +189,8 @@ if [ -z "${skipcopy}" ]; then
|
||||
cleanup motif
|
||||
cleanup os2
|
||||
cleanup x11
|
||||
cleanup univ
|
||||
cleanup wine
|
||||
|
||||
rm -f wxPython/wx/* > /dev/null 2>&1
|
||||
|
||||
@@ -224,10 +224,10 @@ if [ -z "${skiptar}" ]; then
|
||||
tar cvf ${distdir}/${tarver}.tar ${tarver} > /dev/null
|
||||
|
||||
echo "*** Compressing..."
|
||||
if [ -e ${distdir}/${tarver}.tar.gz ]; then
|
||||
rm ${distdir}/${tarver}.tar.gz
|
||||
if [ -e ${distdir}/${tarver}.tar.bz2 ]; then
|
||||
rm ${distdir}/${tarver}.tar.bz2
|
||||
fi
|
||||
gzip --best ${distdir}/${tarver}.tar
|
||||
bzip2 --best ${distdir}/${tarver}.tar
|
||||
popd > /dev/null
|
||||
fi
|
||||
|
||||
@@ -237,7 +237,7 @@ fi
|
||||
|
||||
if [ -z "${skiprpm}" ]; then
|
||||
echo "*** Building RPMs..."
|
||||
cp ${distdir}/${tarver}.tar.gz ${rpmtop}/SOURCES
|
||||
cp ${distdir}/${tarver}.tar.bz2 ${rpmtop}/SOURCES
|
||||
|
||||
if [ "${srpmonly}" = "1" ]; then
|
||||
rpmbuild -bs \
|
||||
|
||||
@@ -22,7 +22,6 @@ if os.access(basePath, os.W_OK):
|
||||
args = ['',
|
||||
'--cache='+basePath,
|
||||
os.path.join(basePath, 'wx.zip'),
|
||||
os.path.join(basePath, 'ogl.zip'),
|
||||
]
|
||||
|
||||
# add any other .zip files found
|
||||
|
||||
@@ -58,13 +58,30 @@
|
||||
|
||||
|
||||
# Used to set the Release tag below. I normally use it to define what
|
||||
# distro the RPM was build on and also include the version of Python
|
||||
# distro the RPM was built on and also include the version of Python
|
||||
# it was built with.
|
||||
%if %{?release:0}%{!?release:1}
|
||||
%define release 1_py%{pyver}
|
||||
%endif
|
||||
|
||||
|
||||
# This one is used to control whether the full 4 components of the
|
||||
# verseion number are used in the site-packages subdirectory name. By
|
||||
# default only 2 or 3 components (depending on stable/unstable status)
|
||||
# are used.
|
||||
%if %{?fullver:0}%{!?fullver:1}
|
||||
%define fullver 0
|
||||
%endif
|
||||
|
||||
|
||||
# Whether to add --enable-mediactrl to the wxWidgets configure. For
|
||||
# some older versions of gstreamer-0.8 it currently incorerctly allows
|
||||
# its use eventhough there is a compatibility problem that causes a
|
||||
# failed compile.
|
||||
%if %{?mediactrl:0}%{!?mediactrl:1}
|
||||
%define mediactrl 1
|
||||
%endif
|
||||
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
# Other variables used below
|
||||
@@ -94,7 +111,7 @@ Name: %{pkgname}%{ver2}
|
||||
Summary: Cross platform GUI toolkit for Python
|
||||
Version: %{version}
|
||||
Release: %{release}
|
||||
Source0: %{tarname}-%{version}.tar.gz
|
||||
Source0: %{tarname}-%{version}.tar.bz2
|
||||
License: wx Library Licence, Version 3
|
||||
URL: http://wxPython.org/
|
||||
Packager: Robin Dunn <robin@alldunn.com>
|
||||
@@ -118,7 +135,7 @@ Provides: wxPython
|
||||
|
||||
%description -n %{pkgname}%{ver2}-%{port}-%{chartype}
|
||||
wxPython is a GUI toolkit for the Python programming language. It
|
||||
allows Python programmers to create programs with a robust, highly
|
||||
allows Python programmers to create programs with a robust, highly
|
||||
functional graphical user interface, simply and easily. It is
|
||||
implemented as a Python extension module (native code) that wraps the
|
||||
popular wxWidgets cross platform GUI library, which is written in C++.
|
||||
@@ -195,6 +212,9 @@ cd bld
|
||||
--enable-geometry \
|
||||
--enable-optimise \
|
||||
--enable-sound --with-sdl \
|
||||
%if %{mediactrl}
|
||||
--enable-mediactrl \
|
||||
%endif
|
||||
--enable-display \
|
||||
%if %{unicode}
|
||||
--enable-unicode \
|
||||
@@ -226,6 +246,7 @@ cd $WXDIR/wxPython
|
||||
WXPORT=%{port} \
|
||||
UNICODE=%{unicode} \
|
||||
EP_ADD_OPTS=1 \
|
||||
EP_FULL_VER=%{fullver} \
|
||||
NO_SCRIPTS=1 \
|
||||
WX_CONFIG="$WXDIR/bld/wx-config --no_rpath" \
|
||||
build_ext --rpath=%{wxpref}/lib \
|
||||
@@ -253,6 +274,7 @@ cd $WXDIR/wxPython
|
||||
WXPORT=%{port} \
|
||||
UNICODE=%{unicode} \
|
||||
EP_ADD_OPTS=1 \
|
||||
EP_FULL_VER=%{fullver} \
|
||||
NO_SCRIPTS=1 \
|
||||
WX_CONFIG="$RPM_BUILD_ROOT%{wxpref}/bin/wx-config --prefix=$RPM_BUILD_ROOT%{wxpref} --no_rpath" \
|
||||
build_ext --rpath=%{wxpref}/lib \
|
||||
@@ -392,9 +414,13 @@ rm %{wxpref}/bin/wx-config
|
||||
%doc wxPython/docs/*
|
||||
%dir %{pref}/lib*/python%{pyver}/site-packages/wx-%{ver2}*-%{port}-%{chartype}
|
||||
%{pref}/lib*/python%{pyver}/site-packages/wx-%{ver2}*-%{port}-%{chartype}/*
|
||||
%dir %{pref}/lib*/python%{pyver}/site-packages/wxaddons
|
||||
%{pref}/lib*/python%{pyver}/site-packages/wxaddons/*
|
||||
%dir %{wxpref}
|
||||
%dir %{wxpref}/lib
|
||||
%{wxpref}/lib/libwx_gtk*
|
||||
%dir %{wxpref}/bin
|
||||
%{wxpref}/bin/wxrc*
|
||||
%{wxpref}/share
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user