From fda330675c8dd34143d69a00a42bee1ab26dcc78 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 9 Jun 2004 05:38:45 +0000 Subject: [PATCH] distrib and build updates git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/config.py | 6 +++--- wxPython/distrib/DIRLIST | 16 ++++++++++++++-- wxPython/distrib/makerpm | 4 ++-- wxPython/distrib/wxPythonFull.spec.in | 5 ++--- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/wxPython/config.py b/wxPython/config.py index 25e577433d..1139ac09e0 100644 --- a/wxPython/config.py +++ b/wxPython/config.py @@ -38,8 +38,8 @@ import distutils.command.clean VER_MAJOR = 2 # The first three must match wxWidgets VER_MINOR = 5 VER_RELEASE = 2 -VER_SUBREL = 0 # wxPython release num for x.y.z release of wxWidgets -VER_FLAGS = "p" # release flags, such as prerelease num, unicode, etc. +VER_SUBREL = 1 # wxPython release num for x.y.z release of wxWidgets +VER_FLAGS = "" # release flags, such as prerelease num, unicode, etc. DESCRIPTION = "Cross platform GUI toolkit for Python" AUTHOR = "Robin Dunn" @@ -300,7 +300,7 @@ def run_swig(files, dir, gendir, package, USE_SWIG, force, swig_args, i_file = os.path.join(dir, file) py_file = os.path.join(dir, gendir, pre+basefile+'.py') cpp_file = os.path.join(dir, gendir, pre+basefile+'_wrap.cpp') - xml_file = os.path.join("docs", "xml-raw", basefile+'_swig.xml') + xml_file = os.path.join("docs", "xml-raw", basefile+pre+'_swig.xml') if add_under: interface = ['-interface', '_'+basefile+'_'] diff --git a/wxPython/distrib/DIRLIST b/wxPython/distrib/DIRLIST index 0ebfdd7032..157ca529f4 100644 --- a/wxPython/distrib/DIRLIST +++ b/wxPython/distrib/DIRLIST @@ -2,7 +2,9 @@ # This file is a list of the directories whose contents should be # included in any tarball, etc. for building wxPython. # -# This list is generated with this command, run from the $WXWIN dir: +# This list is generated with this command, run from the $WXWIN dir, +# and then hand edited after that: +# # find wxPython -type d -print | sort | egrep -v "(CVS|build|tmp|xml-raw|dist$)" # @@ -17,6 +19,10 @@ wxPython/contrib/gizmos wxPython/contrib/gizmos/gtk wxPython/contrib/gizmos/mac wxPython/contrib/gizmos/msw +wxPython/contrib/gizmos/wxCode +wxPython/contrib/gizmos/wxCode/include +wxPython/contrib/gizmos/wxCode/include/wx +wxPython/contrib/gizmos/wxCode/src wxPython/contrib/glcanvas wxPython/contrib/glcanvas/gtk wxPython/contrib/glcanvas/mac @@ -27,7 +33,13 @@ wxPython/contrib/ogl/gtk wxPython/contrib/ogl/mac wxPython/contrib/ogl/msw wxPython/contrib/stc +wxPython/contrib/stc/gtk +wxPython/contrib/stc/mac +wxPython/contrib/stc/msw wxPython/contrib/xrc +wxPython/contrib/xrc/gtk +wxPython/contrib/xrc/mac +wxPython/contrib/xrc/msw wxPython/demo wxPython/demo/bitmaps wxPython/demo/bmp_source @@ -69,10 +81,10 @@ wxPython/wx/build wxPython/wx/lib wxPython/wx/lib/colourchooser wxPython/wx/lib/editor +wxPython/wx/lib/floatcanvas wxPython/wx/lib/masked wxPython/wx/lib/mixins wxPython/wx/lib/ogl -wxPython/wx/lib/floatcanvas wxPython/wx/py wxPython/wx/py/tests wxPython/wxPython diff --git a/wxPython/distrib/makerpm b/wxPython/distrib/makerpm index 059085b170..194995955d 100755 --- a/wxPython/distrib/makerpm +++ b/wxPython/distrib/makerpm @@ -40,7 +40,7 @@ function usage { echo "command flags:" echo " skipcopy Don't copy the files for the tarball from the workspace" echo " skiptar Don't build the tarball" - echo " skiprpm Don't build the RPM (but why?)" + echo " skiprpm Don't build the RPM" echo " skipclean Don't do the cleanup at the end" echo " gtk2 Build using wxGTK2 and Unicode" echo " x11 Build using wxX11" @@ -87,7 +87,7 @@ for flag in $*; do case ${flag} in skipcopy) skipcopy=1 ;; skipclean) skipclean=1 ;; - skiptar) skiptar=1 ;; + skiptar) skiptar=1; skipcopy=1 ;; skiprpm) skiprpm=1 ;; gtk2) unicode=1; port=GTK2; lcport=gtk2 ;; x11) port=X11; lcport=x11 ;; diff --git a/wxPython/distrib/wxPythonFull.spec.in b/wxPython/distrib/wxPythonFull.spec.in index cc1ccfedd1..82a9a5ab53 100644 --- a/wxPython/distrib/wxPythonFull.spec.in +++ b/wxPython/distrib/wxPythonFull.spec.in @@ -137,9 +137,8 @@ cd $WXDIR/wxPython NO_SCRIPTS=1 \ WXPORT=%{lcport} \ UNICODE=%{unicode} \ - WX_CONFIG="$WXDIR/bld/wx-config --prefix=$WXDIR --exec-prefix=$WXDIR/bld" \ - CONTRIBS_INC="$WXDIR/contrib/include" \ - build + WX_CONFIG="$WXDIR/bld/wx-config --inplace" \ + build # Build wxrc (XRC resource tool) -- 2.45.2