Changeset: 639822cd6235 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=639822cd6235
Modified Files:
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (34 lines):
diff -r 81e088c96d33 -r 639822cd6235 buildtools/autogen/autogen/codegen.py
--- a/buildtools/autogen/autogen/codegen.py Mon Dec 20 08:23:56 2010 +0100
+++ b/buildtools/autogen/autogen/codegen.py Mon Dec 20 17:53:43 2010 +0100
@@ -306,16 +306,14 @@
subsrc = ''
subins = ''
for src,install in incdirsmap:
- m = re.match(re.escape(src),inc)
- if m and m.end() > mlen:
- mlen = m.end()
+ slen = len(src)
+ if slen > mlen and inc.startswith(src):
+ mlen = slen
subsrc = src
subins = install
if mlen > 0:
- inc = re.sub(re.escape(subsrc),
- re.escape(re.sub('includedir', '..', subins)),
- inc)
+ inc.replace(subsrc, subins.replace('includedir', '..'))
nvals.append(inc)
installincs[k] = nvals
installincs.close()
@@ -468,8 +466,7 @@
if os.environ.has_key( var ):
value = os.environ[var]
- value = re.sub('\\{', '(', value)
- value = re.sub('\\}', ')', value)
+ value = value.replace('{', '(').replace('}', ')')
return value + rest
return None
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
