From: Gert D. <dri...@us...> - 2007-01-13 13:04:52
|
Update of /cvsroot/nant/nant/src/NAnt.Console In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv29945/src/NAnt.Console Modified Files: App.config Log Message: Mono now comes with a 2.0 version of ilasm. Index: App.config =================================================================== RCS file: /cvsroot/nant/nant/src/NAnt.Console/App.config,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** App.config 12 Jan 2007 20:10:35 -0000 1.24 --- App.config 13 Jan 2007 13:04:46 -0000 1.25 *************** *** 604,607 **** --- 604,608 ---- <property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" /> <property name="resgen.tool" value="monoresgen" /> + <property name=ilasm.tool" value="ilasm" /> <property name="csc.supportsdocgeneration" value="false" /> *************** *** 643,646 **** --- 644,653 ---- <property name="resgen.tool" value="resgen" /> </if> + <!-- in Mono 1.2 (and higher), there's a 2.0 profile version of ilasm --> + <property name="ilasm.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0/ilasm.exe')}" /> + <if test="${not file::exists(ilasm.tool)}"> + <!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version --> + <property name="ilasm.tool" value="ilasm" /> + </if> <property name="csc.supportsdocgeneration" value="true" /> </if> *************** *** 736,740 **** </task> <task name="ilasm"> ! <attribute name="exename">ilasm</attribute> <attribute name="managed">true</attribute> </task> --- 743,747 ---- </task> <task name="ilasm"> ! <attribute name="exename">${ilasm.tool}</attribute> <attribute name="managed">true</attribute> </task> *************** *** 904,907 **** --- 911,915 ---- <property name="frameworkdirectory" value="${path::combine(prefix, 'bin')}" /> <property name="resgen.tool" value="monoresgen" /> + <property name="ilasm.tool" value="ilasm" /> <property name="csc.supportsdocgeneration" value="false" /> </if> *************** *** 923,926 **** --- 931,940 ---- <property name="resgen.tool" value="resgen" /> </if> + <!-- in Mono 1.2 (and higher), there's a 2.0 profile version of ilasm --> + <property name="ilasm.tool" value="${path::combine(prefix, 'lib/mono/2.0/ilasm.exe')}" /> + <if test="${not file::exists(ilasm.tool)}"> + <!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version --> + <property name="ilasm.tool" value="ilasm" /> + </if> <property name="csc.supportsdocgeneration" value="true" /> </if> *************** *** 959,963 **** </task> <task name="ilasm"> ! <attribute name="exename">ilasm</attribute> <attribute name="managed">true</attribute> </task> --- 973,977 ---- </task> <task name="ilasm"> ! <attribute name="exename">${ilasm.tool}</attribute> <attribute name="managed">true</attribute> </task> |