I've tested this patch and checked it into svn. Should probably be
tested for winbuild and MacOS X.
I think we are good to go if Graham and Nicolas are happy with their
MODPYTHON-73 changes.
Jim
Gregory (Grisha) Trubetskoy wrote:
Or speaking in diff (not tested):
--- setup.py.in.orig 2005-09-01 11:42:09.082202944 -0400
+++ setup.py.in 2005-09-01 11:44:35.969872624 -0400
@@ -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
@@ -174,7 +180,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:
On Thu, 1 Sep 2005, Gregory (Grisha) Trubetskoy wrote:
On Wed, 31 Aug 2005, Jim Gallacher wrote:
3. Eliminate creation of mod_python_so.so in non-windows environments.
Fix is ready to commit.
Not Done. I decided to defer this for reasons I won't go into just
now. It is not a show stopper anyway.
Isn't the fix basically just placing the ModPyModule and setup() with
ModPyModule inside the "if winbuild" block and then having another
set() without the ModPyModule in the else clause?
Unless there is some good reason for it, I think it is a show stopper
because it makes the build process look a bit on the bizzare side on
Unix.
Grisha
