Changeset: 678fc6418a15 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=678fc6418a15
Modified Files:
buildtools/autogen/autogen/am.py
buildtools/autogen/autogen/codegen.py
buildtools/autogen/autogen/msc.py
Branch: Mar2018
Log Message:
Some minor fixes to autogen.
diffs (58 lines):
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -722,6 +722,8 @@ def am_library(fd, var, libmap, am):
cond = ''
condname = ''
if 'COND' in libmap:
+ if len(libmap['COND']) == 1 and libmap['COND'][0] in ('WIN32',
'NATIVE_WIN32'):
+ return
for condname in libmap['COND']:
fd.write("if %s\n" % condname)
fd.write(" C_%s = %s\n" % (libname, libname))
diff --git a/buildtools/autogen/autogen/codegen.py
b/buildtools/autogen/autogen/codegen.py
--- a/buildtools/autogen/autogen/codegen.py
+++ b/buildtools/autogen/autogen/codegen.py
@@ -378,7 +378,6 @@ def codegen(tree, cwd, topdir, incdirsma
targets = []
if type(v) is type({}) and "SOURCES" in v:
for f in v["SOURCES"]:
- base,ext = split_filename(f)
if f not in targets:
targets.append(f)
targets = do_code_gen(targets,deps,code_gen)
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -749,17 +749,20 @@ def msc_library(fd, var, libmap, msc):
else:
makelib = makedll
if 'COND' in libmap:
- condname = 'defined(' + ') && defined('.join(libmap['COND']) + ')'
- mkname = (pref + v).replace('.', '_').replace('-', '_')
- fd.write('!IF %s\n' % condname)
- fd.write('C_%s_dll = %s%s%s\n' % (mkname, pref, v, dll))
- fd.write('C_%s_lib = %s%s.lib\n' % (mkname, pref, v))
- fd.write('!ELSE\n')
- fd.write('C_%s_dll =\n' % mkname)
- fd.write('C_%s_lib =\n' % mkname)
- fd.write('!ENDIF\n')
- makelib = '$(C_%s_lib)' % mkname
- makedll = '$(C_%s_dll)' % mkname
+ if len(libmap['COND']) == 1 and libmap['COND'][0] in ('WIN32',
'NATIVE_WIN32'):
+ condname = ''
+ else:
+ condname = 'defined(' + ') && defined('.join(libmap['COND']) + ')'
+ mkname = (pref + v).replace('.', '_').replace('-', '_')
+ fd.write('!IF %s\n' % condname)
+ fd.write('C_%s_dll = %s%s%s\n' % (mkname, pref, v, dll))
+ fd.write('C_%s_lib = %s%s.lib\n' % (mkname, pref, v))
+ fd.write('!ELSE\n')
+ fd.write('C_%s_dll =\n' % mkname)
+ fd.write('C_%s_lib =\n' % mkname)
+ fd.write('!ENDIF\n')
+ makelib = '$(C_%s_lib)' % mkname
+ makedll = '$(C_%s_dll)' % mkname
else:
condname = ''
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
