DMC fix.

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index f8aabe26d70b1692bf5fdc9c88d07513b8cb2a03..d2fc1b688ffbc3394eb1fdd92dd56283a557653a 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -65,6 +65,20 @@ RELEASE_NUMBER = RELEASE_VERSION  # for compatibility
 CLEANUP.append('wx/__version__.py')
 
 
 CLEANUP.append('wx/__version__.py')
 
 

+#----------------------------------------------------------------------
+# patch distutils if it can't cope with the "classifiers" or
+# "download_url" keywords 
+#----------------------------------------------------------------------
+
+if sys.version < '2.2.3': 
+    from distutils.dist import DistributionMetadata 
+    DistributionMetadata.classifiers = None 
+    DistributionMetadata.download_url = None
+    depends = {}
+else:
+    depends = {'depends' : depends}
+    
+

 #----------------------------------------------------------------------
 # Define the CORE extension module
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
 # Define the CORE extension module
 #----------------------------------------------------------------------


@@ -135,7 +149,7 @@ ext = Extension('_core_', ['src/helpers.cpp',
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
 
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
 

-                depends = depends
+                **depends

                 )
 wxpExtensions.append(ext)
 
                 )
 wxpExtensions.append(ext)
 


@@ -172,7 +186,7 @@ ext = Extension('_gdi_', ['src/drawlist.cpp'] + swig_sources,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,

-                depends = depends
+                **depends

                 )
 wxpExtensions.append(ext)
 
                 )
 wxpExtensions.append(ext)
 


@@ -208,7 +222,7 @@ ext = Extension('_windows_', swig_sources,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,

-                depends = depends
+                **depends

                 )
 wxpExtensions.append(ext)
 
                 )
 wxpExtensions.append(ext)
 


@@ -250,7 +264,7 @@ ext = Extension('_controls_', swig_sources,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,

-                depends = depends
+                **depends

                 )
 wxpExtensions.append(ext)
 
                 )
 wxpExtensions.append(ext)
 


@@ -288,7 +302,7 @@ ext = Extension('_misc_', swig_sources,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,

-                depends = depends
+                **depends

                 )
 wxpExtensions.append(ext)
 
                 )
 wxpExtensions.append(ext)
 


@@ -307,7 +321,7 @@ ext = Extension('_calendar', swig_sources,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,

-                depends = depends
+                **depends

                 )
 wxpExtensions.append(ext)
 
                 )
 wxpExtensions.append(ext)
 


@@ -321,7 +335,7 @@ ext = Extension('_grid', swig_sources,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,

-                depends = depends
+                **depends

                 )
 wxpExtensions.append(ext)
 
                 )
 wxpExtensions.append(ext)
 


@@ -336,7 +350,7 @@ ext = Extension('_html', swig_sources,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,

-                depends = depends
+                **depends

                 )
 wxpExtensions.append(ext)
 
                 )
 wxpExtensions.append(ext)
 


@@ -351,7 +365,7 @@ ext = Extension('_wizard', swig_sources,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 libraries = libs,
                 extra_compile_args = cflags,
                 extra_link_args = lflags,

-                depends = depends
+                **depends

                 )
 wxpExtensions.append(ext)
 
                 )
 wxpExtensions.append(ext)
 


@@ -627,16 +641,6 @@ if BUILD_DLLWIDGET:
 
 
 
 
 
 

-#----------------------------------------------------------------------
-# patch distutils if it can't cope with the "classifiers" or
-# "download_url" keywords 
-#----------------------------------------------------------------------
-
-if sys.version < '2.2.3': 
-    from distutils.dist import DistributionMetadata 
-    DistributionMetadata.classifiers = None 
-    DistributionMetadata.download_url = None
-

     
 #----------------------------------------------------------------------
 # Tools, scripts data files, etc.
     
 #----------------------------------------------------------------------
 # Tools, scripts data files, etc.


@@ -655,10 +659,9 @@ else:
                opj('scripts/pyshell'),
                opj('scripts/pywrap'),
                opj('scripts/pywrap'),
                opj('scripts/pyshell'),
                opj('scripts/pywrap'),
                opj('scripts/pywrap'),

+               opj('scripts/pywxrc'),

                opj('scripts/xrced'),
                ]
                opj('scripts/xrced'),
                ]

-    if INSTALL_WXRC:
-        SCRIPTS += [opj('scripts/wxrc')]

 
 
 
 
 
 


@@ -681,7 +684,7 @@ else:
 
 
 if INSTALL_MULTIVERSION:
 
 
 if INSTALL_MULTIVERSION:

-    EXTRA_PATH = getExtraPath()
+    EXTRA_PATH = getExtraPath(addOpts=EP_ADD_OPTS)

     open("src/wx.pth", "w").write(EXTRA_PATH)
     CLEANUP.append("src/wx.pth")
 else:
     open("src/wx.pth", "w").write(EXTRA_PATH)
     CLEANUP.append("src/wx.pth")
 else: