Skip to content

Commit

Permalink
WiX task is no longer untested
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@413804 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
bodewig committed Jun 13, 2006
1 parent 0a3c856 commit eff144f
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 11 deletions.
11 changes: 8 additions & 3 deletions docs/antlibs/dotnet/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,8 @@ <h3 class="section">
other platform. Of course you can override these
assumptions.</p>
<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&amp;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&amp;SiteID=1">MSBuild</a>
and the <a href="http://wix.sf.net/">Wix</a> toolkit.</p>
<h3 class="section">
<a name="Tasks"></a>
Tasks
Expand All @@ -153,6 +152,12 @@ <h4 class="subsection">
</h4>
<p>Invokes MSBuild, either on an external file or a build file
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">
<a name="Examples"></a>
Examples
Expand Down
2 changes: 1 addition & 1 deletion docs/manual/CoreTasks/ant.html
Original file line number Diff line number Diff line change
Expand Up @@ -280,4 +280,4 @@ <h3>Examples</h3>
Reserved.</p>

</body>
</html>
</html>
16 changes: 9 additions & 7 deletions xdocs/antlibs/dotnet/index.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,9 @@
<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&amp;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&amp;SiteID=1">MSBuild</a>
and the <a href="http://wix.sf.net/">Wix</a> toolkit.</p>
</section>

<section name="Tasks">
Expand All @@ -67,6 +64,11 @@
<p>Invokes MSBuild, either on an external file or a build file
snippet contained inside your Ant build file.</p>
</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 name="Examples">
Expand Down Expand Up @@ -143,4 +145,4 @@ Total time: 0 seconds
</subsection>
</section>
</body>
</document>
</document>

0 comments on commit eff144f

Please sign in to comment.