Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

distrib and build updates

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-06-09 05:38:45 +00:00
parent 521808ff62
commit fda330675c
4 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wxPython/config.py
View File

@@ -38,8 +38,8 @@ import distutils.command.clean
VER_MAJOR = 2 # The first three must match wxWidgets VER_MAJOR = 2 # The first three must match wxWidgets
VER_MINOR = 5 VER_MINOR = 5
VER_RELEASE = 2 VER_RELEASE = 2
VER_SUBREL = 0 # wxPython release num for x.y.z release of wxWidgets VER_SUBREL = 1 # wxPython release num for x.y.z release of wxWidgets
VER_FLAGS = "p" # release flags, such as prerelease num, unicode, etc. VER_FLAGS = "" # release flags, such as prerelease num, unicode, etc.
DESCRIPTION = "Cross platform GUI toolkit for Python" DESCRIPTION = "Cross platform GUI toolkit for Python"
AUTHOR = "Robin Dunn" 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) i_file = os.path.join(dir, file)
py_file = os.path.join(dir, gendir, pre+basefile+'.py') py_file = os.path.join(dir, gendir, pre+basefile+'.py')
cpp_file = os.path.join(dir, gendir, pre+basefile+'_wrap.cpp') 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: if add_under:
interface = ['-interface', '_'+basefile+'_'] interface = ['-interface', '_'+basefile+'_']

16
wxPython/distrib/DIRLIST
View File

@@ -2,7 +2,9 @@
# This file is a list of the directories whose contents should be # This file is a list of the directories whose contents should be
# included in any tarball, etc. for building wxPython. # 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$)" # 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/gtk
wxPython/contrib/gizmos/mac wxPython/contrib/gizmos/mac
wxPython/contrib/gizmos/msw 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
wxPython/contrib/glcanvas/gtk wxPython/contrib/glcanvas/gtk
wxPython/contrib/glcanvas/mac wxPython/contrib/glcanvas/mac
@@ -27,7 +33,13 @@ wxPython/contrib/ogl/gtk
wxPython/contrib/ogl/mac wxPython/contrib/ogl/mac
wxPython/contrib/ogl/msw wxPython/contrib/ogl/msw
wxPython/contrib/stc wxPython/contrib/stc
wxPython/contrib/stc/gtk
wxPython/contrib/stc/mac
wxPython/contrib/stc/msw
wxPython/contrib/xrc wxPython/contrib/xrc
wxPython/contrib/xrc/gtk
wxPython/contrib/xrc/mac
wxPython/contrib/xrc/msw
wxPython/demo wxPython/demo
wxPython/demo/bitmaps wxPython/demo/bitmaps
wxPython/demo/bmp_source wxPython/demo/bmp_source
@@ -69,10 +81,10 @@ wxPython/wx/build
wxPython/wx/lib wxPython/wx/lib
wxPython/wx/lib/colourchooser wxPython/wx/lib/colourchooser
wxPython/wx/lib/editor wxPython/wx/lib/editor
wxPython/wx/lib/floatcanvas
wxPython/wx/lib/masked wxPython/wx/lib/masked
wxPython/wx/lib/mixins wxPython/wx/lib/mixins
wxPython/wx/lib/ogl wxPython/wx/lib/ogl
wxPython/wx/lib/floatcanvas
wxPython/wx/py wxPython/wx/py
wxPython/wx/py/tests wxPython/wx/py/tests
wxPython/wxPython wxPython/wxPython

4
wxPython/distrib/makerpm
View File

@@ -40,7 +40,7 @@ function usage {
echo "command flags:" echo "command flags:"
echo " skipcopy Don't copy the files for the tarball from the workspace" echo " skipcopy Don't copy the files for the tarball from the workspace"
echo " skiptar Don't build the tarball" 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 " skipclean Don't do the cleanup at the end"
echo " gtk2 Build using wxGTK2 and Unicode" echo " gtk2 Build using wxGTK2 and Unicode"
echo " x11 Build using wxX11" echo " x11 Build using wxX11"
@@ -87,7 +87,7 @@ for flag in $*; do
case ${flag} in case ${flag} in
skipcopy) skipcopy=1 ;; skipcopy) skipcopy=1 ;;
skipclean) skipclean=1 ;; skipclean) skipclean=1 ;;
skiptar) skiptar=1 ;; skiptar) skiptar=1; skipcopy=1 ;;
skiprpm) skiprpm=1 ;; skiprpm) skiprpm=1 ;;
gtk2) unicode=1; port=GTK2; lcport=gtk2 ;; gtk2) unicode=1; port=GTK2; lcport=gtk2 ;;
x11) port=X11; lcport=x11 ;; x11) port=X11; lcport=x11 ;;

5
wxPython/distrib/wxPythonFull.spec.in
View File

@@ -137,9 +137,8 @@ cd $WXDIR/wxPython
NO_SCRIPTS=1 \ NO_SCRIPTS=1 \
WXPORT=%{lcport} \ WXPORT=%{lcport} \
UNICODE=%{unicode} \ UNICODE=%{unicode} \
WX_CONFIG="$WXDIR/bld/wx-config --prefix=$WXDIR --exec-prefix=$WXDIR/bld" \ WX_CONFIG="$WXDIR/bld/wx-config --inplace" \
CONTRIBS_INC="$WXDIR/contrib/include" \ build
build
# Build wxrc (XRC resource tool) # Build wxrc (XRC resource tool)