build and distrib things

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2000-04-24 05:09:12 +00:00
parent caf1045491
commit 59c777d597
7 changed files with 106 additions and 94 deletions

View File

@@ -281,9 +281,11 @@ class wxPythonDemo(wxFrame):
else: else:
if os.path.exists(itemText + '.py'): if os.path.exists(itemText + '.py'):
wxBeginBusyCursor() wxBeginBusyCursor()
try:
self.GetDemoFile(itemText + '.py') self.GetDemoFile(itemText + '.py')
module = __import__(itemText, globals()) module = __import__(itemText, globals())
self.SetOverview(itemText, module.overview) self.SetOverview(itemText, module.overview)
finally:
wxEndBusyCursor() wxEndBusyCursor()
# in case runTest is modal, make sure things look right... # in case runTest is modal, make sure things look right...
@@ -413,8 +415,7 @@ def main():
overview = """\ overview = """<html><body>
<html><body>
<h2>Python</h2> <h2>Python</h2>
Python is an interpreted, interactive, object-oriented programming language often compared to Tcl, Perl, Scheme, or Java. Python is an interpreted, interactive, object-oriented programming language often compared to Tcl, Perl, Scheme, or Java.

View File

@@ -184,11 +184,8 @@ class PythonSTC(wxStyledTextCtrl):
if expanding: if expanding:
self.SetFoldExpanded(lineNum, true) self.SetFoldExpanded(lineNum, true)
print lineNum,
lineNum = self.Expand(lineNum, true) lineNum = self.Expand(lineNum, true)
print lineNum,
lineNum = lineNum - 1 lineNum = lineNum - 1
print lineNum
else: else:
lastChild = self.GetLastChild(lineNum, -1) lastChild = self.GetLastChild(lineNum, -1)
self.SetFoldExpanded(lineNum, false) self.SetFoldExpanded(lineNum, false)

View File

@@ -4,10 +4,10 @@ import sys, os, string, time
from ftplib import FTP from ftplib import FTP
logfile = 'e:\\temp\\autobuild.log' logfile = 'c:\\temp\\autobuild.log'
WXDIR = os.environ['WXWIN'] WXDIR = os.environ['WXWIN']
dllVer = '21_14' dllVer = '21_15'
wxpVer = '2.1.14' wxpVer = '2.1.15'
dateSt = time.strftime("%Y%m%d", time.localtime(time.time())) dateSt = time.strftime("%Y%m%d", time.localtime(time.time()))
#---------------------------------------------------------------------- #----------------------------------------------------------------------
@@ -57,39 +57,43 @@ def main():
logTruncate() logTruncate()
try: try:
## logSeparator("Cleanup") logSeparator("Cleanup")
## os.chdir(WXDIR + '/src/msw') os.chdir(WXDIR + '/src/msw')
## do('make cleandll FINAL=1') do('make cleandll FINAL=1')
## os.chdir(WXDIR + '/utils/ogl/src') do('makeaddons clean FINAL=1')
## do('wxm clean FINAL=1')
## os.chdir(WXDIR + '/utils/glcanvas/win')
## do('wxm clean FINAL=1')
## logSeparator("Building Documentation...") #os.chdir(WXDIR + '/utils/ogl/src')
## os.chdir(WXDIR + '/src/msw') #do('wxm clean FINAL=1')
## do('make touchmanual htmlhelp') #os.chdir(WXDIR + '/utils/glcanvas/win')
## validateFile(WXDIR + '/docs/html/wx/wx.chm') #do('wxm clean FINAL=1')
## logSeparator("Building wxWindows and libraries...") logSeparator("Building Documentation...")
## os.chdir(WXDIR + '/src/msw') os.chdir(WXDIR + '/src/msw')
## do('make dll pch FINAL=1') do('make touchmanual htmlhelp')
## validateFile(WXDIR + '/lib/wx'+dllVer+'.dll') validateFile(WXDIR + '/docs/htmlhelp/wx.chm')
os.chdir(WXDIR + '/contrib/src/ogl') logSeparator("Building wxWindows and other libraries...")
do('wxm FINAL=1') os.chdir(WXDIR + '/src/msw')
do('make dll pch FINAL=1')
validateFile(WXDIR + '/lib/wx'+dllVer+'.dll')
do('makeaddons FINAL=1')
#os.chdir(WXDIR + '/contrib/src/ogl')
#do('wxm FINAL=1')
validateFile(WXDIR + '/contrib/lib/ogl.lib') validateFile(WXDIR + '/contrib/lib/ogl.lib')
validateFile(WXDIR + '/contrib/lib/stc.lib')
logSeparator("Cleaning wxPython build directory...") logSeparator("Cleaning wxPython build directory...")
os.chdir(WXDIR + '/utils/wxPython') os.chdir(WXDIR + '/utils/wxPython')
do("del /sxy *.*") do("del /sxy *.*")
logSeparator("Copying wxPython workspace to build directory...") logSeparator("Copying wxPython workspace to build directory...")
do("copy /s %s %s" % ('e:\\projects\\wxPython\*.*', WXDIR+'\\utils\\wxPython')) do("copy /s %s %s" % ('c:\\projects\\wxPython\\*.*', WXDIR+'\\utils\\wxPython'))
os.chdir(WXDIR + '/utils/wxPython') os.chdir(WXDIR + '/utils/wxPython')
f = open("build.local", "w") f = open("build.local", "w")
f.write(""" f.write("""
TARGETDIR = 'e:\\projects\\wx\\utils\\wxPython' TARGETDIR = 'c:\\projects\\wx\\utils\\wxPython'
WXPSRCDIR = 'e:\\projects\\wx\\utils\\wxPython\\src' WXPSRCDIR = 'c:\\projects\\wx\\utils\\wxPython\\src'
CRTFLAG='/MD' CRTFLAG='/MD'
FINAL=1 FINAL=1
""") """)
@@ -116,6 +120,7 @@ FINAL=1
validateFile(WXDIR+'\\utils\\wxPython\\htmlc.pyd') validateFile(WXDIR+'\\utils\\wxPython\\htmlc.pyd')
validateFile(WXDIR+'\\utils\\wxPython\\glcanvasc.pyd') validateFile(WXDIR+'\\utils\\wxPython\\glcanvasc.pyd')
validateFile(WXDIR+'\\utils\\wxPython\\oglc.pyd') validateFile(WXDIR+'\\utils\\wxPython\\oglc.pyd')
validateFile(WXDIR+'\\utils\\wxPython\\stc_c.pyd')
logSeparator("Building installer executable...") logSeparator("Building installer executable...")
@@ -129,7 +134,7 @@ FINAL=1
os.rename(srcName, destName) os.rename(srcName, destName)
validateFile(destName) validateFile(destName)
except: except:
pass logSeparator("****** UNABLE TO RENAME FILE ******")
logSeparator("Building source and docs zip files...") logSeparator("Building source and docs zip files...")
@@ -153,12 +158,12 @@ FINAL=1
# #*#*#*#*#* Comment this out to allow upload... # #*#*#*#*#* Comment this out to allow upload...
#return return
logSeparator("Uploading to website...") logSeparator("Uploading to website...")
do('python d:\util32\sendwxp.py %s' % destName) do('python c:\\utils\\sendwxp.py %s' % destName)
do('python d:\util32\sendwxp.py %s' % destZName) do('python c:\\utils\\sendwxp.py %s' % destZName)
do('python d:\util32\sendwxp.py %s' % destDName) do('python c:\\utils\\sendwxp.py %s' % destDName)
os.unlink(destName) os.unlink(destName)
os.unlink(destZName) os.unlink(destZName)

View File

@@ -1,5 +1,5 @@
run, e:\\Tools\\Wise\\WISE32.EXE wxPython.wse run, c:\\Tools\\Wise\\WISE32.EXE wxPython.wse
winwaitactive, wxPython.wse - Wise Installation System winwaitactive, wxPython.wse - Wise Installation System
send, !ic send, !ic
sleep, 1000 sleep, 1000

View File

@@ -56,9 +56,6 @@ wxPython/modules/html/*.c
wxPython/modules/html/*.h wxPython/modules/html/*.h
wxPython/modules/html/*.def wxPython/modules/html/*.def
wxPython/modules/html/*.rc wxPython/modules/html/*.rc
wxPython/modules/html/*.cpp
wxPython/modules/html/*.h
wxPython/modules/html/*.py
wxPython/modules/glcanvas/build.cfg wxPython/modules/glcanvas/build.cfg
wxPython/modules/glcanvas/*.i wxPython/modules/glcanvas/*.i
@@ -99,13 +96,9 @@ wxPython/modules/ogl/*.c
wxPython/modules/ogl/*.h wxPython/modules/ogl/*.h
wxPython/modules/ogl/*.def wxPython/modules/ogl/*.def
wxPython/modules/ogl/*.rc wxPython/modules/ogl/*.rc
wxPython/modules/ogl/*.cpp
wxPython/modules/ogl/*.h
wxPython/modules/ogl/*.py
wxPython/modules/ogl/contrib/include/wx/ogl/*.h wxPython/modules/ogl/contrib/include/wx/ogl/*.h
wxPython/modules/ogl/contrib/src/ogl/*.cpp wxPython/modules/ogl/contrib/src/ogl/*.cpp
wxPython/modules/stc/build.cfg wxPython/modules/stc/build.cfg
wxPython/modules/stc/*.txt wxPython/modules/stc/*.txt
wxPython/modules/stc/*.i wxPython/modules/stc/*.i

View File

@@ -17,7 +17,7 @@ item: Global
Patch Flags=0000000000001001 Patch Flags=0000000000001001
Patch Threshold=85 Patch Threshold=85
Patch Memory=4000 Patch Memory=4000
EXE Filename=wxPython-2.1.14.exe EXE Filename=wxPython-2.1.15.exe
FTP Cluster Size=20 FTP Cluster Size=20
Per-User Version ID=1 Per-User Version ID=1
Dialogs Version=6 Dialogs Version=6
@@ -25,7 +25,7 @@ item: Global
Variable Default1=C:\WINNT\System32 Variable Default1=C:\WINNT\System32
Variable Flags1=00001000 Variable Flags1=00001000
Variable Name2=_WISE_ Variable Name2=_WISE_
Variable Default2=E:\Tools\Wise Variable Default2=C:\Tools\Wise
Variable Flags2=00001000 Variable Flags2=00001000
Variable Name3=_ODBC16_ Variable Name3=_ODBC16_
Variable Default3=C:\WINNT\System32 Variable Default3=C:\WINNT\System32
@@ -191,7 +191,7 @@ end
item: End Block item: End Block
end end
item: Display Graphic item: Display Graphic
Pathname=e:\Projects\wx\utils\wxPython\distrib\wxPython.BMP Pathname=c:\Projects\wx\utils\wxPython\distrib\wxPython.BMP
X Position=32784 X Position=32784
Y Position=16 Y Position=16
Flags=0000001010000000 Flags=0000001010000000
@@ -805,156 +805,168 @@ end
item: Remark item: Remark
end end
item: Install File item: Install File
Source=d:\WINNT\System32\Msvcirt.dll Source=c:\WINNT\System32\Msvcirt.dll
Destination=%SYS%\Msvcirt.dll Destination=%SYS%\Msvcirt.dll
Flags=0000001010000011 Flags=0000001010000011
end end
item: Install File item: Install File
Source=d:\WINNT\System32\Msvcrt.dll Source=c:\WINNT\System32\Msvcrt.dll
Destination=%SYS%\Msvcrt.dll Destination=%SYS%\Msvcrt.dll
Flags=0000001010000011 Flags=0000001010000011
end end
item: Install File item: Install File
Source=e:\projects\wx\lib\wx21_14.dll Source=c:\projects\wx\lib\wx21_15.dll
Destination=%SYS%\wx21_14.dll Destination=%SYS%\wx21_15.dll
Flags=0000001010010010 Flags=0000001010010010
end end
item: Install File item: Install File
Source=e:\Projects\wx\utils\wxPython\*.py Source=c:\Projects\wx\utils\wxPython\*.py
Destination=%MAINDIR%\wxPython Destination=%MAINDIR%\wxPython
Description=wxPython shadow class modules Description=wxPython shadow class modules
Flags=0000000010000010 Flags=0000000010000010
end end
item: Install File item: Install File
Source=e:\Projects\wx\utils\wxPython\*.pyd Source=c:\Projects\wx\utils\wxPython\*.pyd
Destination=%MAINDIR%\wxPython Destination=%MAINDIR%\wxPython
Description=wxPython extension modules Description=wxPython extension modules
Flags=0000000010000010 Flags=0000000010000010
end end
item: Install File item: Install File
Source=e:\Projects\wx\utils\wxPython\*.txt Source=c:\Projects\wx\utils\wxPython\*.txt
Destination=%MAINDIR%\wxPython Destination=%MAINDIR%\wxPython
Description=README file Description=README file
Flags=0000000010000010 Flags=0000000010000010
end end
item: Install File item: Install File
Source=e:\Projects\wx\utils\wxPython\lib\*.py Source=c:\Projects\wx\utils\wxPython\lib\*.py
Destination=%MAINDIR%\wxPython\lib Destination=%MAINDIR%\wxPython\lib
Description=wxPython Standard Library Description=wxPython Standard Library
Flags=0000000010000010 Flags=0000000010000010
end end
item: Install File item: Install File
Source=e:\Projects\wx\utils\wxPython\lib\sizers\*.py Source=c:\Projects\wx\utils\wxPython\lib\sizers\*.py
Destination=%MAINDIR%\wxPython\lib\sizers Destination=%MAINDIR%\wxPython\lib\sizers
Description=wxPython Standard Library Description=wxPython Standard Library
Flags=0000000010000010 Flags=0000000010000010
end end
item: Install File item: Install File
Source=e:\Projects\wx\utils\wxPython\lib\editor\*.py Source=c:\Projects\wx\utils\wxPython\lib\editor\*.py
Destination=%MAINDIR%\wxPython\lib\editor Destination=%MAINDIR%\wxPython\lib\editor
Description=wxPython Standard Library Description=wxPython Standard Library
Flags=0000000010000010 Flags=0000000010000010
end end
item: Install File item: Install File
Source=e:\Projects\wx\utils\wxPython\demo\*.py Source=c:\Projects\wx\utils\wxPython\demo\*.py
Destination=%MAINDIR%\wxPython\demo Destination=%MAINDIR%\wxPython\demo
Description=Demos Description=Demos
Flags=0000000010000010 Flags=0000000010000010
end end
item: Install File item: Install File
Source=E:\Projects\wx\utils\wxPython\demo\README.txt Source=c:\Projects\wx\utils\wxPython\demo\README.txt
Destination=%MAINDIR%\wxPython\demo\README.txt Destination=%MAINDIR%\wxPython\demo\README.txt
Description=Demos Description=Demos
Flags=0000000010000010 Flags=0000000010000010
end end
item: Install File item: Install File
Source=e:\Projects\wx\utils\wxPython\demo\*.xml Source=c:\Projects\wx\utils\wxPython\demo\*.xml
Destination=%MAINDIR%\wxPython\demo Destination=%MAINDIR%\wxPython\demo
Description=Demos Description=Demos
Flags=0000000010000010 Flags=0000000010000010
end end
item: Install File item: Install File
Source=e:\Projects\wx\utils\wxPython\demo\bitmaps\*.bmp Source=c:\Projects\wx\utils\wxPython\demo\bitmaps\*.bmp
Destination=%MAINDIR%\wxPython\demo\bitmaps Destination=%MAINDIR%\wxPython\demo\bitmaps
Description=Demos Description=Demos
Flags=0000000010000010 Flags=0000000010000010
end end
item: Install File item: Install File
Source=e:\Projects\wx\utils\wxPython\demo\bitmaps\*.gif Source=c:\Projects\wx\utils\wxPython\demo\bitmaps\*.gif
Destination=%MAINDIR%\wxPython\demo\bitmaps Destination=%MAINDIR%\wxPython\demo\bitmaps
Description=Demos Description=Demos
Flags=0000000010000010 Flags=0000000010000010
end end
item: Install File item: Install File
Source=e:\Projects\wx\utils\wxPython\demo\bitmaps\*.jpg Source=c:\Projects\wx\utils\wxPython\demo\bitmaps\*.jpg
Destination=%MAINDIR%\wxPython\demo\bitmaps Destination=%MAINDIR%\wxPython\demo\bitmaps
Description=Demos Description=Demos
Flags=0000000010000010 Flags=0000000010000010
end end
item: Install File item: Install File
Source=e:\Projects\wx\utils\wxPython\demo\bitmaps\*.png Source=c:\Projects\wx\utils\wxPython\demo\bitmaps\*.png
Destination=%MAINDIR%\wxPython\demo\bitmaps Destination=%MAINDIR%\wxPython\demo\bitmaps
Description=Demos Description=Demos
Flags=0000000010000010 Flags=0000000010000010
end end
item: Install File item: Install File
Source=e:\Projects\wx\utils\wxPython\demo\bitmaps\*.ico Source=c:\Projects\wx\utils\wxPython\demo\bitmaps\*.ico
Destination=%MAINDIR%\wxPython\demo\bitmaps Destination=%MAINDIR%\wxPython\demo\bitmaps
Description=Demos Description=Demos
Flags=0000000010000010 Flags=0000000010000010
end end
item: Install File item: Install File
Source=e:\Projects\wx\utils\wxPython\demo\data\*.htm Source=c:\Projects\wx\utils\wxPython\demo\data\*.htm
Destination=%MAINDIR%\wxPython\demo\data Destination=%MAINDIR%\wxPython\demo\data
Description=Demos Description=Demos
Flags=0000000010000010 Flags=0000000010000010
end end
item: Install File item: Install File
Source=e:\Projects\wx\utils\wxPython\demo\data\*.png Source=c:\Projects\wx\utils\wxPython\demo\data\*.png
Destination=%MAINDIR%\wxPython\demo\data Destination=%MAINDIR%\wxPython\demo\data
Description=Demos Description=Demos
Flags=0000000010000010 Flags=0000000010000010
end end
item: Install File
Source=C:\PROJECTS\wx\utils\wxPython\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
Destination=%MAINDIR%\wxPython\demo\data\stc.h
Description=Demos
Flags=0000000010000010
end
item: Remark item: Remark
end end
item: Install File item: Install File
Source=E:\PROJECTS\wx\docs\html\wx\wx.chm Source=C:\PROJECTS\wx\docs\htmlhelp\wx.chm
Destination=%MAINDIR%\wxPython\docs\wx.chm Destination=%MAINDIR%\wxPython\docs\wx.chm
Description=wxPython documentation Description=wxPython documentation
Flags=0000000010000010 Flags=0000000010000010
end end
item: Install File item: Install File
Source=E:\PROJECTS\wx\docs\html\ogl\ogl.chm Source=c:\PROJECTS\wx\docs\html\ogl\ogl.chm
Destination=%MAINDIR%\wxPython\docs\ogl.chm Destination=%MAINDIR%\wxPython\docs\ogl.chm
Description=wxPython documentation Description=wxPython documentation
Flags=0000000010000010 Flags=0000000010000010
end end
item: Install File item: Install File
Source=E:\PROJECTS\wx\docs\preamble.txt Source=c:\PROJECTS\wx\docs\preamble.txt
Destination=%MAINDIR%\wxPython\docs\preamble.txt Destination=%MAINDIR%\wxPython\docs\preamble.txt
Description=wxPython documentation Description=wxPython documentation
Flags=0000000010000010 Flags=0000000010000010
end end
item: Install File item: Install File
Source=E:\PROJECTS\wx\docs\licence.txt Source=c:\PROJECTS\wx\docs\licence.txt
Destination=%MAINDIR%\wxPython\docs\licence.txt Destination=%MAINDIR%\wxPython\docs\licence.txt
Description=wxPython documentation Description=wxPython documentation
Flags=0000000010000010 Flags=0000000010000010
end end
item: Install File item: Install File
Source=E:\PROJECTS\wx\docs\licendoc.txt Source=c:\PROJECTS\wx\docs\licendoc.txt
Destination=%MAINDIR%\wxPython\docs\licendoc.txt Destination=%MAINDIR%\wxPython\docs\licendoc.txt
Description=wxPython documentation Description=wxPython documentation
Flags=0000000010000010 Flags=0000000010000010
end end
item: Install File item: Install File
Source=E:\PROJECTS\wx\docs\lgpl.txt Source=c:\PROJECTS\wx\docs\lgpl.txt
Destination=%MAINDIR%\wxPython\docs\lgpl.txt Destination=%MAINDIR%\wxPython\docs\lgpl.txt
Description=wxPython documentation Description=wxPython documentation
Flags=0000000010000010 Flags=0000000010000010
end end
item: Install File item: Install File
Source=E:\PROJECTS\wx\docs\gpl.txt Source=c:\PROJECTS\wx\docs\gpl.txt
Destination=%MAINDIR%\wxPython\docs\gpl.txt Destination=%MAINDIR%\wxPython\docs\gpl.txt
Description=wxPython documentation Description=wxPython documentation
Flags=0000000010000010 Flags=0000000010000010

View File

@@ -1 +1,5 @@
Makefile Makefile
Makefile
stc_c.exp
stc_c.ilk
stc_c.pch