svn commit: r265749 - in /httpd/mod_python/trunk: dist/setup.py.in lib/python/mod_python/__init__.py

[jg...@apache.org]

Author: jgallacher
Date: Thu Sep  1 09:09:50 2005
New Revision: 265749

URL: http://svn.apache.org/viewcvs?rev=265749&view=rev
Log:
Fixed setup.py.in so it does not create the mod_python_so.so module in 
non-windows builds.

Modified:
    httpd/mod_python/trunk/dist/setup.py.in
    httpd/mod_python/trunk/lib/python/mod_python/__init__.py

Modified: httpd/mod_python/trunk/dist/setup.py.in
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/dist/setup.py.in?rev=265749&r1=265748&r2=265749&view=diff
==============================================================================
--- httpd/mod_python/trunk/dist/setup.py.in (original)
+++ httpd/mod_python/trunk/dist/setup.py.in Thu Sep  1 09:09:50 2005
@@ -140,18 +140,24 @@
         # this is a hack to prevent build_ext from trying to append "initmod_python" to the export symbols
         self.export_symbols = finallist(self.export_symbols)
 
-ModPyModule = ModPyExtension(getmp_srcdir(), [getmp_includedir(), getapache_includedir()], [getapache_libdir()])
 
 if winbuild:
+
+    # build mod_python.so
+    ModPyModule = ModPyExtension(getmp_srcdir(), [getmp_includedir(), getapache_includedir()], [getapache_libdir()])
+
     scripts = ["win32_postinstall.py"]
     # put the mod_python.so file in the Python root ...
     # win32_postinstall.py will pick it up from there...
     # data_files = [("", [(os.path.join(getmp_srcdir(), 'Release', 'mod_python.so'))])]
     data_files = []
+    ext_modules = [ModPyModule, PSPModule]
+
 else:
-    # mpso = "../src/mod_python.so"
+
     scripts = []
     data_files = []
+    ext_modules = [PSPModule]
 
 import string
 from distutils import sysconfig
@@ -175,7 +181,7 @@
       package_dir={'mod_python': os.path.join(getmp_rootdir(), 'lib', 'python', 'mod_python')},
       scripts=scripts,
       data_files=data_files,
-      ext_modules=[ModPyModule, PSPModule])
+      ext_modules=ext_modules)
 
 # makes emacs go into python mode
 ### Local Variables:

Modified: httpd/mod_python/trunk/lib/python/mod_python/__init__.py
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/lib/python/mod_python/__init__.py?rev=265749&r1=265748&r2=265749&view=diff
==============================================================================
--- httpd/mod_python/trunk/lib/python/mod_python/__init__.py (original)
+++ httpd/mod_python/trunk/lib/python/mod_python/__init__.py Thu Sep  1 09:09:50 2005
@@ -20,5 +20,5 @@
 __all__ = ["apache", "cgihandler", "psp",
            "publisher", "util"]
 
-version = "3.2.0-dev-20050831"
+version = "3.2.0-dev-20050901"