|
From: <exo...@us...> - 2006-10-04 00:48:48
|
Revision: 2574
http://svn.sourceforge.net/ccnet/?rev=2574&view=rev
Author: exortech
Date: 2006-10-02 22:42:24 -0700 (Mon, 02 Oct 2006)
Log Message:
-----------
upgrading to nant 0.85 rc4
Modified Paths:
--------------
trunk/tools/nant/NAnt.CompressionTasks.dll
trunk/tools/nant/NAnt.Core.dll
trunk/tools/nant/NAnt.DotNetTasks.dll
trunk/tools/nant/NAnt.MSNetTasks.dll
trunk/tools/nant/NAnt.NUnit.dll
trunk/tools/nant/NAnt.NUnit1Tasks.dll
trunk/tools/nant/NAnt.NUnit2Tasks.dll
trunk/tools/nant/NAnt.SourceControlTasks.dll
trunk/tools/nant/NAnt.VSNetTasks.dll
trunk/tools/nant/NAnt.VisualCppTasks.dll
trunk/tools/nant/NAnt.Win32Tasks.dll
trunk/tools/nant/NDoc.Documenter.NAnt.dll
trunk/tools/nant/lib/mono/1.0/nunit.core.dll
trunk/tools/nant/lib/mono/1.0/nunit.framework.dll
trunk/tools/nant/lib/mono/1.0/nunit.util.dll
trunk/tools/nant/lib/mono/2.0/nunit.core.dll
trunk/tools/nant/lib/mono/2.0/nunit.framework.dll
trunk/tools/nant/lib/mono/2.0/nunit.util.dll
trunk/tools/nant/lib/net/1.0/nunit.core.dll
trunk/tools/nant/lib/net/1.0/nunit.framework.dll
trunk/tools/nant/lib/net/1.0/nunit.util.dll
trunk/tools/nant/lib/net/1.1/nunit.core.dll
trunk/tools/nant/lib/net/1.1/nunit.framework.dll
trunk/tools/nant/lib/net/1.1/nunit.util.dll
trunk/tools/nant/lib/net/2.0/nunit.core.dll
trunk/tools/nant/lib/net/2.0/nunit.framework.dll
trunk/tools/nant/lib/net/2.0/nunit.util.dll
trunk/tools/nant/nant.exe
trunk/tools/nant/nant.exe.config
Removed Paths:
-------------
trunk/tools/nant/NAnt.Resources.dll
trunk/tools/nant/log4net.dll
Modified: trunk/tools/nant/NAnt.CompressionTasks.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/NAnt.Core.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/NAnt.DotNetTasks.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/NAnt.MSNetTasks.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/NAnt.NUnit.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/NAnt.NUnit1Tasks.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/NAnt.NUnit2Tasks.dll
===================================================================
(Binary files differ)
Deleted: trunk/tools/nant/NAnt.Resources.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/NAnt.SourceControlTasks.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/NAnt.VSNetTasks.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/NAnt.VisualCppTasks.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/NAnt.Win32Tasks.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/NDoc.Documenter.NAnt.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/lib/mono/1.0/nunit.core.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/lib/mono/1.0/nunit.framework.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/lib/mono/1.0/nunit.util.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/lib/mono/2.0/nunit.core.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/lib/mono/2.0/nunit.framework.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/lib/mono/2.0/nunit.util.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/lib/net/1.0/nunit.core.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/lib/net/1.0/nunit.framework.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/lib/net/1.0/nunit.util.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/lib/net/1.1/nunit.core.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/lib/net/1.1/nunit.framework.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/lib/net/1.1/nunit.util.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/lib/net/2.0/nunit.core.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/lib/net/2.0/nunit.framework.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/lib/net/2.0/nunit.util.dll
===================================================================
(Binary files differ)
Deleted: trunk/tools/nant/log4net.dll
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/nant.exe
===================================================================
(Binary files differ)
Modified: trunk/tools/nant/nant.exe.config
===================================================================
--- trunk/tools/nant/nant.exe.config 2006-10-02 15:42:05 UTC (rev 2573)
+++ trunk/tools/nant/nant.exe.config 2006-10-03 05:42:24 UTC (rev 2574)
@@ -204,6 +204,8 @@
<attribute name="supportswarnaserrorlist">true</attribute>
<attribute name="supportskeycontainer">true</attribute>
<attribute name="supportskeyfile">true</attribute>
+ <attribute name="supportsplatform">true</attribute>
+ <attribute name="supportslangversion">true</attribute>
</task>
<task name="vbc">
<attribute name="exename">vbc</attribute>
@@ -212,9 +214,11 @@
<attribute name="supportsdocgeneration">true</attribute>
<attribute name="supportskeycontainer">true</attribute>
<attribute name="supportskeyfile">true</attribute>
+ <attribute name="supportsplatform">true</attribute>
</task>
<task name="jsc">
<attribute name="exename">jsc</attribute>
+ <attribute name="supportsplatform">true</attribute>
</task>
<task name="vjc">
<attribute name="exename">vjc</attribute>
@@ -284,6 +288,8 @@
<attribute name="supportswarnaserrorlist">true</attribute>
<attribute name="supportskeycontainer">true</attribute>
<attribute name="supportskeyfile">true</attribute>
+ <attribute name="supportsplatform">true</attribute>
+ <attribute name="supportslangversion">true</attribute>
</task>
<task name="vbc">
<attribute name="exename">vbc</attribute>
@@ -292,9 +298,11 @@
<attribute name="supportsdocgeneration">true</attribute>
<attribute name="supportskeycontainer">true</attribute>
<attribute name="supportskeyfile">true</attribute>
+ <attribute name="supportsplatform">true</attribute>
</task>
<task name="jsc">
<attribute name="exename">jsc</attribute>
+ <attribute name="supportsplatform">true</attribute>
</task>
<task name="vjc">
<attribute name="exename">vjc</attribute>
@@ -364,6 +372,8 @@
<attribute name="supportswarnaserrorlist">true</attribute>
<attribute name="supportskeycontainer">true</attribute>
<attribute name="supportskeyfile">true</attribute>
+ <attribute name="supportsplatform">true</attribute>
+ <attribute name="supportslangversion">true</attribute>
</task>
<task name="vbc">
<attribute name="exename">vbc</attribute>
@@ -372,9 +382,11 @@
<attribute name="supportsdocgeneration">true</attribute>
<attribute name="supportskeycontainer">true</attribute>
<attribute name="supportskeyfile">true</attribute>
+ <attribute name="supportsplatform">true</attribute>
</task>
<task name="jsc">
<attribute name="exename">jsc</attribute>
+ <attribute name="supportsplatform">true</attribute>
</task>
<task name="vjc">
<attribute name="exename">vjc</attribute>
@@ -464,6 +476,65 @@
</task>
</tasks>
</framework>
+ <framework
+ name="netcf-2.0"
+ family="netcf"
+ version="2.0"
+ description="Microsoft .NET Compact Framework 2.0"
+ runtimeengine=""
+ sdkdirectory="${path::combine(sdkInstallRoot, 'v1.0.5000\bin')}"
+ frameworkdirectory="${path::combine(installRoot, 'v2.0.50727')}"
+ frameworkassemblydirectory="${path::combine(sdkInstallRoot, 'WindowsCE')}"
+ clrversion="2.0.0"
+ >
+ <task-assemblies>
+ <!-- this is not a supported runtime framework -->
+ </task-assemblies>
+ <project>
+ <readregistry
+ property="installRoot"
+ key="SOFTWARE\Microsoft\.NETFramework\InstallRoot"
+ hive="LocalMachine" />
+ <readregistry
+ property="sdkInstallRoot"
+ key="SOFTWARE\Microsoft\.NETCompactFramework\v2.0.0.0\InstallRoot\"
+ hive="LocalMachine" />
+ <readregistry
+ property="sdkInstallRoot.DesktopFramework"
+ key="SOFTWARE\Microsoft\.NETFramework\sdkInstallRootv2.0"
+ hive="LocalMachine" />
+ <fail if="${not directory::exists(sdkInstallRoot.DesktopFramework)}">The .NET Framework 2.0 SDK is not installed.</fail>
+ </project>
+ <tasks>
+ <task name="csc">
+ <attribute name="exename">csc</attribute>
+ <attribute name="noconfig">true</attribute>
+ <attribute name="nostdlib">true</attribute>
+ <attribute name="supportsnowarnlist">true</attribute>
+ </task>
+ <task name="vbc">
+ <attribute name="exename">vbc</attribute>
+ </task>
+ <task name="resgen">
+ <attribute name="exename">cfresgen</attribute>
+ </task>
+ <task name="al">
+ <attribute name="exename">al</attribute>
+ </task>
+ <task name="delay-sign">
+ <attribute name="exename">sn</attribute>
+ </task>
+ <task name="license">
+ <attribute name="exename">${path::combine(sdkInstallRoot.DesktopFramework, 'bin/lc.exe')}</attribute>
+ </task>
+ <task name="ilasm">
+ <attribute name="exename">ilasm</attribute>
+ </task>
+ <task name="ildasm">
+ <attribute name="exename">ildasm</attribute>
+ </task>
+ </tasks>
+ </framework>
<framework
name="mono-1.0"
family="mono"
@@ -506,6 +577,10 @@
<property name="sdkDirectory" value="${frameworkAssemblyDirectory}" />
<property name="runtimeEngine" value="${path::combine(frameworkAssemblyDirectory, 'mono.exe')}" />
<property name="resgen.tool" value="monoresgen" />
+ <!-- in Mono 1.0.x, only mcs and mbas are located in <install root>\lib\mono\<profile> -->
+ <property name="csc.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mcs.exe')}" />
+ <property name="mbas.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mbas.exe')}" />
+ <!-- /doc is not supported in Mono 1.0.x -->
<property name="csc.supportsdocgeneration" value="false" />
<!--
@@ -532,7 +607,9 @@
<property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
</if>
<property name="resgen.tool" value="resgen" />
+ <property name="csc.tool" value="mcs" />
<property name="csc.supportsdocgeneration" value="true" />
+ <property name="mbas.tool" value="mbas" />
</if>
<target name="configure-from-pkg-config">
@@ -598,16 +675,17 @@
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="csc">
- <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mcs.exe')}</attribute>
+ <attribute name="exename">${csc.tool}</attribute>
<attribute name="useruntimeengine">true</attribute>
<attribute name="supportspackagereferences">true</attribute>
<attribute name="supportsnowarnlist">true</attribute>
<attribute name="supportsdocgeneration">${csc.supportsdocgeneration}</attribute>
<attribute name="supportskeycontainer">true</attribute>
<attribute name="supportskeyfile">true</attribute>
+ <attribute name="supportslangversion">true</attribute>
</task>
<task name="vbc">
- <attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mbas.exe')}</attribute>
+ <attribute name="exename">${mbas.tool}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
<task name="resgen">
@@ -703,7 +781,12 @@
<if test="${not file::exists(runtimeEngine)}">
<property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
</if>
- <property name="resgen.tool" value="resgen" />
+ <!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
+ <property name="resgen.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0/resgen.exe')}" />
+ <if test="${not file::exists(resgen.tool)}">
+ <!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
+ <property name="resgen.tool" value="resgen" />
+ </if>
<property name="csc.supportsdocgeneration" value="true" />
</if>
@@ -777,8 +860,10 @@
<attribute name="supportsdocgeneration">${csc.supportsdocgeneration}</attribute>
<attribute name="supportskeycontainer">true</attribute>
<attribute name="supportskeyfile">true</attribute>
+ <attribute name="supportslangversion">true</attribute>
</task>
<task name="vbc">
+ <!-- there is no mbas for the 2.0 profile yet -->
<attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
@@ -875,7 +960,12 @@
<if test="${not file::exists(runtimeEngine)}">
<property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
</if>
- <property name="resgen.tool" value="resgen" />
+ <!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
+ <property name="resgen.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0/resgen.exe')}" />
+ <if test="${not file::exists(resgen.tool)}">
+ <!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
+ <property name="resgen.tool" value="resgen" />
+ </if>
<property name="csc.supportsdocgeneration" value="true" />
</if>
@@ -949,8 +1039,10 @@
<attribute name="supportsdocgeneration">${csc.supportsdocgeneration}</attribute>
<attribute name="supportskeycontainer">true</attribute>
<attribute name="supportskeyfile">true</attribute>
+ <attribute name="supportslangversion">true</attribute>
</task>
<task name="vbc">
+ <!-- there is no mbas for the 2.0 profile yet -->
<attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
@@ -1047,7 +1139,12 @@
<if test="${not file::exists(runtimeEngine)}">
<property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
</if>
- <property name="resgen.tool" value="resgen" />
+ <!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
+ <property name="resgen.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/2.0/resgen.exe')}" />
+ <if test="${not file::exists(resgen.tool)}">
+ <!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
+ <property name="resgen.tool" value="resgen" />
+ </if>
<property name="csc.supportsdocgeneration" value="true" />
</if>
@@ -1121,8 +1218,10 @@
<attribute name="supportsdocgeneration">${csc.supportsdocgeneration}</attribute>
<attribute name="supportskeycontainer">true</attribute>
<attribute name="supportskeyfile">true</attribute>
+ <attribute name="supportslangversion">true</attribute>
</task>
<task name="vbc">
+ <!-- there is no mbas for the 2.0 profile yet -->
<attribute name="exename">${path::combine(frameworkAssemblyDirectory, 'mono/1.0/mbas.exe')}</attribute>
<attribute name="useruntimeengine">true</attribute>
</task>
@@ -1257,6 +1356,7 @@
<attribute name="supportsdocgeneration">${csc.supportsdocgeneration}</attribute>
<attribute name="supportskeycontainer">true</attribute>
<attribute name="supportskeyfile">true</attribute>
+ <attribute name="supportslangversion">true</attribute>
</task>
<task name="vbc">
<attribute name="exename">${path::combine(prefix, 'lib/mono/1.0/mbas.exe')}</attribute>
@@ -1317,7 +1417,12 @@
use the 1.0 profile version
-->
<property name="frameworkdirectory" value="${path::combine(prefix, 'lib/mono/1.0')}" />
- <property name="resgen.tool" value="resgen" />
+ <!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
+ <property name="resgen.tool" value="${path::combine(prefix, 'lib/mono/2.0/resgen.exe')}" />
+ <if test="${not file::exists(resgen.tool)}">
+ <!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
+ <property name="resgen.tool" value="resgen" />
+ </if>
<property name="csc.supportsdocgeneration" value="true" />
</if>
</project>
@@ -1334,6 +1439,7 @@
<attribute name="supportsdocgeneration">${csc.supportsdocgeneration}</attribute>
<attribute name="supportskeycontainer">true</attribute>
<attribute name="supportskeyfile">true</attribute>
+ <attribute name="supportslangversion">true</attribute>
</task>
<task name="vbc">
<!-- there is no mbas for the 2.0 profile yet -->
@@ -1395,7 +1501,12 @@
use the 1.0 profile version
-->
<property name="frameworkdirectory" value="${path::combine(prefix, 'lib/mono/1.0')}" />
- <property name="resgen.tool" value="resgen" />
+ <!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
+ <property name="resgen.tool" value="${path::combine(prefix, 'lib/mono/2.0/resgen.exe')}" />
+ <if test="${not file::exists(resgen.tool)}">
+ <!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
+ <property name="resgen.tool" value="resgen" />
+ </if>
<property name="csc.supportsdocgeneration" value="true" />
</if>
</project>
@@ -1412,6 +1523,7 @@
<attribute name="supportsdocgeneration">${csc.supportsdocgeneration}</attribute>
<attribute name="supportskeycontainer">true</attribute>
<attribute name="supportskeyfile">true</attribute>
+ <attribute name="supportslangversion">true</attribute>
</task>
<task name="vbc">
<!-- there is no mbas for the 2.0 profile yet -->
@@ -1473,7 +1585,12 @@
use the 1.0 profile version
-->
<property name="frameworkdirectory" value="${path::combine(prefix, 'lib/mono/1.0')}" />
- <property name="resgen.tool" value="resgen" />
+ <!-- in Mono 1.2 (and higher), there's a 2.0 profile version of resgen -->
+ <property name="resgen.tool" value="${path::combine(prefix, 'lib/mono/2.0/resgen.exe')}" />
+ <if test="${not file::exists(resgen.tool)}">
+ <!-- if the 2.0 profile version does not exist, then fallback to the 1.0 profile version -->
+ <property name="resgen.tool" value="resgen" />
+ </if>
<property name="csc.supportsdocgeneration" value="true" />
</if>
</project>
@@ -1490,6 +1607,7 @@
<attribute name="supportsdocgeneration">${csc.supportsdocgeneration}</attribute>
<attribute name="supportskeycontainer">true</attribute>
<attribute name="supportskeyfile">true</attribute>
+ <attribute name="supportslangversion">true</attribute>
</task>
<task name="vbc">
<!-- there is no mbas for the 2.0 profile yet -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|