Build and distrib tweaks

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

diff --git a/wxPython/b.bat b/wxPython/b.bat
index ed0181719c241818aeacaac183781c7c813fba69..68eda213b260a2e1e6a81cbeb23a673871b12223 100755 (executable)
--- a/wxPython/b.bat
+++ b/wxPython/b.bat
@@ -37,7 +37,7 @@ elseiff "%1" == "d" then
 rem touch all the *.i files so swig will regenerate
 elseiff "%1" == "t" then
        shift
-       set CMD=touch src\*.i & touch contrib\glcanvas\*.i & touch contrib\ogl\*.i & touch contrib\stc\*.i
+       set CMD=touch src\*.i & touch contrib\glcanvas\*.i & touch contrib\ogl\*.i & touch contrib\stc\*.i & touch contrib\gizmos\*.i & touch contrib\dllwidget\*.i
 
 rem "i" --> install
 elseiff "%1" == "i" then
@@ -69,6 +69,13 @@ elseiff "%1" == "a" then
        shift
        set CMD=echo Finished!
 
+       call b.bat 15 c
+       call b.bat 15 f
+       call b.bat 15 r
+       call b.bat 15 c
+       call b.bat 15 h
+       call b.bat 15 r
+
        call b.bat 21 c
        call b.bat 21 f
        call b.bat 21 r

diff --git a/wxPython/distrib/makedev.bat b/wxPython/distrib/makedev.bat
index 15735fc6e04b22b20ba31d36936293b1af229ae6..a7bc43f3d38d68522c8698c06d0f5305c4131498 100755 (executable)
--- a/wxPython/distrib/makedev.bat
+++ b/wxPython/distrib/makedev.bat
@@ -3,39 +3,47 @@ rem   Builds a zip containing stuff needed to link with the wxWindows DLL
 rem   shipped with wxPython.  This allows other developers to create apps
 rem   or extensions that can share the same DLL.
 
-mkdir wxWin
-mkdir wxWin\lib
-copy %WXWIN%\lib\*.lib wxWin\lib
-del wxWin\lib\*_d.lib
+setlocal
 
-mkdir wxWin\src
-copy %WXWIN%\src\makevc.env wxWin\src
-copy %WXWIN%\src\*.vc wxWin\src
+set BASE=wxPython-devel
 
-mkdir wxWin\src\msw
-mkdir wxWin\src\msw\ReleaseDLL
-copy %WXWIN%\src\msw\*.pch wxWin\src\msw
-del wxWin\src\msw\*_d.pch
-copy %WXWIN%\src\msw\ReleaseDLL\dummy*.obj wxWin\src\msw\ReleaseDLL
+mkdir %BASE%
 
-mkdir wxWin\include
-mkdir wxWin\include\wx
-mkdir wxWin\include\wx\msw
-mkdir wxWin\include\wx\generic
-mkdir wxWin\include\wx\html
-mkdir wxWin\include\wx\protocol
+mkdir %BASE%\ReleaseDLL
+mkdir %BASE%\HybridDLL
+copy /s %WXWIN%\ReleaseDLL %BASE%\ReleaseDLL
+copy /s %WXWIN%\HybridDLL %BASE%\HybridDLL
 
-copy %WXWIN%\include\wx\*.* wxWin\include\wx
-copy /s %WXWIN%\include\wx\msw\* wxWin\include\wx\msw
-copy /s %WXWIN%\include\wx\generic\* wxWin\include\wx\generic
-copy /s %WXWIN%\include\wx\html\* wxWin\include\wx\html
-copy /s %WXWIN%\include\wx\protocol\* wxWin\include\wx\protocol
+mkdir %BASE%\lib
+copy %WXWIN%\lib\*.lib %BASE\lib
+del %BASE%\lib\*d.lib
+copy %WXWIN%\lib\*.dll %BASE\lib
+del %BASE%\lib\*d.dll
+copy %WXWIN%\lib\*.pdb %BASE\lib
+del %BASE%\lib\*d.pdb
+copy /s %WXWIN%\lib\mswdll %BASE\lib\mswdll
+copy /s %WXWIN%\lib\mswdllh %BASE\lib\mswdllh
 
 
-zip -r wxPython-dev-%1.zip wxWin
+mkdir %BASE%\src
+copy %WXWIN%\src\makevc.env %BASE%\src
+copy %WXWIN%\src\*.vc %BASE%\src
 
+mkdir %BASE%\src\msw
+mkdir %BASE%\src\msw\ReleaseDLL
+copy %WXWIN%\src\msw\ReleaseDLL\dummy*.obj %BASE%\src\msw\ReleaseDLL
+mkdir %BASE%\src\msw\HybridDLL
+copy %WXWIN%\src\msw\HybridDLL\dummy*.obj %BASE%\src\msw\HybridDLL
 
-del /sx wxWin
+mkdir %BASE%\include
+mkdir %BASE%\include\wx
+copy /s %WXWIN%\include\wx\* %BASE%\include\wx
+
+
+zip -r dist\wxPython-devel-win32-%1.zip %BASE%
+del /sxzy %BASE%
+
+endlocal
 
 
 

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 5633a0366e390ba6b176859c854104b9385d59d0..278a4bc272a099981d12a0a6164d0068ea5101d0 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -13,7 +13,7 @@ from my_distutils import run_swig, contrib_copy_tree
 # flags and values that affect this script
 #----------------------------------------------------------------------
 
-VERSION          = "2.3.2"
+VERSION          = "2.3.2+"
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 AUTHOR_EMAIL     = "Robin Dunn <robin@alldunn.com>"