diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2002-03-12 16:52:38 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2002-03-12 16:52:38 +0000 |
| commit | 229b505218af79219e2982b6547dcd0c02db8294 (patch) | |
| tree | 85591b8279dbd2a235fbf02678296bb9f1d9cdca /java/ant/Slice2FreezeJTask.java | |
| parent | another trivial bug fix (diff) | |
| download | ice-229b505218af79219e2982b6547dcd0c02db8294.tar.bz2 ice-229b505218af79219e2982b6547dcd0c02db8294.tar.xz ice-229b505218af79219e2982b6547dcd0c02db8294.zip | |
First version of demo/Freeze/bench.
Diffstat (limited to 'java/ant/Slice2FreezeJTask.java')
| -rw-r--r-- | java/ant/Slice2FreezeJTask.java | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/java/ant/Slice2FreezeJTask.java b/java/ant/Slice2FreezeJTask.java index 8c274ac2654..fe360eb93dd 100644 --- a/java/ant/Slice2FreezeJTask.java +++ b/java/ant/Slice2FreezeJTask.java @@ -144,20 +144,23 @@ public class Slice2FreezeJTask extends org.apache.tools.ant.Task // // Determine if the output file needs to be created. // - DirectoryScanner scanner = _fileSet.getDirectoryScanner(project); - String[] files = scanner.getIncludedFiles(); - + boolean build = false; java.util.List sliceFiles = new java.util.LinkedList(); - for (int i = 0; i < files.length; i++) + + if (_fileSet != null) { - File slice = new File(_fileSet.getDir(project), files[i]); - sliceFiles.add(slice); + DirectoryScanner scanner = _fileSet.getDirectoryScanner(project); + String[] files = scanner.getIncludedFiles(); + + for (int i = 0; i < files.length; i++) + { + File slice = new File(_fileSet.getDir(project), files[i]); + sliceFiles.add(slice); + } } - + java.util.List tagFiles = new java.util.LinkedList(); - - boolean build = false; - + java.util.Iterator p = _dicts.iterator(); while (p.hasNext()) { @@ -168,7 +171,7 @@ public class Slice2FreezeJTask extends org.apache.tools.ant.Task // File tag = new File(_tagDir, "." + ((Dict)p.next()).getName() + ".tag"); tagFiles.add(tag); - + if (!build) { if (!tag.exists()) @@ -176,6 +179,7 @@ public class Slice2FreezeJTask extends org.apache.tools.ant.Task build = true; continue; } + java.util.Iterator q = sliceFiles.iterator(); while (q.hasNext()) { |