Update of /cvsroot/monetdb/buildtools/autogen/autogen
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10636
Modified Files:
Tag: MonetDB_1-20
msc.py
Log Message:
Use the correct extension when a conditional is combined with a .pyd
file.
Don't use PWD as batch script variable since it may conflict with an
environment variable PWD when the script is called from a shell.
Index: msc.py
===================================================================
RCS file: /cvsroot/monetdb/buildtools/autogen/autogen/msc.py,v
retrieving revision 1.35.2.5
retrieving revision 1.35.2.6
diff -u -d -r1.35.2.5 -r1.35.2.6
--- msc.py 30 Oct 2007 13:13:24 -0000 1.35.2.5
+++ msc.py 31 Oct 2007 13:08:47 -0000 1.35.2.6
@@ -770,7 +770,7 @@
condname = 'defined(' + ') && defined('.join(libmap['COND']) + ')'
mkname = (pref + v).replace('.', '_').replace('-', '_')
fd.write('!IF %s\n' % condname)
- fd.write('C_%s_dll = %s%s.dll\n' % (mkname, pref, v))
+ 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)
@@ -1000,9 +1000,9 @@
# can get hold of the full path name of the current working
# directory
fd.write("callant%d.bat:\n" % callantno)
- fd.write("\techo @set PWD=%%~dp0>callant%d.bat\n" % callantno)
- fd.write("\techo @set PWD=%%PWD:~0,-1%%>>callant%d.bat\n" % callantno)
- fd.write("\techo @$(ANT) -d -f $(SRCDIR)\\build.xml \"-Dbuilddir=%%PWD%%\"
\"-Djardir=%%PWD%%\" %s>>callant%d.bat\n" % (target, callantno))
+ fd.write("\techo @set thisdir=%%~dp0>callant%d.bat\n" % callantno)
+ fd.write("\techo @set thisdir=%%thisdir:~0,-1%%>>callant%d.bat\n" %
callantno)
+ fd.write("\techo @$(ANT) -d -f $(SRCDIR)\\build.xml
\"-Dbuilddir=%%thisdir%%\" \"-Djardir=%%thisdir%%\" %s>>callant%d.bat\n" %
(target, callantno))
fd.write("%s_ant_target: callant%d.bat\n" % (target, callantno))
fd.write("\tcallant%d.bat\n" % callantno)
callantno = callantno + 1
-------------------------------------------------------------------------
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
