git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@413804 13f79535-47bb-0310-9956-ffa450edef68master
| @@ -124,9 +124,8 @@ | |||||
| other platform. Of course you can override these | other platform. Of course you can override these | ||||
| assumptions.</p> | assumptions.</p> | ||||
| <p>Based on this a few tasks to run well known .NET utilities | <p>Based on this a few tasks to run well known .NET utilities | ||||
| from within Ant are provided, namely tasks to run <a href="http://www.nunit.org/">NUnit</a>, <a href="http://nant.sf.net/">NAnt</a> and <a href="http://forums.microsoft.com/MSDN/ShowForum.aspx?ForumID=27&SiteID=1">MSBuild</a>.</p> | |||||
| <p>There also is some experimental <a href="http://wix.sf.net/">Wix</a> task, but it probably doesn't | |||||
| do anything useful at all.</p> | |||||
| from within Ant are provided, namely tasks to run <a href="http://www.nunit.org/">NUnit</a>, <a href="http://nant.sf.net/">NAnt</a>, <a href="http://forums.microsoft.com/MSDN/ShowForum.aspx?ForumID=27&SiteID=1">MSBuild</a> | |||||
| and the <a href="http://wix.sf.net/">Wix</a> toolkit.</p> | |||||
| <h3 class="section"> | <h3 class="section"> | ||||
| <a name="Tasks"></a> | <a name="Tasks"></a> | ||||
| Tasks | Tasks | ||||
| @@ -153,6 +152,12 @@ | |||||
| </h4> | </h4> | ||||
| <p>Invokes MSBuild, either on an external file or a build file | <p>Invokes MSBuild, either on an external file or a build file | ||||
| snippet contained inside your Ant build file.</p> | snippet contained inside your Ant build file.</p> | ||||
| <h4 class="subsection"> | |||||
| <a name="wix"></a> | |||||
| wix | |||||
| </h4> | |||||
| <p>Invokes the candle and light executables of the WiX toolkit | |||||
| in order to create MSI installers from within Ant.</p> | |||||
| <h3 class="section"> | <h3 class="section"> | ||||
| <a name="Examples"></a> | <a name="Examples"></a> | ||||
| Examples | Examples | ||||
| @@ -280,4 +280,4 @@ new project using the id <code>path2</code>.</p> | |||||
| Reserved.</p> | Reserved.</p> | ||||
| </body> | </body> | ||||
| </html> | |||||
| </html> | |||||
| @@ -41,12 +41,9 @@ | |||||
| <p>Based on this a few tasks to run well known .NET utilities | <p>Based on this a few tasks to run well known .NET utilities | ||||
| from within Ant are provided, namely tasks to run <a | from within Ant are provided, namely tasks to run <a | ||||
| href="http://www.nunit.org/">NUnit</a>, <a | href="http://www.nunit.org/">NUnit</a>, <a | ||||
| href="http://nant.sf.net/">NAnt</a> and <a | |||||
| href="http://forums.microsoft.com/MSDN/ShowForum.aspx?ForumID=27&SiteID=1">MSBuild</a>.</p> | |||||
| <p>There also is some experimental <a | |||||
| href="http://wix.sf.net/">Wix</a> task, but it probably doesn't | |||||
| do anything useful at all.</p> | |||||
| href="http://nant.sf.net/">NAnt</a>, <a | |||||
| href="http://forums.microsoft.com/MSDN/ShowForum.aspx?ForumID=27&SiteID=1">MSBuild</a> | |||||
| and the <a href="http://wix.sf.net/">Wix</a> toolkit.</p> | |||||
| </section> | </section> | ||||
| <section name="Tasks"> | <section name="Tasks"> | ||||
| @@ -67,6 +64,11 @@ | |||||
| <p>Invokes MSBuild, either on an external file or a build file | <p>Invokes MSBuild, either on an external file or a build file | ||||
| snippet contained inside your Ant build file.</p> | snippet contained inside your Ant build file.</p> | ||||
| </subsection> | </subsection> | ||||
| <subsection name="wix"> | |||||
| <p>Invokes the candle and light executables of the WiX toolkit | |||||
| in order to create MSI installers from within Ant.</p> | |||||
| </subsection> | |||||
| </section> | </section> | ||||
| <section name="Examples"> | <section name="Examples"> | ||||
| @@ -143,4 +145,4 @@ Total time: 0 seconds | |||||
| </subsection> | </subsection> | ||||
| </section> | </section> | ||||
| </body> | </body> | ||||
| </document> | |||||
| </document> | |||||