Author: bodewig
Date: Mon Jun 12 21:20:25 2006
New Revision: 413804
URL: http://svn.apache.org/viewvc?rev=413804&view=rev
Log:
WiX task is no longer untested
Modified:
ant/core/trunk/docs/antlibs/dotnet/index.html
ant/core/trunk/docs/manual/CoreTasks/ant.html
ant/core/trunk/xdocs/antlibs/dotnet/index.xml
Modified: ant/core/trunk/docs/antlibs/dotnet/index.html
URL:
http://svn.apache.org/viewvc/ant/core/trunk/docs/antlibs/dotnet/index.html?rev=413804&r1=413803&r2=413804&view=diff
==============================================================================
--- ant/core/trunk/docs/antlibs/dotnet/index.html (original)
+++ ant/core/trunk/docs/antlibs/dotnet/index.html Mon Jun 12 21:20:25 2006
@@ -124,9 +124,8 @@
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&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">
<a name="Tasks"></a>
Tasks
@@ -153,6 +152,12 @@
</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
Modified: ant/core/trunk/docs/manual/CoreTasks/ant.html
URL:
http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/CoreTasks/ant.html?rev=413804&r1=413803&r2=413804&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/CoreTasks/ant.html (original)
+++ ant/core/trunk/docs/manual/CoreTasks/ant.html Mon Jun 12 21:20:25 2006
@@ -280,4 +280,4 @@
Reserved.</p>
</body>
-</html>
\ No newline at end of file
+</html>
Modified: ant/core/trunk/xdocs/antlibs/dotnet/index.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/xdocs/antlibs/dotnet/index.xml?rev=413804&r1=413803&r2=413804&view=diff
==============================================================================
--- ant/core/trunk/xdocs/antlibs/dotnet/index.xml (original)
+++ ant/core/trunk/xdocs/antlibs/dotnet/index.xml Mon Jun 12 21:20:25 2006
@@ -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&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 name="Tasks">
@@ -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">
@@ -143,4 +145,4 @@
</subsection>
</section>
</body>
-</document>
\ No newline at end of file
+</document>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
