Update of /cvsroot/monetdb/buildtools/autogen/autogen
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25849/autogen/autogen
Modified Files:
am.py msc.py
Log Message:
propagated changes of Monday Oct 22 2007 - Monday Oct 22 2007
from the MonetDB_1-20 branch to the development trunk
Index: am.py
===================================================================
RCS file: /cvsroot/monetdb/buildtools/autogen/autogen/am.py,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- am.py 24 Sep 2007 08:13:13 -0000 1.56
+++ am.py 22 Oct 2007 12:18:37 -0000 1.57
@@ -879,7 +879,7 @@
def am_ant(fd, var, ant, am):
- target = var[4:] # the ant target to call
+ target = var[4:] # the ant target to call
jd = "JAVADIR"
if ant.has_key("DIR"):
Index: msc.py
===================================================================
RCS file: /cvsroot/monetdb/buildtools/autogen/autogen/msc.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- msc.py 12 Oct 2007 07:48:59 -0000 1.37
+++ msc.py 22 Oct 2007 12:18:37 -0000 1.38
@@ -392,7 +392,7 @@
for t, deplist in deps.items():
if not needbuilttool(deplist):
msc_dep(fd, t, deplist, msc)
-
+
msc['DEPS'].append("DONE")
# list of scripts to install
@@ -666,7 +666,7 @@
fd.write("%s.exe: $(%s_OBJS)\n" % (bin, bin.replace('-','_')))
fd.write('\t$(CC) $(CFLAGS)')
fd.write(" -Fe%s.exe $(%s_OBJS) /link $(%s_LIBS) /subsystem:console
/NODEFAULTLIB:LIBC\n" % (bin, bin.replace('-','_'), bin.replace('-','_')))
- fd.write("\tif exist [EMAIL PROTECTED] $(MT) -manifest [EMAIL
PROTECTED] -outputresource:$@;1\n\n");
+ fd.write("\tif exist [EMAIL PROTECTED] $(MT) -manifest [EMAIL
PROTECTED] -outputresource:$@;1\n\n");
if SCRIPTS:
fd.write(name.replace('-','_')+"_SCRIPTS =" +
msc_space_sep_list(SCRIPTS))
@@ -834,7 +834,7 @@
fd.write("%s.lib: %s%s\n" % (ln, ln, dll))
fd.write("%s%s: $(%s_DEPS) \n" % (ln, dll, ln.replace('-','_')))
fd.write("\t$(CC) $(CFLAGS) -LD -Fe%s%s $(%s_OBJS) /link
$(%s_LIBS)%s\n" % (ln, dll, ln.replace('-','_'), ln.replace('-','_'), deffile))
- fd.write("\tif exist [EMAIL PROTECTED] $(MT) -manifest [EMAIL
PROTECTED] -outputresource:$@;2\n");
+ fd.write("\tif exist [EMAIL PROTECTED] $(MT) -manifest [EMAIL
PROTECTED] -outputresource:$@;2\n");
if sep == '_':
fd.write('\tif not exist .libs $(MKDIR) .libs\n')
fd.write('\t$(INSTALL) "%s%s" ".libs\\%s%s"\n' % (ln, dll, ln,
dll))
@@ -922,7 +922,7 @@
fd.write(ln + ".lib: " + ln + ".dll\n")
fd.write(ln + ".dll: $(" + ln.replace('-','_') + "_DEPS)\n")
fd.write("\t$(CC) $(CFLAGS) -LD -Fe%s.dll $(%s_OBJS) /link
$(%s_LIBS)%s\n" % (ln, ln.replace('-','_'), ln.replace('-','_'), deffile))
- fd.write("\tif exist [EMAIL PROTECTED] $(MT) -manifest [EMAIL
PROTECTED] -outputresource:$@;2\n");
+ fd.write("\tif exist [EMAIL PROTECTED] $(MT) -manifest [EMAIL
PROTECTED] -outputresource:$@;2\n");
if sep == '_':
fd.write('\tif not exist .libs $(MKDIR) .libs\n')
fd.write('\t$(INSTALL) "%s.dll" ".libs\\%s.dll"\n' % (ln, ln))
@@ -961,7 +961,7 @@
def msc_ant(fd, var, ant, msc):
global callantno
- target = var[4:] # the ant target to call
+ target = var[4:] # the ant target to call
jd = "JAVADIR"
if ant.has_key("DIR"):
@@ -969,8 +969,8 @@
jd = msc_translate_dir(jd, msc)
if ant.has_key("SOURCES"):
- for src in ant['SOURCES']:
- msc['EXTRA_DIST'].append(src)
+ for src in ant['SOURCES']:
+ msc['EXTRA_DIST'].append(src)
if ant.has_key('COND'):
condname = 'defined(' + ') && defined('.join(ant['COND']) + ')'
@@ -995,7 +995,7 @@
# INSTALL expects a list of dst,src,ext,install_directory,'lib?'.
for file in ant['FILES']:
sfile = file.replace(".", "_")
- fd.write('%s: %s_ant_target\n' % (file, target))
+ fd.write('%s: %s_ant_target\n' % (file, target))
msc['INSTALL'][file] = file, '', jd, '', condname
fd.write("\n!ELSE\n\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
