svn commit: r1061898 - in /ant/antlibs/dotnet/trunk: changes.xml contributors.xml docs/wix.html src/main/org/apache/ant/dotnet/wix/WixTask.java

[bodewig]

Author: bodewig
Date: Fri Jan 21 16:48:16 2011
New Revision: 1061898

URL: http://svn.apache.org/viewvc?rev=1061898&view=rev
Log:
Add an option to use lit.exe from the WiX toolset instead of light.exe.  PR 
47254.  Submitted by zhihengz

Modified:
    ant/antlibs/dotnet/trunk/changes.xml
    ant/antlibs/dotnet/trunk/contributors.xml
    ant/antlibs/dotnet/trunk/docs/wix.html
    ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/wix/WixTask.java

Modified: ant/antlibs/dotnet/trunk/changes.xml
URL: 
http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/changes.xml?rev=1061898&r1=1061897&r2=1061898&view=diff
==============================================================================
--- ant/antlibs/dotnet/trunk/changes.xml (original)
+++ ant/antlibs/dotnet/trunk/changes.xml Fri Jan 21 16:48:16 2011
@@ -38,6 +38,10 @@
     </properties>
 
     <release version="SVN trunk" date="unpublished">
+      <action type="add" issue="47254">
+        The wix task has an option to run lit.exe rather than
+        light.exe now.
+      </action>
       <action type="update" breaks-bwc="true">
         The C# compiler uses gmcs on Mono by default now.
       </action>

Modified: ant/antlibs/dotnet/trunk/contributors.xml
URL: 
http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/contributors.xml?rev=1061898&r1=1061897&r2=1061898&view=diff
==============================================================================
--- ant/antlibs/dotnet/trunk/contributors.xml (original)
+++ ant/antlibs/dotnet/trunk/contributors.xml Fri Jan 21 16:48:16 2011
@@ -90,4 +90,7 @@
     <first>Steve</first>
     <last>Loughran</last>
   </name>
+  <name>
+    <first>zhihengz</first>
+  </name>
 </contributors>

Modified: ant/antlibs/dotnet/trunk/docs/wix.html
URL: 
http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/docs/wix.html?rev=1061898&r1=1061897&r2=1061898&view=diff
==============================================================================
--- ant/antlibs/dotnet/trunk/docs/wix.html (original)
+++ ant/antlibs/dotnet/trunk/docs/wix.html Fri Jan 21 16:48:16 2011
@@ -28,9 +28,9 @@
 
     <h3>Description</h3>
 
-    <p>Runs candle or light from the <a
-    href="http://sourceforge.net/projects/wix";>Wix</a> toolset - or
-    both of them in sequence.</p>
+    <p>Runs candle or light/lit from the
+      <a href="http://wixtoolset.org/";>Wix</a> toolset - or
+      both of them in sequence.</p>
 
     <h3>Parameters</h3>
     <table border="1" cellpadding="2" cellspacing="0">
@@ -77,6 +77,12 @@
         <td align="center">No - Ant will candle have its way and use
           the current working directory if omitted.</td>
       </tr>
+      <tr>
+        <td valign="top">useLit</td>
+        <td valign="top">Whether to use lit.exe rather than
+          light.exe.  <em>since .NET Antlib 1.1</em></td>
+        <td align="center">No, default is &quot;false&quot;.</td>
+      </tr>
     </table>
 
     <h3>Parameters specified as nested elements</h3>

Modified: 
ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/wix/WixTask.java
URL: 
http://svn.apache.org/viewvc/ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/wix/WixTask.java?rev=1061898&r1=1061897&r2=1061898&view=diff
==============================================================================
--- ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/wix/WixTask.java 
(original)
+++ ant/antlibs/dotnet/trunk/src/main/org/apache/ant/dotnet/wix/WixTask.java 
Fri Jan 21 16:48:16 2011
@@ -104,6 +104,11 @@ public class WixTask extends Task {
      */
     private ArrayList lightParameters = new ArrayList();
 
+    /**
+     * Whether to use lit.exe rather than light.exe.
+     */
+    private boolean useLit = false;
+
     public WixTask() {
         super();
     }
@@ -216,6 +221,15 @@ public class WixTask extends Task {
         return candleCmdl.createArgument();
     }
 
+    /**
+     * Instructs the task to use lit.exe rather than light.exe as "compiler".
+     *
+     * @since .NET Antlib 1.1
+     */
+    public void setUseLit(boolean b) {
+        useLit = b;
+    }
+
     public void execute() {
         if (source == null && sources.size() == 0) {
             throw new BuildException("You must specify at least one source"
@@ -319,7 +333,7 @@ public class WixTask extends Task {
      * Run light passing all files of the collection on the command line.
      */
     private void runLight(Collection s) {
-        run(wixExecutable("light.exe"), s, target, null,
+        run(wixExecutable(useLit ? "lit.exe" : "light.exe"), s, target, null,
             lightParameters, lightCmdl);
     }