New build system for wxPython. (Still needs some polish but is stable

for me.  Will be doing more testing tomorrow on other platforms and
then will remove the old wxPython build stuff...)


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

utils/wxPython/src/.cvsignore

@@ -6,6 +6,7 @@ Setup.in.new
 Setup.save
 Setup.save
 Setup.test
+build.local
 compile.py
 config.c
 glcanvas.h
@@ -24,7 +25,10 @@ wxPython.dsw
 wxPython.ncb
 wxPython.opt
 wxc.exp
+wxc.ilk
 wxc.lib
+wxc.pch
+wxc.pyd
 wxc.res
 wxp.pch
 wxpc.exp

utils/wxPython/src/build.cfg

@@ -0,0 +1,78 @@
+# -*- python -*-
+import sys
+
+MODULE = 'wxc'
+SWIGFILES = ['wx.i', 'windows.i', 'windows2.i', 'windows3.i', 'events.i',
+             'misc.i', 'misc2.i', 'gdi.i', 'mdi.i', 'controls.i',
+             'controls2.i', 'cmndlgs.i', 'stattool.i', 'frames.i',
+             'image.i', 'printfw.i',
+             ]
+
+PYFILES = ['__init__.py']
+
+
+if sys.platform == 'win32':
+    RESFILE = 1
+    SOURCES = ['helpers.cpp', 'libpy.c']
+    LIBS = '$(PYTHONLIB)'
+    OTHERRULES = """
+dist:
+	cd ..\..
+	wxPython\distrib\zipit.bat $(VERSION)
+"""
+
+else:
+    DEFAULTRULE = 'default: $(GENCODEDIR) lib$(HELPERLIB)$(SO) $(TARGET)'
+    OTHERINSTALLTARGETS = 'installHelpers installLibDemo'
+
+
+    OTHERRULES = """
+lib$(HELPERLIB)$(SO) : helpers.o libpy.o
+	$(LDSHARED) helpers.o libpy.o $(LFLAGS) -o $@
+
+installHelpers: $(HELPERLIBDIR)/lib$(HELPERLIB)$(SO)
+
+$(HELPERLIBDIR)/lib$(HELPERLIB)$(SO) : lib$(HELPERLIB)$(SO)
+	cp $< $@
+	@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 ---------------------------------------------------------
+
+
+installLibDemo:
+	@if [ "$(TARGETDIR)" != ".." ]; then        		\\
+		mkdir $(TARGETDIR)/lib;            		\\
+		mkdir $(TARGETDIR)/lib/sizers;     		\\
+		mkdir $(TARGETDIR)/demo;           		\\
+		mkdir $(TARGETDIR)/demo/bitmaps;      		\\
+		cp ../lib/*.py $(TARGETDIR)/lib;   		\\
+		cp ../lib/sizers/*.py $(TARGETDIR)/lib/sizers;	\\
+		cp ../demo/*.py $(TARGETDIR)/demo; 		\\
+		cp ../lib/*.txt $(TARGETDIR)/lib;  		\\
+		cp ../lib/sizers/*.txt $(TARGETDIR)/lib/sizers;	\\
+		cp ../demo/*.txt $(TARGETDIR)/demo;		\\
+		cp ../demo/bitmaps/[a-z]* $(TARGETDIR)/demo/bitmaps;	\\
+		$(EXECPREFIX)/bin/python $(PYLIB)/compileall.py -l $(TARGETDIR); \\
+		$(EXECPREFIX)/bin/python -O $(PYLIB)/compileall.py -l $(TARGETDIR); \\
+	fi
+
+
+dist: tgz rpm
+
+tgz:
+	cd ../..; wxPython/distrib/maketgz $(VERSION)
+
+rpm:
+	cd ../distrib; ./makerpm $(VERSION)
+
+
+
+"""
+
+
+
+
+

utils/wxPython/src/msw/wx.cpp

@@ -646,11 +646,6 @@ extern "C" SWIGEXPORT(void) initframesc();
 extern "C" SWIGEXPORT(void) initwindows3c();
 extern "C" SWIGEXPORT(void) initimagec();
 extern "C" SWIGEXPORT(void) initprintfwc();
-#ifndef SEPARATE
-extern "C" SWIGEXPORT(void) initutilsc();
-//extern "C" SWIGEXPORT(void) initoglc();
-extern "C" SWIGEXPORT(void) initglcanvasc();
-#endif
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -2644,13 +2639,6 @@ SWIGEXPORT(void) initwxc() {
     initwindows3c();
     initimagec();
     initprintfwc();
-#ifndef SEPARATE
-    initutilsc();
-//    initoglc();
-#ifdef WITH_GLCANVAS
-    initglcanvasc();
-#endif
-#endif
 {
    int i;
    for (i = 0; _swig_mapping[i].n1; i++)

utils/wxPython/src/wx.i

@@ -144,11 +144,6 @@ extern "C" SWIGEXPORT(void) initframesc();
 extern "C" SWIGEXPORT(void) initwindows3c();
 extern "C" SWIGEXPORT(void) initimagec();
 extern "C" SWIGEXPORT(void) initprintfwc();
-#ifndef SEPARATE
-extern "C" SWIGEXPORT(void) initutilsc();
-//extern "C" SWIGEXPORT(void) initoglc();
-extern "C" SWIGEXPORT(void) initglcanvasc();
-#endif
 %}
 
 
@@ -176,13 +171,6 @@ extern "C" SWIGEXPORT(void) initglcanvasc();
     initwindows3c();
     initimagec();
     initprintfwc();
-#ifndef SEPARATE
-    initutilsc();
-//    initoglc();
-#ifdef WITH_GLCANVAS
-    initglcanvasc();
-#endif
-#endif
 %}
 
 //----------------------------------------------------------------------