summaryrefslogtreecommitdiff
path: root/java/ant/Slice2JavaTask.java
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2003-08-15 20:54:40 +0000
committerBenoit Foucher <benoit@zeroc.com>2003-08-15 20:54:40 +0000
commit9d19d0cc9ae3d71d2bac4c858696499c3173331a (patch)
tree443faec1d53d2d085b55c429400ff67497f0946a /java/ant/Slice2JavaTask.java
parentminor (diff)
downloadice-9d19d0cc9ae3d71d2bac4c858696499c3173331a.tar.bz2
ice-9d19d0cc9ae3d71d2bac4c858696499c3173331a.tar.xz
ice-9d19d0cc9ae3d71d2bac4c858696499c3173331a.zip
Merged R1_1_branch.
Diffstat (limited to 'java/ant/Slice2JavaTask.java')
-rw-r--r--java/ant/Slice2JavaTask.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/java/ant/Slice2JavaTask.java b/java/ant/Slice2JavaTask.java
index 79ae2d16cdb..f0f824cfc25 100644
--- a/java/ant/Slice2JavaTask.java
+++ b/java/ant/Slice2JavaTask.java
@@ -271,18 +271,24 @@ public class Slice2JavaTask extends SliceTask
cmd.append(f.toString());
}
+ //
+ // It's not possible anymore to re-use the same output property since Ant 1.5.x. so we use a
+ // unique property name here. Perhaps we should output the dependencies to a file instead.
+ //
+ final String outputProperty = "slice2java.depend." + System.currentTimeMillis();
+
task = (ExecTask)project.createTask("exec");
task.setFailonerror(true);
arg = task.createArg();
arg.setLine(cmd.toString());
task.setExecutable(_translator.toString());
- task.setOutputproperty("slice2java.depend");
+ task.setOutputproperty(outputProperty);
task.execute();
//
// Update dependency file.
//
- java.util.List newDependencies = parseDependencies(project.getProperty("slice2java.depend"));
+ java.util.List newDependencies = parseDependencies(project.getProperty(outputProperty));
p = newDependencies.iterator();
while(p.hasNext())
{