ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/repos/AntTasks/source/net/douglasthrift/anttasks/Dex.java
(Generate patch)

Comparing AntTasks/source/net/douglasthrift/anttasks/Dex.java (file contents):
Revision 1108 by douglas, 2008-11-05T21:07:38-08:00 vs.
Revision 1109 by douglas, 2008-11-05T21:22:00-08:00

# Line 29 | Line 29 | import java.util.Iterator;
29   import org.apache.tools.ant.BuildException;
30   import org.apache.tools.ant.Task;
31   import org.apache.tools.ant.taskdefs.ExecTask;
32 + import org.apache.tools.ant.taskdefs.condition.Os;
33   import org.apache.tools.ant.types.FileSet;
34   import org.apache.tools.ant.types.ResourceCollection;
35   import org.apache.tools.ant.types.resources.FileResource;
# Line 161 | Line 162 | public class Dex extends Task
162                  ExecTask exec = (ExecTask)getProject().createTask("exec");
163  
164                  exec.setTaskName(getTaskName());
165 <                exec.setExecutable("dx");
165 >                exec.setExecutable(Os.isFamily(Os.FAMILY_WINDOWS) ? "dx.bat" : "dx");
166                  exec.setFailonerror(true);
167                  exec.createArg().setValue("--dex");
168  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines