Prep for wxPython 2.1b3 release

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

utils/wxPython/distrib/build.py

@@ -220,7 +220,7 @@ class BuildConfig:
         self.VERSION = __version__
         self.MODULE = ''
         self.SWIGFILES = []
-        self.SWIGFLAGS = '-c++ -shadow -python -dnone -I$(WXPSRCDIR)'
+        self.SWIGFLAGS = '-c++ -shadow -python -keyword -dnone -I$(WXPSRCDIR)'
         self.SOURCES = []
         self.PYFILES = []
         self.LFLAGS = ''
@@ -230,6 +230,7 @@ class BuildConfig:
         self.OTHERLIBS = ''
         self.OTHERTARGETS = ''
         self.OTHERINSTALLTARGETS = ''
+        self.OTHERUNINSTALLTARGETS = ''
         self.OTHERRULES = ''
         self.DEFAULTRULE = 'default: $(GENCODEDIR) $(TARGET)'
         self.PYVERSION = sys.version[:3]
@@ -469,8 +470,8 @@ WXDIR = %(WXDIR)s
 VERSION = %(VERSION)s
 MODULE = %(MODULE)s
 SWIGFLAGS = %(SWIGFLAGS)s %(SWIGTOOLKITFLAG)s %(OTHERSWIGFLAGS)s
-CFLAGS = %(CFLAGS)s %(OTHERCFLAGS)s
-LFLAGS = %(LFLAGS)s %(OTHERLFLAGS)s
+CFLAGS = %(CFLAGS)s
+LFLAGS = %(LFLAGS)s
 PYVERSION = %(PYVERSION)s
 PYPREFIX = %(PYPREFIX)s
 EXECPREFIX = %(EXECPREFIX)s
@@ -505,8 +506,8 @@ THREAD=-DWXP_USE_THREAD=1
 
 
 NOPCH=1
-OVERRIDEFLAGS=%(OVERRIDEFLAGS)s %(OTHERCFLAGS)s
-EXTRAFLAGS = %(CFLAGS)s
+OVERRIDEFLAGS=%(OVERRIDEFLAGS)s
+EXTRAFLAGS = $(CFLAGS) %(OTHERCFLAGS)s
 
 LFLAGS = %(LFLAGS)s %(OTHERLFLAGS)s
 EXTRALIBS = %(LIBS)s %(OTHERLIBS)s
@@ -537,7 +538,7 @@ clean:
 	-erase $(TARGET)
 
 
-uninstall:
+uninstall: %(OTHERUNINSTALLTARGETS)s
 	-erase $(TARGETDIR)\\$(TARGET)
 %(PYCLEANUP)s
 
@@ -611,6 +612,13 @@ $(GENCODEDIR):
 
 #----------------------------------------------------------------------
 
+showflags:
+	@echo CPPFLAGS:
+	@echo $(CPPFLAGS)
+	@echo LFLAGS:
+	@echo $(LFLAGS)
+
+
 
 %(OTHERRULES)s
 '''
@@ -631,7 +639,7 @@ WXDIR = %(WXDIR)s
 VERSION = %(VERSION)s
 MODULE = %(MODULE)s
 SWIGFLAGS = %(SWIGFLAGS)s %(SWIGTOOLKITFLAG)s %(OTHERSWIGFLAGS)s
-CFLAGS = %(CFLAGS)s %(OTHERCFLAGS)s
+CFLAGS = %(CFLAGS)s $(OPT) %(OTHERCFLAGS)s
 LFLAGS = %(LFLAGS)s %(OTHERLFLAGS)s
 LIBS = %(LIBS)s %(OTHERLIBS)s
 PYVERSION = %(PYVERSION)s
@@ -679,7 +687,7 @@ clean:
 	-rm -f *.o *$(SO) *~
 	-rm -f $(TARGET)
 
-uninstall:
+uninstall: %(OTHERUNINSTALLTARGETS)s
 	-rm -f $(TARGETDIR)/$(TARGET)
 %(PYCLEANUP)s
 

utils/wxPython/distrib/wxPython.rsp

@@ -9,12 +9,15 @@ wxPython/demo/bitmaps/*.jpg
 wxPython/demo/README.txt
 wxPython/demo/*.xml
 
+wxPython/distrib/build.py
+
 wxPython/lib/*.py
 wxPython/lib/*.txt
 wxPython/lib/sizers/*.py
 wxPython/lib/sizers/*.txt
 
 
+wxPython/src/build.cfg
 wxPython/src/*.i
 wxPython/src/*.py
 wxPython/src/*.cpp
@@ -23,9 +26,6 @@ wxPython/src/*.h
 wxPython/src/*.ico
 wxPython/src/*.def
 wxPython/src/*.rc
-wxPython/src/makefile.*
-wxPython/src/Makefile.pre.in
-wxPython/src/Setup.*
 
 wxPython/src/msw/*.cpp
 wxPython/src/msw/*.h
@@ -39,8 +39,64 @@ wxpython/src/motif/*.cpp
 wxPython/src/motif/*.h
 wxPython/src/motif/*.py
 
-wxPython/src/qt/*.cpp
-wxPython/src/qt/*.h
-wxPython/src/qt/*.py
 
-wxPython/SWIG.patches/*.patch
+wxPython/modules/html/build.cfg
+wxPython/modules/html/*.i
+wxPython/modules/html/*.py
+wxPython/modules/html/*.cpp
+wxPython/modules/html/*.c
+wxPython/modules/html/*.h
+wxPython/modules/html/*.def
+wxPython/modules/html/*.rc
+wxPython/modules/html/msw/*.cpp
+wxPython/modules/html/msw/*.h
+wxPython/modules/html/msw/*.py
+wxPython/modules/html/gtk/*.cpp
+wxPython/modules/html/gtk/*.h
+wxPython/modules/html/gtk/*.py
+
+wxPython/modules/glcanvas/build.cfg
+wxPython/modules/glcanvas/*.i
+wxPython/modules/glcanvas/*.py
+wxPython/modules/glcanvas/*.cpp
+wxPython/modules/glcanvas/*.c
+wxPython/modules/glcanvas/*.h
+wxPython/modules/glcanvas/*.def
+wxPython/modules/glcanvas/*.rc
+wxPython/modules/glcanvas/msw/*.cpp
+wxPython/modules/glcanvas/msw/*.h
+wxPython/modules/glcanvas/msw/*.py
+wxPython/modules/glcanvas/gtk/*.cpp
+wxPython/modules/glcanvas/gtk/*.h
+wxPython/modules/glcanvas/gtk/*.py
+
+wxPython/modules/utils/build.cfg
+wxPython/modules/utils/*.i
+wxPython/modules/utils/*.py
+wxPython/modules/utils/*.cpp
+wxPython/modules/utils/*.c
+wxPython/modules/utils/*.h
+wxPython/modules/utils/*.def
+wxPython/modules/utils/*.rc
+wxPython/modules/utils/msw/*.cpp
+wxPython/modules/utils/msw/*.h
+wxPython/modules/utils/msw/*.py
+wxPython/modules/utils/gtk/*.cpp
+wxPython/modules/utils/gtk/*.h
+wxPython/modules/utils/gtk/*.py
+
+wxPython/modules/ogl/build.cfg
+wxPython/modules/ogl/*.i
+wxPython/modules/ogl/*.py
+wxPython/modules/ogl/*.cpp
+wxPython/modules/ogl/*.c
+wxPython/modules/ogl/*.h
+wxPython/modules/ogl/*.def
+wxPython/modules/ogl/*.rc
+wxPython/modules/ogl/msw/*.cpp
+wxPython/modules/ogl/msw/*.h
+wxPython/modules/ogl/msw/*.py
+wxPython/modules/ogl/gtk/*.cpp
+wxPython/modules/ogl/gtk/*.h
+wxPython/modules/ogl/gtk/*.py
+

utils/wxPython/distrib/wxPython.wse

@@ -17,7 +17,7 @@ item: Global
   Patch Flags=0000000000001001
   Patch Threshold=85
   Patch Memory=4000
-  EXE Filename=wxPython-2.1b2.exe
+  EXE Filename=wxPython-2.1b3.exe
   FTP Cluster Size=20
   Per-User Version ID=1
   Dialogs Version=6
@@ -822,8 +822,8 @@ item: Install File
   Flags=0000001010000011
 end
 item: Install File
-  Source=e:\projects\wx\lib\wx21b8.dll
-  Destination=%SYS%\wx21b8.dll
+  Source=e:\projects\wx\lib\wx21b9.dll
+  Destination=%SYS%\wx21b9.dll
   Flags=0000001010010010
 end
 item: Install File