diff --git a/wxPython/BUILD.txt b/wxPython/BUILD.txt deleted file mode 100644 index d0fb2568a1..0000000000 --- a/wxPython/BUILD.txt +++ /dev/null @@ -1,169 +0,0 @@ -Build Instructions ------------------- -I used SWIG (http://www.swig.org) to create the source code for the -extension module. This enabled me to only have to deal with a small -amount of code and only have to bother with the exceptional issues. -SWIG takes care of the rest and generates all the repetative code for -me. You don't need SWIG to build the extension module as all the -generated C++ code is included under the src directory. - -I added a few minor features to SWIG to control some of the code -generation. If you want to play around with this you will need to get -a recent version of SWIG from their CVS or from a daily build. See -http://www.swig.org/ for details. - -wxPython is organized as a Python package. This means that the -directory containing the results of the build process should be a -subdirectory of a directory on the PYTHONPATH. (And preferably should -be named wxPython.) You can control where the build process will dump -wxPython by setting the TARGETDIR variable for the build utility, (see -below.) - - - -1. Build and install wxWindows as described in its BuildCVS.txt or - INSTALL.txt file. - -1a. Building wxWindows on Unix/Linux/Etc. - - For *nix systems I run configure with these flags: - - --with-gtk - --with-libjpeg - --with-opengl - --without-odbc - --enable-unicode=no - --enable-threads=yes - --enable-socket=yes - --enable-static=no - --enable-shared=yes - --disable-std_iostreams - --enable-newgrid - - You can use whatever flags you want, but these work for me. If you - want debug libraries, then you should add the "--enable-debug - --enable-mem_tracing" flags. I reccommend creating an empty build - directory, and then running make and configure from there. This - makes it easy to experiment with different configure options - without losing old builds. - - Be sure to run "make install" to install the wxWindows headers and - shared library. You can check where the wxPython build will expect - to find them by running "wx-config --cflags" and "wx-config --libs" - - -1b. Building wxWindows on Win32. - - For Win32 systems I use Visual C++ 6.0, but 5.0 should work. The - wxPython build utility currently does not support any other win32 - compilers. Be sure to copy include/wx/msw/setup0.h to - include/wx/msw/setup.h and edit it for the options you want. At a - minimum you should set the following: - - wxUSE_NEW_GRID 1 - wxUSE_GLOBAL_MEMORY_OPERATORS 0 - wxUSE_LIBTIFF 1 - wxUSE_GLCANVAS 1 - wxDIALOG_UNIT_COMPATIBILITY 0 - - I also change these: - - wxUSE_DIALUP_MANAGER 0 - wxUSE_DYNLIB_CLASS 0 - wxUSE_DOC_VIEW_ARCHITECTURE 0 - wxUSE_MDI_ARCHITECTURE 0 - wxUSE_PLOT 0 - wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0 - - - There are probably other flags that can be disabled to remove - things not being used in wxPython, but I havn't investigated all - the potential configurations yet. - - I find it easiest to build wxWindows using the makefiles, that way - I don't have to worry about what the IDE might be doing behind the - scenes that might screw things up. Simply go to the src/msw - directory and run: - - nmake -f makefile.vc CRTFLAG=/MD EXTRAFLAGS=-D__NO_VC_CRTDBG__ dll pch - - If you want to make a release build, add FINAL=1 to the nmake - command, as well as to build.local for wxPython, (see below.) - - -2. For the win32 platform you should be sure to set an environment - variable named WXWIN to be the path to the top of the wxWindows - source tree. - - -3. If you are working from a copy of the code retrieved from CVS, then - you will find wxPython in $WXWIN/wxPython. If you are working from - the tar.gz or .zip files then you will probably want to unpack - wxPython in the $WXWIN directory and rename the new directory to - wxPython (or use a symlink.) If you want to keep it in a separate - directory then you can change where the build.py tool expects to - find it by creating a file named build.local (see step 7 for more - examples about build.local,) containing something like this: - - WXPSRCDIR = "~/MyStuff/wxPython-2.1.15/src" - - If your wxPython sources are not under $WXWIN then you'll need to - adjust the remainder of these instructions accordingly. - - -4. At this point you may want to make an alias, symlink, script, - batch file, or whatever on the PATH that invokes - $WXWIN/wxPython/distrib/build.py to help simplify matters somewhat. - For example, on my win32 system I have a file named build.bat in a - directory on the PATH that contains: - - python %WXWIN%/wxPython/distrib/build.py %1 %2 %3 %4 %5 %6 - - -5. Change into the $(WXWIN)/wxPython/src directory. - - -6. If you don't use SWIG, or don't have a new enough version - installed, you may have to update the timestamps of the files it - generates so the make utility won't think they are out of date and - try to run SWIG to update them. The standard touch utility can do - this for you: - - touch gtk/*.cpp gtk/*.py - or - touch msw\*.cpp msw\*.py - - -7. Type "build -b" to build wxPython and "build -i" to install it. - - The build.py script actually generates a Makefile based on what it - finds on your system and information found in the build.cfg file. - If you have troubles building or you want it built or installed in - a different way, take a look at the doc-string in build.py. You may - be able to override configuration options in a file named - build.local. For example, you can set a new TARGETDIR (the - installation directory) just by creating a file named build.local - in your wxPython source directory and assign a value to it, like - this: - - TARGETDIR = "/usr/local/lib/python1.5/site-packages/wxPython" - - The build.local file is executed as Python code so you can do very - creative things there if you need to. - - -8. To build and install the add-on modules, change to the appropriate - directory under $WXWIN/wxPython/contrib and run the build utility - again. - - -9. Change to the $WXWIN/wxPython/demo directory. - - -10. Try executing the demo program. For example: - - python demo.py - - To run it without requiring a console on win32, you can use the - pythonw.exe version of Python either from the command line or from - a shortcut. diff --git a/wxPython/buildall b/wxPython/buildall deleted file mode 100755 index 8dc24f4aa3..0000000000 --- a/wxPython/buildall +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -cd src -python ../distrib/build.py $* -if [ "$?" != "0" ]; then - exit 1 -fi - -cd ../contrib -python buildall.py $* -cd .. - diff --git a/wxPython/buildall.bat b/wxPython/buildall.bat deleted file mode 100755 index 353b28901b..0000000000 --- a/wxPython/buildall.bat +++ /dev/null @@ -1,10 +0,0 @@ - -cd src -python ..\distrib\build.py %1 %2 %3 %4 %5 %6 %7 %8 %9 - -cd ..\contrib -python .\buildall.py %1 %2 %3 %4 %5 %6 %7 %8 %9 - - -cd .. - diff --git a/wxPython/contrib/buildall.py b/wxPython/contrib/buildall.py deleted file mode 100755 index 561f3bbac1..0000000000 --- a/wxPython/contrib/buildall.py +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env python -#---------------------------------------------------------------------------- -# Name: buildall.py -# Purpose: Invokes the build script for all modules defined in -# MODULELIST -# -# Author: Robin Dunn -# -# Created: 18-Aug-1999 -# RCS-ID: $Id$ -# Copyright: (c) 1999 by Total Control Software -# Licence: wxWindows license -#---------------------------------------------------------------------------- - -import sys, os -sys.path.insert(0, '../distrib') -import build - -MODULELIST = ['glcanvas', 'ogl', 'stc', ] -sys.argv[0] = '../../distrib/build.py' - - -for module in MODULELIST: - cwd = os.getcwd() - print "**** Building %s ****" % module - err = build.main([sys.argv[0], '-C', module] + sys.argv[1:]) - os.chdir(cwd) - if err: - break - -sys.exit(err) diff --git a/wxPython/contrib/glcanvas/build.cfg b/wxPython/contrib/glcanvas/build.cfg deleted file mode 100644 index 650d8f5735..0000000000 --- a/wxPython/contrib/glcanvas/build.cfg +++ /dev/null @@ -1,25 +0,0 @@ -# -*- python -*- -import sys - -MODULE = 'glcanvasc' -SWIGFILES = ['glcanvas.i', ] - - -if sys.platform == 'win32': -# SOURCES = ['_glcanvas.cpp'] -# OTHERLIBS = 'glu32.lib opengl32.lib' -# OTHERCFLAGS = '-DwxUSE_GLCANVAS=1' -# OTHERRULES = ''' -#_glcanvas.cpp : $(WXDIR)\src\msw\glcanvas.cpp -# copy $(WXDIR)\src\msw\glcanvas.cpp _glcanvas.cpp -#''' - pass - -else: - - #print "Warning: Assuming MesaGL libraries. Override OTHERLIBS in build.local\n"\ - # " if you have native GL!" - #OTHERLIBS = "-lwx_gtk_gl -lMesaGL -lMesaGLU" - OTHERLIBS = "-lwx_gtk_gl -lGL -lGLU" - - diff --git a/wxPython/contrib/glcanvas/glcanvasc.def b/wxPython/contrib/glcanvas/glcanvasc.def deleted file mode 100644 index 8be1ced94e..0000000000 --- a/wxPython/contrib/glcanvas/glcanvasc.def +++ /dev/null @@ -1,2 +0,0 @@ -EXPORTS - initglcanvasc diff --git a/wxPython/contrib/ogl/build.cfg b/wxPython/contrib/ogl/build.cfg deleted file mode 100644 index 8feb3ef061..0000000000 --- a/wxPython/contrib/ogl/build.cfg +++ /dev/null @@ -1,52 +0,0 @@ -# -*- python -*- -import sys - -MODULE = 'oglc' -SWIGFILES = ['ogl.i', 'oglbasic.i', 'oglshapes.i', 'oglshapes2.i', 'oglcanvas.i'] -SOURCES = ['oglhelpers.cpp'] - - -OTHERCFLAGS = '-I$(STCLOC)/contrib/include' -SOURCES = SOURCES + [ - '$(STCLOC)/contrib/src/ogl/basic.cpp', - '$(STCLOC)/contrib/src/ogl/bmpshape.cpp', - '$(STCLOC)/contrib/src/ogl/composit.cpp', - '$(STCLOC)/contrib/src/ogl/divided.cpp', - '$(STCLOC)/contrib/src/ogl/lines.cpp', - '$(STCLOC)/contrib/src/ogl/misc.cpp', - '$(STCLOC)/contrib/src/ogl/basic2.cpp', - '$(STCLOC)/contrib/src/ogl/canvas.cpp', - '$(STCLOC)/contrib/src/ogl/constrnt.cpp', - '$(STCLOC)/contrib/src/ogl/drawn.cpp', - '$(STCLOC)/contrib/src/ogl/mfutils.cpp', - '$(STCLOC)/contrib/src/ogl/ogldiag.cpp', - ] - -if sys.platform == 'win32': - OTHERDEFS = 'STCLOC = $(WXWIN)' - OTHERRULES = ''' -{$(WXWIN)/contrib/src/ogl}.cpp{}.obj: - $(cc) @<< -$(CPPFLAGS) /c /Tp $< -<< -''' -else: - OTHERCFLAGS = '-Icontrib/include' - DEFAULTRULE = 'default: contrib $(GENCODEDIR) $(TARGET) $(BUILDDIR)/$(TARGET) bldpycfiles' - OTHERRULES = """ -%.o : contrib/src/ogl/%.cpp - $(CCC) $(CCSHARED) $(CFLAGS) $(OTHERCFLAGS) -c $< - -contrib : - ln -s $(WXDIR)/contrib contrib - -""" - - -SWIGDEPS = '_ogldefs.i' -OTHERDEPS = 'oglhelpers.h $(WXPSRCDIR)/helpers.h' - - -# There are no platform differences so we don't need separate code directories -GENCODEDIR='.' -SWIGTOOLKITFLAG='' diff --git a/wxPython/contrib/ogl/oglc.def b/wxPython/contrib/ogl/oglc.def deleted file mode 100644 index 78408b947c..0000000000 --- a/wxPython/contrib/ogl/oglc.def +++ /dev/null @@ -1,2 +0,0 @@ -EXPORTS - initoglc diff --git a/wxPython/contrib/stc/build.cfg b/wxPython/contrib/stc/build.cfg deleted file mode 100644 index 8d9408deef..0000000000 --- a/wxPython/contrib/stc/build.cfg +++ /dev/null @@ -1,85 +0,0 @@ -# -*- python -*- -import sys - -MODULE = 'stc_c' -SWIGFILES = ['stc_.i'] -SOURCES = [] -PYFILES = ['stc.py'] - - -OTHERSWIGFLAGS = '-I$(STCLOC)/contrib/include/wx/stc' -SWIGDEPS = '$(STCLOC)/contrib/include/wx/stc/stc.h' - -SOURCES = SOURCES + [ - '$(STCLOC)/contrib/src/stc/scintilla/src/AutoComplete.cxx', - '$(STCLOC)/contrib/src/stc/scintilla/src/CallTip.cxx', - '$(STCLOC)/contrib/src/stc/scintilla/src/CellBuffer.cxx', - '$(STCLOC)/contrib/src/stc/scintilla/src/ContractionState.cxx', - '$(STCLOC)/contrib/src/stc/scintilla/src/Document.cxx', - '$(STCLOC)/contrib/src/stc/scintilla/src/Editor.cxx', - '$(STCLOC)/contrib/src/stc/scintilla/src/Indicator.cxx', - '$(STCLOC)/contrib/src/stc/scintilla/src/KeyMap.cxx', - '$(STCLOC)/contrib/src/stc/scintilla/src/KeyWords.cxx', - '$(STCLOC)/contrib/src/stc/scintilla/src/LineMarker.cxx', - '$(STCLOC)/contrib/src/stc/scintilla/src/PropSet.cxx', - '$(STCLOC)/contrib/src/stc/scintilla/src/ScintillaBase.cxx', - '$(STCLOC)/contrib/src/stc/scintilla/src/Style.cxx', - '$(STCLOC)/contrib/src/stc/scintilla/src/ViewStyle.cxx', - '$(STCLOC)/contrib/src/stc/scintilla/src/LexCPP.cxx', - '$(STCLOC)/contrib/src/stc/scintilla/src/LexHTML.cxx', - '$(STCLOC)/contrib/src/stc/scintilla/src/LexLua.cxx', - '$(STCLOC)/contrib/src/stc/scintilla/src/LexOthers.cxx', - '$(STCLOC)/contrib/src/stc/scintilla/src/LexPerl.cxx', - '$(STCLOC)/contrib/src/stc/scintilla/src/LexPython.cxx', - '$(STCLOC)/contrib/src/stc/scintilla/src/LexSQL.cxx', - '$(STCLOC)/contrib/src/stc/scintilla/src/LexVB.cxx', - '$(STCLOC)/contrib/src/stc/scintilla/src/DocumentAccessor.cxx', - '$(STCLOC)/contrib/src/stc/scintilla/src/UniConversion.cxx', - '$(STCLOC)/contrib/src/stc/scintilla/src/WindowAccessor.cxx', - '$(STCLOC)/contrib/src/stc/scintilla/src/PosRegExp.cxx', - - '$(STCLOC)/contrib/src/stc/PlatWX.cpp', - '$(STCLOC)/contrib/src/stc/ScintillaWX.cpp', - '$(STCLOC)/contrib/src/stc/stc.cpp', - ] - -OTHERCFLAGS = '-D__WX__ -DSCI_LEXER ' + \ - '-I$(STCLOC)/contrib/src/stc/scintilla/include ' + \ - '-I$(STCLOC)/contrib/include ' + \ - '-I$(STCLOC)/contrib/src/stc/scintilla/src' - - -if sys.platform == 'win32': - OTHERDEFS = 'STCLOC = $(WXWIN)' - OTHERRULES = ''' -{$(WXWIN)/contrib/src/stc}.cpp{}.obj: - $(cc) @<< -$(CPPFLAGS) /c /Tp $< -<< - -{$(WXWIN)/contrib/src/stc/scintilla/src}.cxx{}.obj: - $(cc) @<< -$(CPPFLAGS) /c /Tp $< -<< -''' - -else: - DEFAULTRULE = 'default: contrib $(GENCODEDIR) $(TARGET) $(BUILDDIR)/$(TARGET) bldpycfiles' - OTHERDEFS = 'STCLOC = .' - OTHERRULES = ''' -%.o : contrib/src/stc/%.cpp - $(CCC) $(CCSHARED) $(CFLAGS) $(OTHERCFLAGS) -c $< - -%.o : contrib/src/stc/scintilla/src/%.cxx - $(CCC) $(CCSHARED) $(CFLAGS) $(OTHERCFLAGS) -c $< - -contrib : - ln -s $(WXDIR)/contrib contrib - -''' - - -# There are no platform differences so we don't need separate code directories -GENCODEDIR='.' -SWIGTOOLKITFLAG='' - diff --git a/wxPython/src/build.cfg b/wxPython/src/build.cfg deleted file mode 100644 index edca6547f0..0000000000 --- a/wxPython/src/build.cfg +++ /dev/null @@ -1,153 +0,0 @@ -# -*- python -*- -import sys - -MODULE = 'wxc' -SWIGFILES = ['wx.i', 'windows.i', 'windows2.i', 'windows3.i', 'events.i', - 'misc.i', 'misc2.i', 'utils.i', 'gdi.i', 'mdi.i', 'controls.i', - 'controls2.i', 'cmndlgs.i', 'stattool.i', 'frames.i', - 'image.i', 'printfw.i', 'sizers.i', 'clip_dnd.i', 'grid.i', - 'html.i', 'htmlhelp.i', 'calendar.i' - ] - -PYFILES = ['__init__.py', '__version__.py'] - -SWIGDEPS = '_defs.i my_typemaps.i' -OTHERDEPS = 'helpers.h' - -if sys.platform == 'win32': - RESFILE = 1 - SOURCES = ['helpers.cpp', 'libpy.c'] - LIBS = '$(PYTHONLIB)' - OTHERRULES = """ -dist: - cd .. - distrib\zipit.bat $(VERSION) - -dbg: - cd ..\distrib - makedbg.bat $(VERSION) - -dev: - cd ..\distrib - makedev.bat $(VERSION) - -__version__.py: ../distrib/build.py build.cfg - echo ver = '$(VERSION)' > __version__.py - -""" - -else: - DEFAULTRULE = 'default: $(GENCODEDIR) helperlib $(TARGET) $(BUILDDIR)/$(TARGET) bldpycfiles' - OTHERINSTALLTARGETS = 'installLib installDemo installHelpers ' - OTHERUNINSTALLTARGETS = 'uninstallLib uninstallDemo uninstallHelpers ' - - OTHERCFLAGS = '`gtk-config --cflags`' - OTHERRULES = """ -HELPERLIBNAME = lib$(HELPERLIB).$(MAJVER)$(SO).$(BLDVER).0.0 -helperlib: $(HELPERLIBNAME) - -$(HELPERLIBNAME) : helpers.o libpy.o - $(LDSHARED) helpers.o libpy.o $(LFLAGS) -o $@ - ln -s $(HELPERLIBNAME) lib$(HELPERLIB).$(MAJVER)$(SO).$(BLDVER) - ln -s $(HELPERLIBNAME) lib$(HELPERLIB).$(MAJVER)$(SO) - ln -s $(HELPERLIBNAME) lib$(HELPERLIB)$(SO) - - -installHelpers: $(HELPERLIBDIR)/$(HELPERLIBNAME) - - -$(HELPERLIBDIR)/$(HELPERLIBNAME) : $(HELPERLIBNAME) - cp $(HELPERLIBNAME) $(HELPERLIBDIR) - cd $(HELPERLIBDIR); \ - ln -sf $(HELPERLIBNAME) lib$(HELPERLIB).$(MAJVER)$(SO).$(BLDVER); \ - ln -sf $(HELPERLIBNAME) lib$(HELPERLIB).$(MAJVER)$(SO); \ - ln -sf $(HELPERLIBNAME) lib$(HELPERLIB)$(SO) - @echo --------------------------------------------------------- - @echo You may have to run ldconfig, or set an environment - @echo variable in order for $(HELPERLIBDIR)/lib$(HELPERLIB)$(SO) - @echo to be found at runtime. See your man pages for ld.so or - @echo equivalent. - @echo --------------------------------------------------------- - - -installLib: - mkdir $(TARGETDIR)/lib; \\ - mkdir $(TARGETDIR)/lib/sizers; \\ - mkdir $(TARGETDIR)/lib/editor; \\ - cp ../wxPython/lib/*.py $(TARGETDIR)/lib; \\ - cp ../wxPython/lib/sizers/*.py $(TARGETDIR)/lib/sizers; \\ - cp ../wxPython/lib/editor/*.py $(TARGETDIR)/lib/editor; \\ - cp ../wxPython/lib/*.txt $(TARGETDIR)/lib; \\ - cp ../wxPython/lib/sizers/*.txt $(TARGETDIR)/lib/sizers;\\ - cp ../wxPython/lib/editor/*.txt $(TARGETDIR)/lib/editor;\\ - $(EXECPREFIX)/bin/python $(PYLIB)/compileall.py $(TARGETDIR); \\ - $(EXECPREFIX)/bin/python -O $(PYLIB)/compileall.py $(TARGETDIR); - -installDemo: - mkdir $(TARGETDIR)/demo; \\ - mkdir $(TARGETDIR)/demo/bitmaps; \\ - mkdir $(TARGETDIR)/demo/data; \\ - cp ../demo/*.py $(TARGETDIR)/demo; \\ - cp ../demo/*.xml $(TARGETDIR)/demo; \\ - cp ../demo/*.txt $(TARGETDIR)/demo; \\ - cp ../demo/bitmaps/*.bmp $(TARGETDIR)/demo/bitmaps; \\ - cp ../demo/bitmaps/*.ico $(TARGETDIR)/demo/bitmaps; \\ - cp ../demo/bitmaps/*.gif $(TARGETDIR)/demo/bitmaps; \\ - cp ../demo/bitmaps/*.png $(TARGETDIR)/demo/bitmaps; \\ - cp ../demo/bitmaps/*.jpg $(TARGETDIR)/demo/bitmaps; \\ - cp ../demo/data/*.png $(TARGETDIR)/demo/data; \\ - cp ../demo/data/*.htm $(TARGETDIR)/demo/data; \\ - cp ../demo/data/*.bmp $(TARGETDIR)/demo/data; \\ - cp ../demo/data/*.txt $(TARGETDIR)/demo/data; \\ - cp ../demo/data/*.i $(TARGETDIR)/demo/data; \\ - cp ../demo/data/*.h $(TARGETDIR)/demo/data; \\ - echo "(1,0)" > $(TARGETDIR)/demo/data/showTips; \\ - chmod 666 $(TARGETDIR)/demo/data/showTips; \\ - $(EXECPREFIX)/bin/python $(PYLIB)/compileall.py $(TARGETDIR)/demo;\\ - $(EXECPREFIX)/bin/python -O $(PYLIB)/compileall.py $(TARGETDIR)/demo; - - -uninstallLib: - rm -rf $(TARGETDIR)/lib; - -uninstallDemo: - rm -rf $(TARGETDIR)/demo; - - -uninstallHelpers: - rm -f $(HELPERLIBDIR)/lib$(HELPERLIB)$(SO) - rm -f $(HELPERLIBDIR)/$(HELPERLIBNAME) - rm -f $(HELPERLIBDIR)/lib$(HELPERLIB).$(MAJVER)$(SO).$(BLDVER) - rm -f $(HELPERLIBDIR)/lib$(HELPERLIB).$(MAJVER)$(SO) - rm -f $(HELPERLIBDIR)/lib$(HELPERLIB)$(SO) - - -__version__.py: ../distrib/build.py build.cfg - echo ver = \\'$(VERSION)\\' > __version__.py - - -#---------------------------------------------------------------------- - -dist: tgz rpm - -tgz: - cd ..; distrib/maketgz $(VERSION) - -rpm: - cd ../distrib; ./makerpm $(VERSION) - - -""" - - - - - -OTHERRULES = OTHERRULES + """ - -$(GENCODEDIR)/wx.py : _extras.py -$(GENCODEDIR)/grid.py : _gridextras.py -$(GENCODEDIR)/html.py : _htmlextras.py -$(GENCODEDIR)/calendar.py : _calextras.py - -""" diff --git a/wxPython/src/wxc.def b/wxPython/src/wxc.def deleted file mode 100644 index 87d2d233b6..0000000000 --- a/wxPython/src/wxc.def +++ /dev/null @@ -1,6 +0,0 @@ -EXPORTS - initwxc - SWIG_GetPtr - SWIG_MakePtr - SWIG_RegisterMapping - SWIG_newvarlink