Changeset: 3ab42fdd7fc6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3ab42fdd7fc6
Modified Files:
buildtools/autogen/autogen/msc.py
Branch: Jul2015
Log Message:
Don't rely on default applications when calling a Python script.
diffs (21 lines):
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
@@ -841,7 +841,7 @@ def msc_library(fd, var, libmap, msc):
else:
fd.write("%s.lib: %s%s\n" % (ln, ln, dll))
fd.write("%s%s: $(%s_DEPS) \n" % (ln, dll, ln.replace('-','_')))
- fd.write('\t"$(TOPDIR)\\..\\NT\\wincompile.py" $(CC) $(CFLAGS) -LD
-Fe%s%s @<< /link @<<\n$(%s_OBJS)\n<<\n$(%s_LIBS)%s\n<<\n' % (ln, dll,
ln.replace('-','_'), ln.replace('-','_'), deffile))
+ fd.write('\tpython "$(TOPDIR)\\..\\NT\\wincompile.py" $(CC) $(CFLAGS)
-LD -Fe%s%s @<< /link @<<\n$(%s_OBJS)\n<<\n$(%s_LIBS)%s\n<<\n' % (ln, dll,
ln.replace('-','_'), ln.replace('-','_'), deffile))
fd.write("\tif exist [email protected] $(MT) -manifest [email protected]
-outputresource:$@;2\n");
if sep == '_':
fd.write('\tif not exist .libs $(MKDIR) .libs\n')
@@ -927,7 +927,7 @@ def msc_libs(fd, var, libsmap, msc):
ln = "lib" + sep + libname
fd.write(ln + ".lib: " + ln + ".dll\n")
fd.write(ln + ".dll: $(" + ln.replace('-','_') + "_DEPS)\n")
- fd.write('\t"$(TOPDIR)\\..\\NT\\wincompile.py" $(CC) $(CFLAGS) -LD
-Fe%s.dll $(%s_OBJS) /link @<<\n$(%s_LIBS)%s\n<<\n' % (ln, ln.replace('-','_'),
ln.replace('-','_'), deffile))
+ fd.write('\tpython "$(TOPDIR)\\..\\NT\\wincompile.py" $(CC) $(CFLAGS)
-LD -Fe%s.dll $(%s_OBJS) /link @<<\n$(%s_LIBS)%s\n<<\n' % (ln,
ln.replace('-','_'), ln.replace('-','_'), deffile))
fd.write("\tif exist [email protected] $(MT) -manifest [email protected]
-outputresource:$@;2\n");
if sep == '_':
fd.write('\tif not exist .libs $(MKDIR) .libs\n')
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
