diff --git a/wxPython/distrib/autobuild.py b/wxPython/distrib/autobuild.py index ccbdf02707..ea3ebfca03 100755 --- a/wxPython/distrib/autobuild.py +++ b/wxPython/distrib/autobuild.py @@ -7,10 +7,14 @@ cwd = os.getcwd() logfile = 'c:\\temp\\autobuild.log' WXDIR = os.environ['WXWIN'] -dllVer = '21_15' -wxpVer = '2.1.15' +dllVer = '21_16' +wxpVer = '2.1.16' dateSt = time.strftime("%Y%m%d", time.localtime(time.time())) +base = os.path.split(sys.argv[0])[0] +base = os.path.join(base, '..') +WXPYDIR = os.path.abspath(base) + #---------------------------------------------------------------------- def do(cmd): @@ -58,73 +62,58 @@ def main(): logTruncate() try: - logSeparator("Cleanup") - os.chdir(WXDIR + '/src/msw') - do('make cleandll FINAL=1') - do('makeaddons clean FINAL=1') +## logSeparator("Cleanup") +## os.chdir(WXDIR + '/src/msw') +## do('make cleandll FINAL=1') - logSeparator("Building Documentation...") - os.chdir(WXDIR + '/src/msw') - do('make touchmanual htmlhelp') - validateFile(WXDIR + '/docs/htmlhelp/wx.chm') +## logSeparator("Building Documentation...") +## os.chdir(WXDIR + '/src/msw') +## do('make touchmanual htmlhelp') +## validateFile(WXDIR + '/docs/htmlhelp/wx.chm') - logSeparator("Building wxWindows and other libraries...") - os.chdir(WXDIR + '/src/msw') - do('make dll pch FINAL=1') - validateFile(WXDIR + '/lib/wx'+dllVer+'.dll') - ## do("upx -9 " + WXDIR + '/lib/wx'+dllVer+'.dll') +## logSeparator("Building wxWindows and other libraries...") +## os.chdir(WXDIR + '/src/msw') +## do('make dll pch FINAL=1') +## validateFile(WXDIR + '/lib/wx'+dllVer+'.dll') - do('makeaddons FINAL=1') - validateFile(WXDIR + '/contrib/lib/ogl.lib') - validateFile(WXDIR + '/contrib/lib/stc.lib') - logSeparator("Cleaning wxPython build directory...") - os.chdir(WXDIR + '/utils/wxPython') - do("del /sxy *.*") - logSeparator("Copying wxPython workspace to build directory...") - do("copy /s %s %s" % ('c:\\projects\\wxPython\\*.*', WXDIR+'\\utils\\wxPython')) - os.chdir(WXDIR + '/utils/wxPython') +## logSeparator("Cleaning wxPython build directory...") +## os.chdir(WXPYDIR) +## do('buildall.bat -c') + os.rename('build.local', 'build.local.save') f = open("build.local", "w") f.write(""" -TARGETDIR = 'c:\\projects\\wx\\utils\\wxPython' -WXPSRCDIR = 'c:\\projects\\wx\\utils\\wxPython\\src' CRTFLAG='/MD' FINAL=1 """) f.close() - logSeparator("Cleaning wxPython...") - os.chdir(WXDIR+'\\utils\\wxPython') - do("buildall -cu") - do("ll") - - logSeparator("Building core wxPython...") - os.chdir(WXDIR+'\\utils\\wxPython\\src') - do("build -bi") - validateFile(WXDIR+'\\utils\\wxPython\\wxc.pyd') - + os.chdir(WXPYDIR + '\\src') + do("build -b") + validateFile(WXPYDIR+'\\wxPython\\wxc.pyd') logSeparator("Building wxPython addon modules...") - os.chdir(WXDIR+'\\utils\\wxPython\\modules') - do("buildall -bi") - validateFile(WXDIR+'\\utils\\wxPython\\utilsc.pyd') - validateFile(WXDIR+'\\utils\\wxPython\\htmlc.pyd') - validateFile(WXDIR+'\\utils\\wxPython\\glcanvasc.pyd') - validateFile(WXDIR+'\\utils\\wxPython\\oglc.pyd') - validateFile(WXDIR+'\\utils\\wxPython\\stc_c.pyd') + os.chdir(WXPYDIR+'\\contrib') + do("buildall -b") + validateFile(WXPYDIR+'\\wxPython\\glcanvasc.pyd') + validateFile(WXPYDIR+'\\wxPython\\oglc.pyd') + validateFile(WXPYDIR+'\\wxPython\\stc_c.pyd') + + + os.chdir(WXPYDIR) + os.unlink('build.local') + os.rename('build.local.save', 'build.local') - ## os.chdir(WXDIR+'\\utils\\wxPython') - ## do("upx -9 *.pyd") logSeparator("Building installer executable...") - os.chdir(WXDIR+'\\utils\\wxPython\\distrib') + os.chdir(WXPYDIR+'\\distrib') do("autoit2 wise.aut") - srcName = WXDIR+'\\utils\\wxPython\\distrib\\wxPython-'+wxpVer+'.EXE' - destName = WXDIR+'\\utils\\wxPython\\distrib\\wxPython-'+wxpVer+'-'+dateSt+'.EXE' + srcName = WXPYDIR+'\\distrib\\wxPython-'+wxpVer+'.EXE' + destName = WXPYDIR+'\\distrib\\wxPython-'+wxpVer+'-'+dateSt+'.EXE' validateFile(srcName) try: time.sleep(5) @@ -135,18 +124,18 @@ FINAL=1 logSeparator("Building source and docs zip files...") - os.chdir(WXDIR+'\\utils') - do("wxPython\\distrib\\zipit.bat %s" % wxpVer) - srcZName = WXDIR+'\\utils\\wxPython\\distrib\\wxPython-src-'+wxpVer+'.zip' - destZName = WXDIR+'\\utils\\wxPython\\distrib\\wxPython-src-'+wxpVer+'-'+dateSt+'.zip' + os.chdir(WXPYDIR) + do("distrib\\zipit.bat %s" % wxpVer) + srcZName = WXPYDIR+'\\distrib\\wxPython-src-'+wxpVer+'.zip' + destZName = WXPYDIR+'\\distrib\\wxPython-src-'+wxpVer+'-'+dateSt+'.zip' validateFile(srcZName) try: os.rename(srcZName, destZName) except: pass - srcDName = WXDIR+'\\utils\\wxPython\\distrib\\wxPython-docs-'+wxpVer+'.zip' - destDName = WXDIR+'\\utils\\wxPython\\distrib\\wxPython-docs-'+wxpVer+'-'+dateSt+'.zip' + srcDName = WXPYDIR+'\\distrib\\wxPython-docs-'+wxpVer+'.zip' + destDName = WXPYDIR+'\\distrib\\wxPython-docs-'+wxpVer+'-'+dateSt+'.zip' validateFile(srcDName) try: os.rename(srcDName, destDName) @@ -154,12 +143,6 @@ FINAL=1 pass - logSeparator("Copying built files...") - do("copy %s %s" % (destName, cwd)) - do("copy %s %s" % (destZName, cwd)) - do("copy %s %s" % (destDName, cwd)) - - # #*#*#*#*#* Comment this out to allow upload... return @@ -168,8 +151,6 @@ FINAL=1 do('python c:\\utils\\sendwxp.py %s' % destName) do('python c:\\utils\\sendwxp.py %s' % destZName) do('python c:\\utils\\sendwxp.py %s' % destDName) - os.unlink(destName) - os.unlink(destZName) logSeparator("Finished!!!") diff --git a/wxPython/distrib/wxPython.WSM b/wxPython/distrib/wxPython.WSM index 16ffb01726..707fa57774 100644 Binary files a/wxPython/distrib/wxPython.WSM and b/wxPython/distrib/wxPython.WSM differ diff --git a/wxPython/distrib/wxPython.rsp b/wxPython/distrib/wxPython.rsp index e3f1090e5d..29fd8841eb 100644 --- a/wxPython/distrib/wxPython.rsp +++ b/wxPython/distrib/wxPython.rsp @@ -1,21 +1,21 @@ -wxPython/*.txt +*.txt -wxPython/demo/*.py -wxPython/demo/bitmaps/*.bmp -wxPython/demo/bitmaps/*.ico -wxPython/demo/bitmaps/*.gif -wxPython/demo/bitmaps/*.png -wxPython/demo/bitmaps/*.jpg -wxPython/demo/README.txt -wxPython/demo/*.xml -wxPython/demo/data/*.png -wxPython/demo/data/*.htm -wxPython/demo/data/*.bmp -wxPython/demo/data/*.i -wxPython/demo/data/*.h +demo/*.py +demo/bitmaps/*.bmp +demo/bitmaps/*.ico +demo/bitmaps/*.gif +demo/bitmaps/*.png +demo/bitmaps/*.jpg +demo/README.txt +demo/*.xml +demo/data/*.png +demo/data/*.htm +demo/data/*.bmp +demo/data/*.i +demo/data/*.h -wxPython/distrib/build.py -wxPython/distrib/wxPython.spec +distrib/build.py +distrib/wxPython.spec wxPython/lib/*.py wxPython/lib/*.txt @@ -25,98 +25,77 @@ wxPython/lib/editor/*.py wxPython/lib/editor/*.txt -wxPython/src/build.cfg -wxPython/src/*.i -wxPython/src/*.py -wxPython/src/*.cpp -wxPython/src/*.c -wxPython/src/*.h -wxPython/src/*.ico -wxPython/src/*.def -wxPython/src/*.rc +src/build.cfg +src/*.i +src/*.py +src/*.cpp +src/*.c +src/*.h +src/*.ico +src/*.def +src/*.rc -wxPython/src/msw/*.cpp -wxPython/src/msw/*.h -wxPython/src/msw/*.py +src/msw/*.cpp +src/msw/*.h +src/msw/*.py -wxPython/src/gtk/*.cpp -wxPython/src/gtk/*.h -wxPython/src/gtk/*.py +src/gtk/*.cpp +src/gtk/*.h +src/gtk/*.py -wxpython/src/motif/*.cpp -wxPython/src/motif/*.h -wxPython/src/motif/*.py +src/motif/*.cpp +src/motif/*.h +src/motif/*.py -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 +contrib/glcanvas/build.cfg +contrib/glcanvas/*.i +contrib/glcanvas/*.py +contrib/glcanvas/*.cpp +contrib/glcanvas/*.c +contrib/glcanvas/*.h +contrib/glcanvas/*.def +contrib/glcanvas/*.rc +contrib/glcanvas/msw/*.cpp +contrib/glcanvas/msw/*.h +contrib/glcanvas/msw/*.py +contrib/glcanvas/gtk/*.cpp +contrib/glcanvas/gtk/*.h +contrib/glcanvas/gtk/*.py + +contrib/ogl/build.cfg +contrib/ogl/*.txt +contrib/ogl/*.i +contrib/ogl/*.py +contrib/ogl/*.cpp +contrib/ogl/*.c +contrib/ogl/*.h +contrib/ogl/*.def +contrib/ogl/*.rc +contrib/ogl/contrib/include/wx/ogl/*.h +contrib/ogl/contrib/src/ogl/*.cpp + +contrib/stc/build.cfg +contrib/stc/*.txt +contrib/stc/*.i +contrib/stc/*.py +contrib/stc/*.cpp +contrib/stc/*.c +contrib/stc/*.h +contrib/stc/*.def +contrib/stc/*.rc +contrib/stc/*.cpp +contrib/stc/*.h +contrib/stc/*.py +contrib/stc/contrib/include/wx/stc/*.h +contrib/stc/contrib/src/stc/*.h +contrib/stc/contrib/src/stc/*.cpp +contrib/stc/contrib/src/stc/scintilla/include/*.h +contrib/stc/contrib/src/stc/scintilla/src/*.h +contrib/stc/contrib/src/stc/scintilla/src/*.cxx + -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/*.txt -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/contrib/include/wx/ogl/*.h -wxPython/modules/ogl/contrib/src/ogl/*.cpp - -wxPython/modules/stc/build.cfg -wxPython/modules/stc/*.txt -wxPython/modules/stc/*.i -wxPython/modules/stc/*.py -wxPython/modules/stc/*.cpp -wxPython/modules/stc/*.c -wxPython/modules/stc/*.h -wxPython/modules/stc/*.def -wxPython/modules/stc/*.rc -wxPython/modules/stc/*.cpp -wxPython/modules/stc/*.h -wxPython/modules/stc/*.py -wxPython/modules/stc/contrib/include/wx/stc/*.h -wxPython/modules/stc/contrib/src/stc/*.h -wxPython/modules/stc/contrib/src/stc/*.cpp -wxPython/modules/stc/contrib/src/stc/scintilla/include/*.h -wxPython/modules/stc/contrib/src/stc/scintilla/src/*.h -wxPython/modules/stc/contrib/src/stc/scintilla/src/*.cxx diff --git a/wxPython/distrib/wxPython.wse b/wxPython/distrib/wxPython.wse index c9c753c1c2..401dfebbe7 100644 --- a/wxPython/distrib/wxPython.wse +++ b/wxPython/distrib/wxPython.wse @@ -17,7 +17,7 @@ item: Global Patch Flags=0000000000001001 Patch Threshold=85 Patch Memory=4000 - EXE Filename=wxPython-2.1.15.exe + EXE Filename=wxPython-2.1.16.exe FTP Cluster Size=20 Per-User Version ID=1 Dialogs Version=6 @@ -72,6 +72,10 @@ item: Set Variable Value=wxPython Flags=10000000 end +item: Set Variable + Variable=DLLVER + Value=wx21_16 +end item: Check Configuration Flags=10111011 end @@ -191,7 +195,7 @@ end item: End Block end item: Display Graphic - Pathname=c:\Projects\wx\utils\wxPython\distrib\wxPython.BMP + Pathname=c:\Projects\wxp\distrib\wxPython.BMP X Position=32784 Y Position=16 Flags=0000001010000000 @@ -815,124 +819,134 @@ item: Install File Flags=0000001010000011 end item: Install File - Source=c:\projects\wx\lib\wx21_15.dll - Destination=%SYS%\wx21_15.dll + Source=c:\projects\wx\lib\wx21_16.dll + Destination=%SYS%\wx21_16.dll Flags=0000001010010010 end item: Install File - Source=c:\Projects\wx\utils\wxPython\*.py + Source=c:\Projects\wxp\wxPython\*.py Destination=%MAINDIR%\wxPython Description=wxPython shadow class modules Flags=0000000010000010 end item: Install File - Source=c:\Projects\wx\utils\wxPython\*.pyd + Source=c:\Projects\wxp\wxPython\*.pyd Destination=%MAINDIR%\wxPython Description=wxPython extension modules Flags=0000000010000010 end item: Install File - Source=c:\Projects\wx\utils\wxPython\*.txt + Source=c:\Projects\wxp\wxPython\*.txt Destination=%MAINDIR%\wxPython Description=README file Flags=0000000010000010 end item: Install File - Source=c:\Projects\wx\utils\wxPython\lib\*.py + Source=c:\Projects\wxp\wxPython\lib\*.py Destination=%MAINDIR%\wxPython\lib Description=wxPython Standard Library Flags=0000000010000010 end item: Install File - Source=c:\Projects\wx\utils\wxPython\lib\sizers\*.py + Source=c:\Projects\wxp\wxPython\lib\sizers\*.py Destination=%MAINDIR%\wxPython\lib\sizers Description=wxPython Standard Library Flags=0000000010000010 end item: Install File - Source=c:\Projects\wx\utils\wxPython\lib\editor\*.py + Source=c:\Projects\wxp\wxPython\lib\editor\*.py Destination=%MAINDIR%\wxPython\lib\editor Description=wxPython Standard Library Flags=0000000010000010 end item: Install File - Source=c:\Projects\wx\utils\wxPython\demo\*.py + Source=c:\Projects\wxp\demo\*.py Destination=%MAINDIR%\wxPython\demo Description=Demos Flags=0000000010000010 end item: Install File - Source=c:\Projects\wx\utils\wxPython\demo\README.txt + Source=c:\Projects\wxp\demo\README.txt Destination=%MAINDIR%\wxPython\demo\README.txt Description=Demos Flags=0000000010000010 end item: Install File - Source=c:\Projects\wx\utils\wxPython\demo\*.xml + Source=c:\Projects\wxp\demo\*.xml Destination=%MAINDIR%\wxPython\demo Description=Demos Flags=0000000010000010 end item: Install File - Source=c:\Projects\wx\utils\wxPython\demo\bitmaps\*.bmp + Source=c:\Projects\wxp\demo\bitmaps\*.bmp Destination=%MAINDIR%\wxPython\demo\bitmaps Description=Demos Flags=0000000010000010 end item: Install File - Source=c:\Projects\wx\utils\wxPython\demo\bitmaps\*.gif + Source=c:\Projects\wxp\demo\bitmaps\*.gif Destination=%MAINDIR%\wxPython\demo\bitmaps Description=Demos Flags=0000000010000010 end item: Install File - Source=c:\Projects\wx\utils\wxPython\demo\bitmaps\*.jpg + Source=c:\Projects\wxp\demo\bitmaps\*.jpg Destination=%MAINDIR%\wxPython\demo\bitmaps Description=Demos Flags=0000000010000010 end item: Install File - Source=c:\Projects\wx\utils\wxPython\demo\bitmaps\*.png + Source=c:\Projects\wxp\demo\bitmaps\*.png Destination=%MAINDIR%\wxPython\demo\bitmaps Description=Demos Flags=0000000010000010 end item: Install File - Source=c:\Projects\wx\utils\wxPython\demo\bitmaps\*.ico + Source=c:\Projects\wxp\demo\bitmaps\*.ico Destination=%MAINDIR%\wxPython\demo\bitmaps Description=Demos Flags=0000000010000010 end item: Install File - Source=c:\Projects\wx\utils\wxPython\demo\data\*.htm + Source=c:\Projects\wxp\demo\data\*.htm Destination=%MAINDIR%\wxPython\demo\data Description=Demos Flags=0000000010000010 end item: Install File - Source=c:\Projects\wx\utils\wxPython\demo\data\*.png + Source=c:\Projects\wxp\demo\data\*.png Destination=%MAINDIR%\wxPython\demo\data Description=Demos Flags=0000000010000010 end item: Install File - Source=C:\PROJECTS\wx\utils\wxPython\demo\data\grid.i + Source=c:\Projects\wxp\demo\data\grid.i Destination=%MAINDIR%\wxPython\demo\data\grid.i Description=Demos Flags=0000000010000010 end item: Install File - Source=C:\PROJECTS\wx\utils\wxPython\demo\data\stc.h + Source=c:\Projects\wxp\demo\data\stc.h Destination=%MAINDIR%\wxPython\demo\data\stc.h Description=Demos Flags=0000000010000010 end item: Install File - Source=C:\PROJECTS\wx\utils\wxPython\demo\data\tips.txt + Source=c:\Projects\wxp\demo\data\tips.txt Destination=%MAINDIR%\wxPython\demo\data\tips.txt Description=Demos Flags=0000000010000010 end +item: Install File + Source=C:\PROJECTS\wx\utils\wxPython\README.txt + Destination=%MAINDIR%\wxPython\README.txt + Flags=0000000010000010 +end +item: Install File + Source=C:\PROJECTS\wx\utils\wxPython\CHANGES.txt + Destination=%MAINDIR%\wxPython\CHANGES.txt + Flags=0000000010000010 +end item: Remark end item: Install File diff --git a/wxPython/distrib/zipit.bat b/wxPython/distrib/zipit.bat index 6a32acca72..ee24243f01 100755 --- a/wxPython/distrib/zipit.bat +++ b/wxPython/distrib/zipit.bat @@ -1,28 +1,43 @@ - @echo off -copy %WXWIN%\docs\gpl.txt wxPython -copy %WXWIN%\docs\lgpl.txt wxPython -copy %WXWIN%\docs\licence.txt wxPython -copy %WXWIN%\docs\licendoc.txt wxPython -copy %WXWIN%\docs\preamble.txt wxPython +rem **** Make a directory to build up a distribution tree +md _distrib_zip +md _distrib_zip\wxPython-%1 -zip -@ -r wxPython\wxPython-src-%1.zip < wxPython\distrib\wxPython.rsp +rem **** Copy the license files +copy %WXWIN%\docs\gpl.txt _distrib_zip\wxPython-%1 +copy %WXWIN%\docs\lgpl.txt _distrib_zip\wxPython-%1 +copy %WXWIN%\docs\licence.txt _distrib_zip\wxPython-%1 +copy %WXWIN%\docs\licendoc.txt _distrib_zip\wxPython-%1 +copy %WXWIN%\docs\preamble.txt _distrib_zip\wxPython-%1 -mkdir wxPython\docs -mkdir wxPython\docs\wx -copy %WXWIN%\docs\html\wx\*.gif wxPython\docs\wx -copy %WXWIN%\docs\html\wx\*.htm wxPython\docs\wx -copy wxPython\docs\wx\wx.htm wxPython\docs\wx\index.htm +rem **** Make a zip fron the live files +zip -@ -r _distrib_zip\temp.zip < distrib\wxPython.rsp -mkdir wxPython\docs\ogl -copy %WXWIN%\docs\html\ogl\*.gif wxPython\docs\ogl -copy %WXWIN%\docs\html\ogl\*.htm wxPython\docs\ogl -copy wxPython\docs\ogl\ogl.htm wxPython\docs\ogl\index.htm +rem **** Unzip it in our build dir +cd _distrib_zip\wxPython-%1 +unzip ..\temp.zip + +rem **** zip up the build dir +cd .. +zip -r ..\distrib\wxPython-src-%1.zip wxPython-%1 -zip -r wxPython\wxPython-docs-%1.zip wxPython\docs +rem **** copy the docs into the tree +md wxPython-%1\docs +md wxPython-%1\docs\wx +md wxPython-%1\docs\ogl +copy %WXWIN%\docs\html\wx\*.gif wxPython-%1\docs\wx +copy %WXWIN%\docs\html\wx\*.htm wxPython-%1\docs\wx +copy wxPython-%1\docs\wx\wx.htm wxPython-%1\docs\wx\index.htm +copy %WXWIN%\docs\html\ogl\*.gif wxPython-%1\docs\ogl +copy %WXWIN%\docs\html\ogl\*.htm wxPython-%1\docs\ogl +copy wxPython-%1\docs\ogl\ogl.htm wxPython-%1\docs\ogl\index.htm -del /sxzy wxPython\docs +rem **** zip up the docs +zip -r ..\distrib\wxPython-docs-%1.zip wxPython-%1\docs -move /R wxPython\*.zip wxPython\distrib + +rem **** Cleanup +cd .. +del /sxzy _distrib_zip