Update of /cvsroot/monetdb/buildtools/autogen/autogen
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23044/autogen/autogen
Modified Files:
am.py msc.py
Log Message:
made "COND = ..." conditionals also work with filenames that contain "-":
when deriving variable names from filenames, replace "-" by "_"
Index: am.py
===================================================================
RCS file: /cvsroot/monetdb/buildtools/autogen/autogen/am.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- am.py 23 Aug 2007 12:37:46 -0000 1.44
+++ am.py 31 Aug 2007 15:41:18 -0000 1.45
@@ -313,7 +313,7 @@
scriptname = "script_" + script
if scripts.has_key('COND'):
condname = string.join(scripts['COND'], '+')
- mkname = string.replace(script, '.', '_')
+ mkname = am_normalize(string.replace(script, '.', '_'))
cond = '#' + condname
s = "$(C_" + mkname + ")"
scriptname = "$(C_script_" + mkname + ")"
Index: msc.py
===================================================================
RCS file: /cvsroot/monetdb/buildtools/autogen/autogen/msc.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- msc.py 1 Aug 2007 20:42:53 -0000 1.33
+++ msc.py 31 Aug 2007 15:41:18 -0000 1.34
@@ -427,7 +427,7 @@
fd.write('\t$(INSTALL) "$(SRCDIR)\\%s" "%s"\n' % (script, script))
if scripts.has_key('COND'):
condname = 'defined(' + ') && defined('.join(scripts['COND']) + ')'
- mkname = script.replace('.', '_')
+ mkname = script.replace('.', '_').replace('-', '_')
fd.write('!IF %s\n' % condname)
fd.write('C_%s = %s\n' % (mkname, script))
fd.write('!ELSE\n')
-------------------------------------------------------------------------
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
