Compilation fixes

[wxWidgets.git] / utils / wxPython / src / build.cfg

diff --git a/utils/wxPython/src/build.cfg b/utils/wxPython/src/build.cfg
index 41e5191f792541ffe9b6bf58713caad796087414..27710ddeb308d9fb304cba92ce845d7dd1e012b1 100644 (file)
--- a/utils/wxPython/src/build.cfg
+++ b/utils/wxPython/src/build.cfg
@@ -5,11 +5,13 @@ 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',
 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',
+             'image.i', 'printfw.i', 'sizers.i', 'clip_dnd.i'

              ]
 
              ]
 

-PYFILES = ['__init__.py']
+PYFILES = ['__init__.py', '__version__.py']

 
 

+SWIGDEPS = '_defs.i my_typemaps.i'
+OTHERDEPS = 'helpers.h'

 
 if sys.platform == 'win32':
     RESFILE = 1
 
 if sys.platform == 'win32':
     RESFILE = 1


@@ -19,19 +21,34 @@ if sys.platform == 'win32':
 dist:
        cd ..\..
        wxPython\distrib\zipit.bat $(VERSION)
 dist:
        cd ..\..
        wxPython\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) lib$(HELPERLIB)$(SO) $(TARGET)'
 """
 
 else:
     DEFAULTRULE = 'default: $(GENCODEDIR) lib$(HELPERLIB)$(SO) $(TARGET)'

-    OTHERINSTALLTARGETS = 'installHelpers installLibDemo'
+    OTHERINSTALLTARGETS = 'installLibDemo installHelpers '
+    OTHERUNINSTALLTARGETS = 'uninstallLibDemo uninstallHelpers '

 
 
     OTHERRULES = """
 lib$(HELPERLIB)$(SO) : helpers.o libpy.o
        $(LDSHARED) helpers.o libpy.o $(LFLAGS) -o $@
 
 
 
     OTHERRULES = """
 lib$(HELPERLIB)$(SO) : helpers.o libpy.o
        $(LDSHARED) helpers.o libpy.o $(LFLAGS) -o $@
 

+

 installHelpers: $(HELPERLIBDIR)/lib$(HELPERLIB)$(SO)
 
 installHelpers: $(HELPERLIBDIR)/lib$(HELPERLIB)$(SO)
 

+

 $(HELPERLIBDIR)/lib$(HELPERLIB)$(SO) : lib$(HELPERLIB)$(SO)
        cp $< $@
        @echo ---------------------------------------------------------
 $(HELPERLIBDIR)/lib$(HELPERLIB)$(SO) : lib$(HELPERLIB)$(SO)
        cp $< $@
        @echo ---------------------------------------------------------


@@ -43,23 +60,46 @@ $(HELPERLIBDIR)/lib$(HELPERLIB)$(SO) : lib$(HELPERLIB)$(SO)
 
 
 installLibDemo:
 
 
 installLibDemo:

-       @if [ "$(TARGETDIR)" != ".." ]; then                    \\
+       @if [ "$(TARGETDIR)" != ".." -a "$(TARGETDIR)" != "$(WXWIN)/utils/wxPython" ]; then \\

                mkdir $(TARGETDIR)/lib;                         \\
                mkdir $(TARGETDIR)/lib/sizers;                  \\
                mkdir $(TARGETDIR)/lib;                         \\
                mkdir $(TARGETDIR)/lib/sizers;                  \\

+               mkdir $(TARGETDIR)/lib/editor;                  \\

                mkdir $(TARGETDIR)/demo;                        \\
                mkdir $(TARGETDIR)/demo/bitmaps;                \\
                mkdir $(TARGETDIR)/demo;                        \\
                mkdir $(TARGETDIR)/demo/bitmaps;                \\

+                mkdir $(TARGETDIR)/demo/data;                   \\

                cp ../lib/*.py $(TARGETDIR)/lib;                \\
                cp ../lib/sizers/*.py $(TARGETDIR)/lib/sizers;  \\
                cp ../lib/*.py $(TARGETDIR)/lib;                \\
                cp ../lib/sizers/*.py $(TARGETDIR)/lib/sizers;  \\

+               cp ../lib/editor/*.py $(TARGETDIR)/lib/editor;  \\

                cp ../demo/*.py $(TARGETDIR)/demo;              \\
                cp ../lib/*.txt $(TARGETDIR)/lib;               \\
                cp ../lib/sizers/*.txt $(TARGETDIR)/lib/sizers; \\
                cp ../demo/*.py $(TARGETDIR)/demo;              \\
                cp ../lib/*.txt $(TARGETDIR)/lib;               \\
                cp ../lib/sizers/*.txt $(TARGETDIR)/lib/sizers; \\

+               cp ../lib/editor/*.txt $(TARGETDIR)/lib/editor; \\

                cp ../demo/*.txt $(TARGETDIR)/demo;             \\
                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); \\
+               cp ../demo/bitmaps/* $(TARGETDIR)/demo/bitmaps; \\
+               cp ../demo/data/* $(TARGETDIR)/demo/data;       \\
+               $(EXECPREFIX)/bin/python $(PYLIB)/compileall.py $(TARGETDIR); \\
+               $(EXECPREFIX)/bin/python -O $(PYLIB)/compileall.py $(TARGETDIR); \\
+       fi
+
+
+
+uninstallLibDemo:
+       @if [ "$(TARGETDIR)" != ".." -a "$(TARGETDIR)" != "$(WXWIN)/utils/wxPython" ]; then \\
+               rm -rf $(TARGETDIR)/lib;                        \\
+               rm -rf $(TARGETDIR)/demo;                       \\

        fi
 
 
        fi
 
 

+uninstallHelpers:
+       rm -f $(HELPERLIBDIR)/lib$(HELPERLIB)$(SO)
+
+
+__version__.py: ../distrib/build.py  build.cfg
+       echo ver = \\'$(VERSION)\\' > __version__.py
+
+
+#----------------------------------------------------------------------
+

 dist: tgz rpm
 
 tgz:
 dist: tgz rpm
 
 tgz:


@@ -76,3 +116,8 @@ rpm:
 
 
 
 
 
 

+OTHERRULES = OTHERRULES + """
+
+$(GENCODEDIR)/wx.py : _extras.py
+
+"""