Update of /cvsroot/monetdb/buildtools/autogen/autogen
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv439
Modified Files:
Tag: MonetDB_1-20
msc.py
Log Message:
The hack of looking at a few parents directory names to see whether
something is a Python module breaks down for _monetdb in
sql/src/backends/monet4. So use a different hack: if the name of the
first source file ends in .py.i it's also a Python module.
Index: msc.py
===================================================================
RCS file: /cvsroot/monetdb/buildtools/autogen/autogen/msc.py,v
retrieving revision 1.35.2.4
retrieving revision 1.35.2.5
diff -u -d -r1.35.2.4 -r1.35.2.5
--- msc.py 24 Oct 2007 13:58:04 -0000 1.35.2.4
+++ msc.py 30 Oct 2007 13:13:24 -0000 1.35.2.5
@@ -712,25 +712,30 @@
else:
pref = ''
instlib = 1
- # if underneath a directory called "python" (up to 3 levels),
- # set DLL suffix to ".pyd" and set instlib to 0
- # if underneath a directory called "php" (also up to 3 levels),
- # set instlib to 0 and pref to 'php_'
- h,t = os.path.split(msc['cwd'])
- if t == 'python' or t == 'php':
- if t == 'python':
- dll = '.pyd'
- else:
- pref = 'php_'
+ if libmap['SOURCES'][0].endswith('.py.i'):
+ # if the first source ends in .py.i, it's a Python module
+ dll = '.pyd'
instlib = 0
else:
- h,t = os.path.split(h)
- if t == 'python' or os.path.basename(h) == 'python':
- dll = '.pyd'
- instlib = 0
- elif t == 'php' or os.path.basename(h) == 'php':
+ # if underneath a directory called "python" (up to 3 levels),
+ # set DLL suffix to ".pyd" and set instlib to 0
+ # if underneath a directory called "php" (also up to 3 levels),
+ # set instlib to 0 and pref to 'php_'
+ h,t = os.path.split(msc['cwd'])
+ if t == 'python' or t == 'php':
+ if t == 'python':
+ dll = '.pyd'
+ else:
+ pref = 'php_'
instlib = 0
- pref = 'php_'
+ else:
+ h,t = os.path.split(h)
+ if t == 'python' or os.path.basename(h) == 'python':
+ dll = '.pyd'
+ instlib = 0
+ elif t == 'php' or os.path.basename(h) == 'php':
+ instlib = 0
+ pref = 'php_'
if (libname[0] == "_"):
sep = "_"
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
