summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2008-04-29 17:18:27 -0700
committerMark Spruiell <mes@zeroc.com>2008-04-29 17:18:27 -0700
commit1722d923fb26fa7cd96c60d6cba102fabff49043 (patch)
tree7eb573e337a0eae8d505e24f7512f1657aa5d45e /java
parentbug 3031 - remove isprint from converter demo (diff)
downloadice-1722d923fb26fa7cd96c60d6cba102fabff49043.tar.bz2
ice-1722d923fb26fa7cd96c60d6cba102fabff49043.tar.xz
ice-1722d923fb26fa7cd96c60d6cba102fabff49043.zip
bug 3037 - ant task should recompile all files when using checksums
Diffstat (limited to 'java')
-rw-r--r--java/src/ant/Slice2JavaTask.java20
1 files changed, 19 insertions, 1 deletions
diff --git a/java/src/ant/Slice2JavaTask.java b/java/src/ant/Slice2JavaTask.java
index 34dc7e4ca8a..0bb80f1975a 100644
--- a/java/src/ant/Slice2JavaTask.java
+++ b/java/src/ant/Slice2JavaTask.java
@@ -118,6 +118,7 @@ public class Slice2JavaTask extends SliceTask
// last updated or a slice file it depends on changed).
//
java.util.Vector buildList = new java.util.Vector();
+ java.util.Vector skipList = new java.util.Vector();
java.util.Iterator p = _fileSets.iterator();
while(p.hasNext())
{
@@ -137,7 +138,24 @@ public class Slice2JavaTask extends SliceTask
}
else
{
- log("skipping " + files[i]);
+ skipList.addElement(slice);
+ }
+ }
+
+ if(_checksum != null && _checksum.length() > 0 && !buildList.isEmpty())
+ {
+ //
+ // Recompile all Slice files when checksums are used.
+ //
+ buildList.addAll(skipList);
+ }
+ else
+ {
+ java.util.Iterator i = skipList.iterator();
+ while(i.hasNext())
+ {
+ File file = (File)i.next();
+ log("skipping " + file.getName());
}
}
}