Merged wxPython 2.2.2 over to the main branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2000-10-30 21:08:42 +00:00
parent 7874bf5430
commit c368d904fc
193 changed files with 21992 additions and 4366 deletions

View File

@@ -10,11 +10,21 @@ Another debugging feature is when the wxPython program exits, it will
print to stdout information about any wxWindows C++ objects that
havn't been properly cleaned up.
This archive contains a new wxWindows DLL named wx[version]d.dll that
should be copied to the windows system directory or some other
directory on the PATH.You will also find replacements for all of
wxPython's *.pyd files that are linked to use this DLL. Until I put
together a new installer, you'll need to copy things manually.
This archive contains a new wxWindows DLL named wx[version]d.dll and a
debugging version of the core wxPython module, wxc_d.pyd. These
should be put into your wxPython package directory. Also included are
the debuging version of Python, python_d.exe and python[VER]_d.dll
which can be put wherever you like.
In order to run the debugging version of wxPython sumply run you
program with python_d.exe instead of python.exe. This lets the
debugging version sit side by side with the production version, with
no need for swapping this around. You will also need _d versions of
any other extension modules you are using. If you need _d's for any
of the other standard Python extensions you can get them here, for 2.0
at least:
http://www.pythonlabs.com/products/python2.0/downloads/BeOpen-Python-2.0-Debug.zip
Robin

View File

@@ -7,8 +7,8 @@ cwd = os.getcwd()
logfile = 'c:\\temp\\autobuild.log'
WXDIR = os.environ['WXWIN']
dllVer = '22_0'
wxpVer = '2.2.0'
dllVer = '22_1'
wxpVer = '2.2.1'
dateSt = time.strftime("%Y%m%d", time.localtime(time.time()))
base = os.path.split(sys.argv[0])[0]
@@ -149,7 +149,7 @@ FINAL=1
logSeparator("Uploading to website...")
do('python c:\\utils\\sendwxp.py %s' % destName)
do('python c:\\utils\\sendwxp.py %s' % destZName)
#do('python c:\\utils\\sendwxp.py %s' % destZName)
do('python c:\\utils\\sendwxp.py %s' % destDName)

View File

@@ -1,860 +0,0 @@
#!/usr/bin/env python
#----------------------------------------------------------------------------
# Name: build.py
# Purpose: This script is used to build wxPython. It reads a build
# configuration file in the requested project directory and
# based on the contents of the file can build Makefiles for
# unix or win32, and can execute make with various options
# potentially automating the entire build/install/clean process
# from a single command.
#
# Author: Robin Dunn
#
# Created: 18-Aug-1999
# RCS-ID: $Id$
# Copyright: (c) 1999 by Total Control Software
# Licence: wxWindows license
#----------------------------------------------------------------------------
"""
build.py
This script is used to build wxPython. It reads a build configuration
file in the requested project directory and based on the contents of
the file can build Makefiles for unix or win32, and can execute make
with various options potentially automating the entire
build/install/clean process from a single command.
The default action is to build the Makefile and exit.
Options
-C dir CD to dir before doing anything
-B file Use file as the build configuration (default ./build.cfg)
-M file Use file as the name of the makefile to create
(default Makefile)
-b Build the module (runs make)
-i Install the module (runs make install)
-c Cleanup (runs make clean)
-u Uninstall (runs make uninstall)
-h Show help and exit
Configuration Files
The build configuration file lists targets, source files and options
for the the build process. The contents of the build.cfg are used to
dynamically generate the Makefile.
To prevent you from getting screwed when the default build.cfg is
updated, you can override the values in build.cfg by putting your
custom definitions in a file named build.local. You can also place a
build.local file in the parent directory, or even in the grandparent
directory for project-wide overrides. Finally, command-line arguments
of the form NAME=VALUE can also be used to override simple configuration
values. The order of evaluation is:
0. comman-line flags (-M, -b, etc.)
1. ./build.cfg
2. ../../build.local (if present)
3. ../build.local (if present)
4. ./build.local (if present)
5. command-line NAME=VALUEs
The config files are actually just Python files that get exec'ed in a
separate namespace which is then used later as a configuration object.
This keeps the build script simple in that it doesn't have to parse
anything, and the config files can be much more than just names and
values as pretty much any python code can be executed. The global
variables set in the config namespace are what are used later as
configuation values.
Configuration Options
The following variables can be set in the config files. Only a few are
required, the rest will either have suitable defaults or will be
calculated from your current Python runtime environment.
MODULE The name of the extension module to produce
SWIGFILES A list of files that should be run through SWIG
SWIGFLAGS Flags for SWIG
SOURCES Other C/C++ sources that should be part of the module
PYFILES Other Python files that should be installed with the module
CFLAGS Flags to be used by the compiler
LFLAGS Flags to be used at the link step
LIBS Libraries to be linked with
OTHERCFLAGS Extra flags to append to CFLAGS
OTHERLFLAGS Extra flags to append to LFLAGS
OTHERSWIGFLAGS Extra flags to append to SWIGFLAGS
OTHERLIBS Other libraries to be linked with, in addition to LIBS
OTHERTARGETS Other targets to be placed on the default rule line
OTHERINSTALLTARGETS
Other targets to be placed on the install rule line
OTHERDEFS Text to place near the begining of the Makefile
OTHERRULES This text is placed at the end of the makefile and
will typically be used for adding rules and such
DEFAULTRULE Text to be used for the default rule in the makefile
TARGETDIR Destination for the install step
MAKE The make program to use
MAKEFILE The name of the makefile
runBuild Setting this to 1 is eqivalent to the -b flag
runInstall Setting this to 1 is eqivalent to the -i flag
runClean Setting this to 1 is eqivalent to the -c flag
runUninstall Setting this to 1 is eqivalent to the -u flag
PYVERSION Version number of Python used in pathnames
PYPREFIX The root of the Python install
EXECPREFIX The root of the Python install for binary files
PYTHONLIB The Python link library
"""
import sys, os, string, getopt
#----------------------------------------------------------------------------
# This is really the wxPython version number, and will be placed in the
# Makefiles for use with the distribution related targets.
major_version = '2.2'
build_version = '0'
__version__ = major_version + '.' + build_version
#----------------------------------------------------------------------------
def main(args):
try:
opts, args = getopt.getopt(args[1:], 'C:B:M:bicu')
except getopt.error:
usage()
sys.exit(1)
if not os.environ.has_key('WXWIN'):
print "WARNING: WXWIN is not set in the environment. WXDIR may not\n"\
" be set properly in the makefile, you will have to \n"\
" set the environment variable or override in build.local."
bldCfg = 'build.cfg'
bldCfgLocal = 'build.local'
MAKEFILE = 'Makefile'
runBuild = 0
runInstall = 0
runClean = 0
runUninstall = 0
for flag, value in opts:
if flag == '-C': os.chdir(value)
elif flag == '-B': bldCfgFile = value
elif flag == '-M': makefile = value
elif flag == '-b': runBuild = 1
elif flag == '-c': runClean = 1
elif flag == '-i': runInstall = 1
elif flag == '-u': runUninstall = 1
elif flag == '-h': usage(); sys.exit(1)
else: usage(); sys.exit(1)
config = BuildConfig(bldCfg = bldCfg,
bldCfgLocal = bldCfgLocal,
MAKEFILE = MAKEFILE,
runBuild = runBuild,
runInstall = runInstall,
runClean = runClean,
runUninstall = runUninstall)
err = 0
if config.readConfigFiles(args):
config.doFixups()
config.makeMakefile()
if config.runBuild:
cmd = "%s -f %s" % (config.MAKE, config.MAKEFILE)
print "Running:", cmd
err = os.system(cmd)
if not err and config.runInstall:
cmd = "%s -f %s install" % (config.MAKE, config.MAKEFILE)
print "Running:", cmd
err = os.system(cmd)
if not err and config.runClean:
cmd = "%s -f %s clean" % (config.MAKE, config.MAKEFILE)
print "Running:", cmd
err = os.system(cmd)
if not err and config.runUninstall:
cmd = "%s -f %s uninstall" % (config.MAKE, config.MAKEFILE)
print "Running:", cmd
err = os.system(cmd)
return err/256
#----------------------------------------------------------------------------
def usage():
print __doc__
#----------------------------------------------------------------------------
def swapslash(st):
if sys.platform != 'win32':
st = string.join(string.split(st, '\\'), '/')
return st
#----------------------------------------------------------------------------
def splitlines(st):
return string.join(string.split(string.strip(st), ' '), ' \\\n\t')
#----------------------------------------------------------------------------
class BuildConfig:
def __init__(self, **kw):
self.__dict__.update(kw)
self.setDefaults()
#------------------------------------------------------------
def setDefaults(self):
base = os.path.split(sys.argv[0])[0]
base = os.path.join(base, '..')
self.WXPYDIR = os.path.abspath(base)
self.VERSION = __version__
self.MAJVER = major_version
self.BLDVER = build_version
self.MODULE = ''
self.SWIGFILES = []
self.SWIGFLAGS = '-c++ -shadow -python -keyword -dnone -I$(WXPSRCDIR)'
self.SOURCES = []
self.PYFILES = []
self.LFLAGS = ''
self.OTHERCFLAGS = ''
self.OTHERLFLAGS = ''
self.OTHERSWIGFLAGS = ''
self.OTHERLIBS = ''
self.OTHERTARGETS = ''
self.OTHERINSTALLTARGETS = ''
self.OTHERUNINSTALLTARGETS = ''
self.OTHERRULES = ''
self.DEFAULTRULE = 'default: $(GENCODEDIR) $(TARGET) $(BUILDDIR)/$(TARGET) bldpycfiles'
self.PYVERSION = sys.version[:3]
self.PYPREFIX = sys.prefix
self.EXECPREFIX = sys.exec_prefix
self.WXDIR = '$(WXWIN)'
self.FINAL = '0'
self.WXP_USE_THREAD = '1'
self.WXUSINGDLL = '1'
self.OTHERDEP = ''
self.WXPSRCDIR = '$(WXPYDIR)/src'
self.SWIGDEPS = ''
self.OTHERDEPS = ''
self.OTHERDEFS = ''
if sys.platform == 'win32':
self.MAKE = 'nmake'
self.PYTHONLIB = '$(PYPREFIX)\\libs\\python15.lib'
self.TARGETDIR = '$(PYPREFIX)\\wxPython'
self.LIBS = '$(PYTHONLIB) $(WXPSRCDIR)\wxc.lib'
self.GENCODEDIR = 'msw'
self.SWIGTOOLKITFLAG = '-D__WXMSW__'
self.OBJEXT = '.obj'
self.TARGET = '$(MODULE).pyd'
self.CFLAGS = '-I$(PYPREFIX)\include -I$(WXPSRCDIR) -I. /Fp$(MODULE).pch /YXhelpers.h -DSWIG_GLOBAL -DHAVE_CONFIG_H $(THREAD) '
self.LFLAGS = '$(DEBUGLFLAGS) /DLL /subsystem:windows,3.50 /machine:I386 /nologo'
self.RESFILE = ''
self.RESRULE = ''
self.OVERRIDEFLAGS = '/GX-'
self.RMCMD = '-erase '
self.WXPSRCDIR = os.path.normpath(self.WXPSRCDIR)
self.CRTFLAG = ''
else:
self.MAKE = 'make'
self.PYLIB = '$(EXECPREFIX)/lib/python$(PYVERSION)'
self.LIBPL = '$(PYLIB)/config'
self.PYTHONLIB = '$(LIBPL)/libpython$(PYVERSION).a'
self.TARGETDIR = '$(EXECPREFIX)/lib/python$(PYVERSION)/site-packages/wxPython'
self.TARGET = '$(MODULE)module$(SO)'
self.OBJEXT = '.o'
self.HELPERLIB = 'wxPyHelpers'
self.HELPERLIBDIR = '$(EXECPREFIX)/lib'
self.CFLAGS = '-DSWIG_GLOBAL -DHAVE_CONFIG_H $(THREAD) -I. '\
'`$(WXCONFIG) --cflags` -I$(PYINCLUDE) -I$(EXECINCLUDE) '\
'-I$(WXPSRCDIR)'
self.LFLAGS = '-L$(WXPSRCDIR) `$(WXCONFIG) --libs`'
self.RMCMD = '-rm -f '
self.WXCONFIG = 'wx-config'
self.USE_SONAME = '1'
# **** What to do when I start supporting Motif, etc.???
self.GENCODEDIR = 'gtk'
self.SWIGTOOLKITFLAG = '-D__WXGTK__'
# Extract a few things from Python's Makefile...
try:
filename = os.path.join(self.EXECPREFIX,
'lib/python'+self.PYVERSION,
'config/Makefile')
mfText = string.split(open(filename, 'r').read(), '\n')
except IOError:
raise SystemExit, "Python development files not found"
self.CCC = self.findMFValue(mfText, 'CCC')
self.CC = self.findMFValue(mfText, 'CC')
self.OPT = self.findMFValue(mfText, 'OPT')
self.SO = self.findMFValue(mfText, 'SO')
self.LDSHARED = self.findMFValue(mfText, 'LDSHARED')
self.CCSHARED = self.findMFValue(mfText, 'CCSHARED')
#self.LINKFORSHARED = self.findMFValue(mfText, 'LINKFORSHARED')
#self. = self.findMFValue(mfText, '')
#self. = self.findMFValue(mfText, '')
# The majority of cases will require LDSHARED to be
# modified to use the C++ driver instead of the C driver
# for linking. We'll try to do it here and if we goof up
# then the user can correct it in their build.local file.
self.LDSHARED = string.join(['$(CCC)'] +
string.split(self.LDSHARED, ' ')[1:],
' ')
#------------------------------------------------------------
def doFixups(self):
# This is called after the config files have been evaluated
# so we can do some sanity checking...
if sys.platform != 'win32':
if not self.CCC:
self.CCC = os.popen('%(WXCONFIG)s --cxx' % self.__dict__, 'r').read()[:-1]
if not self.CCC:
print "Warning: C++ compiler not specified (CCC). Assuming c++"
self.CCC = 'c++'
if not self.CC:
self.CCC = os.popen('%(WXCONFIG)s --cc' % self.__dict__, 'r').read()[:-1]
if not self.CC:
print "Warning: C compiler not specified (CC). Assuming cc"
self.CC = 'cc'
#------------------------------------------------------------
def findMFValue(self, mfText, st):
# Find line begining with st= and return the value
# Regex would probably be to cooler way to do this, but
# I think this is the most understandable.
for line in mfText:
if string.find(line, st+'=') == 0:
st = string.strip(line[len(st)+1:])
return st
return None
#------------------------------------------------------------
def makeMakefile(self):
# make a list of object file names
objects = ""
for name in self.SWIGFILES:
objects = objects + os.path.splitext(name)[0] + self.OBJEXT + ' '
for name in self.SOURCES:
obj = os.path.basename(name)
objects = objects + os.path.splitext(obj)[0] + self.OBJEXT + ' '
self.OBJECTS = splitlines(objects)
# now build the text for the dependencies
depends = ""
for name in self.SWIGFILES:
rootname = os.path.splitext(name)[0]
text = '$(GENCODEDIR)/%s.cpp $(GENCODEDIR)/%s.py : %s.i %s\n' \
'$(TARGETDIR)\\%s.py : $(GENCODEDIR)\\%s.py\n' \
'$(BUILDDIR)\\%s.py : $(GENCODEDIR)\\%s.py\n' % \
(rootname, rootname, rootname, self.SWIGDEPS,
rootname, rootname, rootname, rootname)
depends = depends + text
if self.OTHERDEPS:
text = '%s%s : %s\n' % \
(os.path.splitext(name)[0], self.OBJEXT, self.OTHERDEPS)
depends = depends + text
for name in self.PYFILES:
text = '$(TARGETDIR)\\%s.py : %s.py\n' % \
tuple([os.path.splitext(name)[0]] * 2)
depends = depends + text
if self.OTHERDEPS:
for name in self.SOURCES:
name = os.path.basename(name)
text = '%s%s : %s\n' % \
(os.path.splitext(name)[0], self.OBJEXT, self.OTHERDEPS)
depends = depends + text
self.DEPENDS = swapslash(depends)
# and the list of .py files
pymodules = ""
bldpymodules = ""
for name in self.SWIGFILES:
pymodules = pymodules + '$(TARGETDIR)\\%s.py ' % os.path.splitext(name)[0]
bldpymodules = bldpymodules + '$(BUILDDIR)\\%s.py ' % os.path.splitext(name)[0]
for name in self.PYFILES:
pymodules = pymodules + '$(TARGETDIR)\\%s.py ' % os.path.splitext(name)[0]
bldpymodules = bldpymodules + '$(BUILDDIR)\\%s.py ' % os.path.splitext(name)[0]
self.PYMODULES = splitlines(swapslash(pymodules))
self.BLDPYMODULES = splitlines(swapslash(bldpymodules))
# now make a list of the python files that would need cleaned up
pycleanup = ""
for name in self.SWIGFILES:
pycleanup = pycleanup + self.makeCleanupList(name)
for name in self.PYFILES:
pycleanup = pycleanup + self.makeCleanupList(name)
self.PYCLEANUP = swapslash(pycleanup)
# now make a list of the python files that would need uninstalled
pyUninstall = ""
for name in self.SWIGFILES:
pyUninstall = pyUninstall + self.makeUninstallList(name)
for name in self.PYFILES:
pyUninstall = pyUninstall + self.makeUninstallList(name)
self.PYUNINSTALL = swapslash(pyUninstall)
# finally, build the makefile
if sys.platform == 'win32':
if self.RESFILE:
self.RESFILE = '$(MODULE).res'
self.RESRULE = '$(MODULE).res : $(MODULE).rc $(WXDIR)\\include\\wx\\msw\\wx.rc\n\t'\
'$(rc) -r /i$(WXDIR)\\include -fo$@ $(MODULE).rc'
text = win32Template % self.__dict__
else:
text = unixTemplate % self.__dict__
f = open(self.MAKEFILE, 'w')
f.write(text)
f.close()
print "Makefile created: ", self.MAKEFILE
#------------------------------------------------------------
def makeUninstallList(self, name):
st = ""
st = st + '\t%s$(TARGETDIR)\\%s.py\n' % (self.RMCMD, os.path.splitext(name)[0])
st = st + '\t%s$(TARGETDIR)\\%s.pyc\n' % (self.RMCMD, os.path.splitext(name)[0])
st = st + '\t%s$(TARGETDIR)\\%s.pyo\n' % (self.RMCMD, os.path.splitext(name)[0])
return st
#------------------------------------------------------------
def makeCleanupList(self, name):
st = ""
st = st + '\t%s$(BUILDDIR)\\%s.py\n' % (self.RMCMD, os.path.splitext(name)[0])
st = st + '\t%s$(BUILDDIR)\\%s.pyc\n' % (self.RMCMD, os.path.splitext(name)[0])
st = st + '\t%s$(BUILDDIR)\\%s.pyo\n' % (self.RMCMD, os.path.splitext(name)[0])
return st
#------------------------------------------------------------
def readConfigFiles(self, args):
return self.processFile(self.bldCfg, 1) and \
self.processFile(os.path.join('../..', self.bldCfgLocal)) and \
self.processFile(os.path.join('..', self.bldCfgLocal)) and \
self.processFile(os.path.join('.', self.bldCfgLocal)) and \
self.processArgs(args)
#------------------------------------------------------------
def processFile(self, filename, required=0):
try:
text = open(filename, 'r').read()
except IOError:
if required:
print "Unable to open %s" % filename
return 0
else:
return 1
try:
exec(text, self.__dict__)
except:
print "Error evaluating %s" % filename
import traceback
traceback.print_exc()
return 0
return 1
#------------------------------------------------------------
def processArgs(self, args):
try:
for st in args:
pair = string.split(st, '=')
name = pair[0]
value = string.join(pair[1:], '=')
self.__dict__[name] = value
except:
print "Error parsing command-line: %s" % st
return 0
return 1
#------------------------------------------------------------
#----------------------------------------------------------------------------
#----------------------------------------------------------------------------
#----------------------------------------------------------------------------
win32Template = '''
#----------------------------------------------------------------------
# This makefile was autogenerated from build.py. Your changes will be
# lost if the generator is run again. You have been warned.
#----------------------------------------------------------------------
WXDIR = %(WXDIR)s
VERSION = %(VERSION)s
MAJVER = %(MAJVER)s
BLDVER = %(BLDVER)s
MODULE = %(MODULE)s
SWIGFLAGS = %(SWIGFLAGS)s %(SWIGTOOLKITFLAG)s %(OTHERSWIGFLAGS)s
CFLAGS = %(CFLAGS)s
LFLAGS = %(LFLAGS)s
PYVERSION = %(PYVERSION)s
PYPREFIX = %(PYPREFIX)s
EXECPREFIX = %(EXECPREFIX)s
PYTHONLIB = %(PYTHONLIB)s
FINAL = %(FINAL)s
WXP_USE_THREAD = %(WXP_USE_THREAD)s
WXUSINGDLL = %(WXUSINGDLL)s
GENCODEDIR = %(GENCODEDIR)s
RESFILE = %(RESFILE)s
WXPSRCDIR = %(WXPSRCDIR)s
%(OTHERDEFS)s
WXPYDIR = %(WXPYDIR)s
BUILDDIR = $(WXPYDIR)\\wxPython
TARGETDIR = %(TARGETDIR)s
OBJECTS = %(OBJECTS)s
PYMODULES = %(PYMODULES)s
BLDPYMODULES = %(BLDPYMODULES)s
TARGET = %(TARGET)s
!if "$(FINAL)" == "0"
DEBUGLFLAGS = /DEBUG /INCREMENTAL:YES
!else
DEBUGLFLAGS = /INCREMENTAL:NO
!endif
!if "$(WXP_USE_THREAD)" == "1"
THREAD=-DWXP_USE_THREAD=1
!endif
NOPCH=1
OVERRIDEFLAGS=%(OVERRIDEFLAGS)s
EXTRAFLAGS = $(CFLAGS) %(OTHERCFLAGS)s
LFLAGS = %(LFLAGS)s %(OTHERLFLAGS)s
EXTRALIBS = %(LIBS)s %(OTHERLIBS)s
CRTFLAG=%(CRTFLAG)s
#----------------------------------------------------------------------
!include $(WXDIR)\\src\\makevc.env
#----------------------------------------------------------------------
%(DEFAULTRULE)s %(OTHERTARGETS)s
install: default $(TARGETDIR) $(TARGETDIR)\\$(TARGET) pycfiles %(OTHERINSTALLTARGETS)s
clean:
-erase *.obj
-erase *.exe
-erase *.res
-erase *.map
-erase *.sbr
-erase *.pdb
-erase *.pch
-erase $(MODULE).exp
-erase $(MODULE).lib
-erase $(MODULE).ilk
-erase $(TARGET)
-erase $(BUILDDIR)\$(TARGET)
%(PYCLEANUP)s
uninstall: %(OTHERUNINSTALLTARGETS)s
-erase $(TARGETDIR)\\$(TARGET)
%(PYUNINSTALL)s
#----------------------------------------------------------------------
# implicit rule for compiling .cpp and .c files
{}.cpp{}.obj:
$(cc) @<<
$(CPPFLAGS) /c /Tp $<
<<
{$(GENCODEDIR)}.cpp{}.obj:
$(cc) @<<
$(CPPFLAGS) /c /Tp $<
<<
{}.c{}.obj:
$(cc) @<<
$(CPPFLAGS) /c $<
<<
.SUFFIXES : .i .py
# Implicit rules to run SWIG
{}.i{$(GENCODEDIR)}.cpp:
swig $(SWIGFLAGS) -c -o $@ $<
{}.i{$(GENCODEDIR)}.py:
swig $(SWIGFLAGS) -c -o $(GENCODEDIR)\\tmp_wrap.cpp $<
-erase $(GENCODEDIR)\\tmp_wrap.cpp
{$(GENCODEDIR)}.py{$(TARGETDIR)}.py:
copy $< $@
{}.py{$(TARGETDIR)}.py:
copy $< $@
{$(GENCODEDIR)}.py{$(BUILDDIR)}.py:
copy $< $@
{}.py{$(BUILDDIR)}.py:
copy $< $@
#----------------------------------------------------------------------
$(TARGET) : $(DUMMYOBJ) $(WXLIB) $(OBJECTS) $(RESFILE)
$(link) @<<
/out:$@
$(LFLAGS) /export:init$(MODULE) /implib:./$(MODULE).lib
$(DUMMYOBJ) $(OBJECTS) $(RESFILE)
$(LIBS)
<<
%(RESRULE)s
$(TARGETDIR)\\$(TARGET) : $(TARGET)
copy $(TARGET) $@
$(BUILDDIR)\\$(TARGET) : $(TARGET)
copy $(TARGET) $@
pycfiles : $(PYMODULES)
$(EXECPREFIX)\\python $(PYPREFIX)\\Lib\\compileall.py -l $(TARGETDIR)
$(EXECPREFIX)\\python -O $(PYPREFIX)\Lib\\compileall.py -l $(TARGETDIR)
bldpycfiles : $(BLDPYMODULES)
$(TARGETDIR) :
mkdir $(TARGETDIR)
$(GENCODEDIR):
mkdir $(GENCODEDIR)
#----------------------------------------------------------------------
%(DEPENDS)s
#----------------------------------------------------------------------
showflags:
@echo CPPFLAGS:
@echo $(CPPFLAGS)
@echo LFLAGS:
@echo $(LFLAGS)
@echo BUILDDIR:
@echo $(BUILDDIR)
%(OTHERRULES)s
'''
#----------------------------------------------------------------------------
#----------------------------------------------------------------------------
#----------------------------------------------------------------------------
unixTemplate = '''
#----------------------------------------------------------------------
# This makefile was autogenerated from build.py. Your changes will be
# lost if the generator is run again. You have been warned.
#----------------------------------------------------------------------
WXDIR = %(WXDIR)s
VERSION = %(VERSION)s
MAJVER = %(MAJVER)s
BLDVER = %(BLDVER)s
MODULE = %(MODULE)s
SWIGFLAGS = %(SWIGFLAGS)s %(SWIGTOOLKITFLAG)s %(OTHERSWIGFLAGS)s
CFLAGS = %(CFLAGS)s $(OPT) %(OTHERCFLAGS)s
LFLAGS = %(LFLAGS)s %(OTHERLFLAGS)s
PYVERSION = %(PYVERSION)s
PYPREFIX = %(PYPREFIX)s
EXECPREFIX = %(EXECPREFIX)s
PYINCLUDE = $(PYPREFIX)/include/python$(PYVERSION)
EXECINCLUDE = $(EXECPREFIX)/include/python$(PYVERSION)
PYLIB = %(PYLIB)s
LIBPL = %(LIBPL)s
PYTHONLIB = %(PYTHONLIB)s
FINAL = %(FINAL)s
WXP_USE_THREAD = %(WXP_USE_THREAD)s
GENCODEDIR = %(GENCODEDIR)s
WXPSRCDIR = %(WXPSRCDIR)s
HELPERLIB = %(HELPERLIB)s
HELPERLIBDIR = %(HELPERLIBDIR)s
WXCONFIG=%(WXCONFIG)s
WXPYDIR = %(WXPYDIR)s
BUILDDIR = $(WXPYDIR)/wxPython
TARGETDIR = %(TARGETDIR)s
%(OTHERDEFS)s
CCC = %(CCC)s
CC = %(CC)s
OPT = %(OPT)s
SO = %(SO)s
LDSHARED = %(LDSHARED)s
CCSHARED = %(CCSHARED)s
OBJECTS = %(OBJECTS)s
PYMODULES = %(PYMODULES)s
BLDPYMODULES = %(BLDPYMODULES)s
TARGET = %(TARGET)s
ifeq ($(WXP_USE_THREAD), 1)
THREAD=-DWXP_USE_THREAD
endif
USE_SONAME = %(USE_SONAME)s
ifeq ($(USE_SONAME), 1)
LIBS = -l$(HELPERLIB) %(OTHERLIBS)s
else
LIBS = $(WXPSRCDIR)/lib$(HELPERLIB)$(SO) %(OTHERLIBS)s
endif
#----------------------------------------------------------------------
%(DEFAULTRULE)s %(OTHERTARGETS)s
install: default $(TARGETDIR) $(TARGETDIR)/$(TARGET) pycfiles %(OTHERINSTALLTARGETS)s
clean:
-rm -f *.o *$(SO) *$(SO).* *~
-rm -f $(TARGET)
-rm -f $(BUILDDIR)/$(TARGET)
%(PYCLEANUP)s
uninstall: %(OTHERUNINSTALLTARGETS)s
-rm -f $(TARGETDIR)/$(TARGET)
%(PYUNINSTALL)s
#----------------------------------------------------------------------
%%.o : %%.cpp
$(CCC) $(CCSHARED) $(CFLAGS) $(OTHERCFLAGS) -c $<
%%.o : $(GENCODEDIR)/%%.cpp
$(CCC) $(CCSHARED) $(CFLAGS) $(OTHERCFLAGS) -c $<
%%.o : %%.c
$(CC) $(CCSHARED) $(CFLAGS) $(OTHERCFLAGS) -c $<
%%.o : $(GENCODEDIR)/%%.c
$(CC) $(CCSHARED) $(CFLAGS) $(OTHERCFLAGS) -c $<
ifndef NOSWIG
$(GENCODEDIR)/%%.cpp : %%.i
swig $(SWIGFLAGS) -c -o $@ $<
$(GENCODEDIR)/%%.py : %%.i
swig $(SWIGFLAGS) -c -o $(GENCODEDIR)/tmp_wrap.cpp $<
rm $(GENCODEDIR)/tmp_wrap.cpp
endif
$(TARGETDIR)/%% : %%
cp -f $< $@
$(TARGETDIR)/%% : $(GENCODEDIR)/%%
cp -f $< $@
$(BUILDDIR)/%% : %%
cp -f $< $@
$(BUILDDIR)/%% : $(GENCODEDIR)/%%
cp -f $< $@
#----------------------------------------------------------------------
%(DEPENDS)s
#----------------------------------------------------------------------
$(TARGET) : $(OBJECTS)
$(LDSHARED) $(OBJECTS) $(LFLAGS) $(LIBS) $(OTHERLIBS) -o $(TARGET)
pycfiles : $(PYMODULES)
$(EXECPREFIX)/bin/python $(PYLIB)/compileall.py -l $(TARGETDIR)
$(EXECPREFIX)/bin/python -O $(PYLIB)/compileall.py -l $(TARGETDIR)
bldpycfiles : $(BLDPYMODULES)
$(TARGETDIR) :
mkdir -p $(TARGETDIR)
$(GENCODEDIR):
mkdir $(GENCODEDIR)
#----------------------------------------------------------------------
%(OTHERRULES)s
'''
#----------------------------------------------------------------------------
if __name__ == '__main__':
err = main(sys.argv)
sys.exit(err)
#----------------------------------------------------------------------------

View File

@@ -2,13 +2,32 @@
rem Builds a zip containing debugging versions of wxWindows and wxPython
rem that could be unziped over a wxPython installation.
setlocal
iff "%1" == "15" then
set PCBUILD=c:\projects\Python-1.5.2\PCBuild
elseiff "%1" == "20" then
set PCBUILD=c:\projects\Python-2.0\PCBuild
else
echo Specivy Python version!!!
goto end
endiff
iff "%2" == "" then
echo Specify wxPython version!!!
goto end
endiff
mkdir wxPython-dbg
copy README.dbg.txt wxPython-dbg
copy %WXWIN%\lib\wx*d.dll wxPython-dbg
copy %WXWIN%\wxPython\wxPython\*.pyd wxPython-dbg
copy %WXWIN%\wxPython\wxPython\*_d.pyd wxPython-dbg
copy %PCBUILD%\python_d.exe wxPython-dbg
copy %PCBUILD%\python%1_d.dll wxPython-dbg
zip -r wxPython-dbg-%1.zip wxPython-dbg
zip -r wxPython-dbg-%2-Py%1.zip wxPython-dbg
del /sx wxPython-dbg
:end

36
wxPython/distrib/makedemo Executable file
View File

@@ -0,0 +1,36 @@
#!/bin/bash
#----------------------------------------------------------------------
if [ -z $1 ]; then
echo "Please specify a version number on the command line."
exit 1
fi
if [ ! -d wxPython ]; then
echo "Please run this script from the root wxPython directory."
exit 1
fi
mkdir _distrib_tgz
mkdir _distrib_tgz/wxPython-$1
cp -R demo _distrib_tgz/wxPython-$1
# do some cleanup
rm -rf `find _distrib_tgz/wxPython-$1 -name CVS`
rm -f `find _distrib_tgz/wxPython-$1 -name "*.pyc"`
rm -f `find _distrib_tgz/wxPython-$1 -name .cvsignore`
rm -f _distrib_tgz/wxPython-$1/demo/core
rm -rf _distrib_tgz/wxPython-$1/demo/wxPython
cd _distrib_tgz
tar cvf ../dist/wxPython-demo-$1.tar wxPython-$1
gzip ../dist/wxPython-demo-$1.tar
cd ..
rm -r _distrib_tgz

Binary file not shown.

View File

@@ -10,6 +10,7 @@ demo/README.txt
demo/*.xml
demo/data/*.png
demo/data/*.htm
demo/data/*.html
demo/data/*.bmp
demo/data/*.txt
demo/data/*.i
@@ -91,7 +92,10 @@ 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/*.txt
contrib/stc/contrib/src/stc/*.py
contrib/stc/contrib/src/stc/scintilla/include/*.h
contrib/stc/contrib/src/stc/scintilla/include/*.iface
contrib/stc/contrib/src/stc/scintilla/src/*.h
contrib/stc/contrib/src/stc/scintilla/src/*.cxx

View File

@@ -1,101 +0,0 @@
%define pref /usr
%define ver 2.2.0
%define rpmver 0
Summary: Cross platform GUI toolkit for use with the Python language.
Name: wxPython
Version: %{ver}
Release: %{rpmver}
Copyright: wxWindows License
Group: Development/Languages/Python
Source: wxPython-%{ver}.tar.gz
Packager: Robin Dunn <robin@alldunn.com>
URL:http://alldunn.com/wxPython/index.html
Vendor: Total Control Software
Requires: python >= 1.5.2
##BuildRoot: /tmp/wxPython-build
##Prefix: /usr/lib/python1.5/site-packages
Prefix: %{pref}
%description
wxPython is a GUI toolkit for Python that is a wrapper around the
wxWindows C++ GUI library. wxPython provides a large variety of
window types and controls, all imlemented with a native look and
feel (and runtime speed) on the platforms it is supported on.
%package gl
Summary: Cross platform GUI toolkit for use with the Python language, OpenGL addon.
Group: Development/Languages/Python
Requires: wxPython
%description gl
OpenGL add on for wxPython.
#----------------------------------------------------------------------
%prep
%setup
%build
NOSWIG=1
export NOSWIG
cd src
python ../distrib/build.py -b WXPSRCDIR=$PWD USE_SONAME=1
cd ../contrib/ogl
python ../../distrib/build.py -b WXPSRCDIR=../../src USE_SONAME=1
cd ../stc
python ../../distrib/build.py -b WXPSRCDIR=../../src USE_SONAME=1
if [ -z $NOGLCANVAS ]; then
cd ../glcanvas
python ../../distrib/build.py -b WXPSRCDIR=../../src USE_SONAME=1
fi
#----------------------------------------------------------------------
%install
NOSWIG=1
export NOSWIG
cd src
python ../distrib/build.py -i
cd ../contrib/ogl
python ../../distrib/build.py -i
cd ../stc
python ../../distrib/build.py -i
if [ -z $NOGLCANVAS ]; then
cd ../glcanvas
python ../../distrib/build.py -i
fi
#----------------------------------------------------------------------
%post
/sbin/ldconfig
%postun
/sbin/ldconfig
#----------------------------------------------------------------------
%files
%doc BUILD.txt CHANGES.txt README.txt gpl.txt lgpl.txt licence.txt licendoc.txt preamble.txt
%{pref}/lib/libwxPyHelpers*
%{pref}/lib/python1.5/site-packages/wxPython/*.py
%{pref}/lib/python1.5/site-packages/wxPython/*.py?
%{pref}/lib/python1.5/site-packages/wxPython/lib
%{pref}/lib/python1.5/site-packages/wxPython/demo
%{pref}/lib/python1.5/site-packages/wxPython/wxcmodule.so
%{pref}/lib/python1.5/site-packages/wxPython/oglcmodule.so
%{pref}/lib/python1.5/site-packages/wxPython/stc_cmodule.so
%files gl
%{pref}/lib/python1.5/site-packages/wxPython/glcanvascmodule.so

View File

@@ -17,7 +17,7 @@ item: Global
Patch Flags=0000000000001001
Patch Threshold=85
Patch Memory=4000
EXE Filename=wxPython-2.2.0.exe
EXE Filename=wxPython-2.2.2.exe
FTP Cluster Size=20
Per-User Version ID=1
Dialogs Version=6
@@ -72,40 +72,37 @@ item: Set Variable
Value=wxPython
Flags=10000000
end
item: Set Variable
Variable=DLLVER
Value=wx21_16
end
item: Check Configuration
Flags=10111011
end
item: Remark
Text= 1.5 and 1.5.1 have a CurrentVersion key
end
item: Get Registry Key Value
Variable=PYTHONVER
Key=SOFTWARE\Python\PythonCore\CurrentVersion
Default=None
Flags=00000100
end
item: If/While Statement
Variable=PYTHONVER
Value=None
end
item: Remark
Text= Just try 1.5 since 1.5.2b2 doesn't set CurrentVersion but uses 1.5
end
item: Set Variable
Variable=PYTHONVER
Value=1.5
Value=2.0
end
item: End Block
item: Set Variable
Variable=SAMEDIR
Value=1
end
item: Remark
end
item: Get Registry Key Value
Variable=PYTHONDIR
Key=SOFTWARE\Python\PythonCore\%PYTHONVER%\InstallPath
Flags=00000100
end
remarked item: If/While Statement
Variable=PYTHONDIR
Value=None
end
remarked item: Get Registry Key Value
Variable=PYTHONDIR
Key=SOFTWARE\Python\PythonCore\%PYTHONVER%\InstallPath
Flags=00000010
end
remarked item: End Block
end
item: If/While Statement
Variable=PYTHONDIR
Value=None
@@ -123,6 +120,8 @@ item: Set Variable
Variable=MAINDIR
Value=%PYTHONDIR%
end
item: Remark
end
item: Set Variable
Variable=EXPLORER
Value=1
@@ -818,11 +817,24 @@ item: Install File
Destination=%SYS%\Msvcrt.dll
Flags=0000001010000011
end
item: If/While Statement
Variable=SAMEDIR
Value=0
end
item: Install File
Source=c:\projects\wx\lib\wx22_0.dll
Destination=%SYS%\wx22_0.dll
Source=c:\projects\wx\lib\wx22_2.dll
Destination=%SYS%\wx22_2.dll
Flags=0000001010010010
end
item: Else Statement
end
item: Install File
Source=c:\projects\wx\lib\wx22_2.dll
Destination=%MAINDIR%\wxPython\wx22_2.dll
Flags=0000000010010010
end
item: End Block
end
item: Install File
Source=c:\Projects\wx\wxPython\wxPython\*.py
Destination=%MAINDIR%\wxPython
@@ -848,13 +860,13 @@ item: Install File
Flags=0000000010000010
end
item: Install File
Source=c:\Projects\wx\wxPython\wxPython\lib\sizers\*.py
Destination=%MAINDIR%\wxPython\lib\sizers
Source=c:\Projects\wx\wxPython\wxPython\lib\editor\*.py
Destination=%MAINDIR%\wxPython\lib\editor
Description=wxPython Standard Library
Flags=0000000010000010
end
item: Install File
Source=c:\Projects\wx\wxPython\wxPython\lib\editor\*.py
Source=c:\Projects\wx\wxPython\wxPython\lib\editor\*.txt
Destination=%MAINDIR%\wxPython\lib\editor
Description=wxPython Standard Library
Flags=0000000010000010
@@ -913,6 +925,18 @@ item: Install File
Description=Demos
Flags=0000000010000010
end
item: Install File
Source=c:\Projects\wx\wxPython\demo\data\*.htm
Destination=%MAINDIR%\wxPython\demo\data
Description=Demos
Flags=0000000010000010
end
item: Install File
Source=c:\Projects\wx\wxPython\demo\data\*.py
Destination=%MAINDIR%\wxPython\demo\data
Description=Demos
Flags=0000000010000010
end
item: Install File
Source=c:\Projects\wx\wxPython\demo\data\*.png
Destination=%MAINDIR%\wxPython\demo\data
@@ -937,14 +961,16 @@ item: Install File
Description=Demos
Flags=0000000010000010
end
item: Remark
end
item: Install File
Source=C:\PROJECTS\wx\wxPython\README.txt
Destination=%MAINDIR%\wxPython\README.txt
Source=C:\PROJECTS\wx\wxPython\*.txt
Destination=%MAINDIR%\wxPython\docs\
Flags=0000000010000010
end
item: Install File
Source=C:\PROJECTS\wx\wxPython\CHANGES.txt
Destination=%MAINDIR%\wxPython\CHANGES.txt
Source=C:\PROJECTS\wx\wxPython\licence\*.txt
Destination=%MAINDIR%\wxPython\docs\licence\
Flags=0000000010000010
end
item: Remark
@@ -961,36 +987,6 @@ item: Install File
Description=wxPython documentation
Flags=0000000010000010
end
item: Install File
Source=c:\PROJECTS\wx\docs\preamble.txt
Destination=%MAINDIR%\wxPython\docs\preamble.txt
Description=wxPython documentation
Flags=0000000010000010
end
item: Install File
Source=c:\PROJECTS\wx\docs\licence.txt
Destination=%MAINDIR%\wxPython\docs\licence.txt
Description=wxPython documentation
Flags=0000000010000010
end
item: Install File
Source=c:\PROJECTS\wx\docs\licendoc.txt
Destination=%MAINDIR%\wxPython\docs\licendoc.txt
Description=wxPython documentation
Flags=0000000010000010
end
item: Install File
Source=c:\PROJECTS\wx\docs\lgpl.txt
Destination=%MAINDIR%\wxPython\docs\lgpl.txt
Description=wxPython documentation
Flags=0000000010000010
end
item: Install File
Source=c:\PROJECTS\wx\docs\gpl.txt
Destination=%MAINDIR%\wxPython\docs\gpl.txt
Description=wxPython documentation
Flags=0000000010000010
end
item: Remark
end
item: Remark
@@ -1165,21 +1161,21 @@ item: Create Shortcut
Flags=00000001
end
item: Create Shortcut
Source=%MAINDIR%\wxPython\docs\licence.txt
Source=%MAINDIR%\wxPython\docs\licence\licence.txt
Destination=%CGROUPDIR%\%CGROUP_SAVE%\License.lnk
Icon Number=0
Key Type=1536
Flags=00000001
end
item: Create Shortcut
Source=%MAINDIR%\wxPython\README.txt
Source=%MAINDIR%\wxPython\docs\README.txt
Destination=%CGROUPDIR%\%CGROUP_SAVE%\ReadMe.lnk
Icon Number=0
Key Type=1536
Flags=00000001
end
item: Create Shortcut
Source=%MAINDIR%\wxPython\CHANGES.txt
Source=%MAINDIR%\wxPython\docs\CHANGES.txt
Destination=%CGROUPDIR%\%CGROUP_SAVE%\Changes.lnk
Icon Number=0
Key Type=1536
@@ -1214,7 +1210,7 @@ end
item: Self-Register OCXs/DLLs
Description=Updating System Configuration, Please Wait...
end
item: Edit Registry
remarked item: Edit Registry
Total Keys=1
Key=SOFTWARE\Python\PythonCore\%PYTHONVER%\PythonPath\wxPython
New Value=%MAINDIR%
@@ -1359,7 +1355,7 @@ item: Custom Dialog Set
end
item: Push Button
Rectangle=90 68 153 82
Alternate=0%MAINDIR%\wxPython\README.txt
Alternate=0%MAINDIR%\wxPython\docs\README.txt
Action=6
Enabled Color=00000000000000001111111111111111
Create Flags=01010000000000010000000000000000

View File

@@ -4,24 +4,25 @@ rem **** Make a directory to build up a distribution tree
md _distrib_zip
md _distrib_zip\wxPython-%1
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
REM rem **** Copy the license files
REM copy %WXWIN%\docs\gpl.txt _distrib_zip\wxPython-%1
REM copy %WXWIN%\docs\lgpl.txt _distrib_zip\wxPython-%1
REM copy %WXWIN%\docs\licence.txt _distrib_zip\wxPython-%1
REM copy %WXWIN%\docs\licendoc.txt _distrib_zip\wxPython-%1
REM copy %WXWIN%\docs\preamble.txt _distrib_zip\wxPython-%1
rem **** Make a zip fron the live files
zip -@ -r _distrib_zip\temp.zip < distrib\wxPython.rsp
REM rem **** Make a zip fron the live files
REM zip -@ -r _distrib_zip\temp.zip < distrib\wxPython.rsp
rem **** Unzip it in our build dir
cd _distrib_zip\wxPython-%1
unzip ..\temp.zip
REM rem **** Unzip it in our build dir
REM cd _distrib_zip\wxPython-%1
REM unzip ..\temp.zip
rem **** zip up the build dir
cd ..
zip -r ..\distrib\wxPython-src-%1.zip wxPython-%1
REM rem **** zip up the build dir
REM cd ..
REM zip -r ..\distrib\wxPython-src-%1.zip wxPython-%1
cd _distrib_zip
rem **** copy the docs into the tree
md wxPython-%1\docs
@@ -35,7 +36,9 @@ copy %WXWIN%\docs\html\ogl\*.htm wxPython-%1\docs\ogl
copy wxPython-%1\docs\ogl\ogl.htm wxPython-%1\docs\ogl\index.htm
rem **** zip up the docs
zip -r ..\distrib\wxPython-docs-%1.zip wxPython-%1\docs
rem zip -r ..\distrib\wxPython-docs-%1.zip wxPython-%1\docs
tar cvf ..\distrib\wxPython-docs-%1.tar wxPython-%1
gzip -9 ..\distrib\wxPython-docs-%1.tar
rem **** Cleanup