diff options
| author | Mark Spruiell <mes@zeroc.com> | 2006-05-23 23:19:38 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2006-05-23 23:19:38 +0000 |
| commit | 3b62d85e3cc7e318ed09cdda3c753042592251b2 (patch) | |
| tree | a11d616329529e777238ede48e2cb85bae667366 /java/ant/Slice2FreezeJTask.java | |
| parent | adding Java5 mapping; changing to use import (diff) | |
| download | ice-3b62d85e3cc7e318ed09cdda3c753042592251b2.tar.bz2 ice-3b62d85e3cc7e318ed09cdda3c753042592251b2.tar.xz ice-3b62d85e3cc7e318ed09cdda3c753042592251b2.zip | |
adding --meta option
Diffstat (limited to 'java/ant/Slice2FreezeJTask.java')
| -rw-r--r-- | java/ant/Slice2FreezeJTask.java | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/java/ant/Slice2FreezeJTask.java b/java/ant/Slice2FreezeJTask.java index 40bd3016c38..4b93f652a99 100644 --- a/java/ant/Slice2FreezeJTask.java +++ b/java/ant/Slice2FreezeJTask.java @@ -123,12 +123,12 @@ public class Slice2FreezeJTask extends SliceTask { FileSet fileset = (FileSet)p.next(); - DirectoryScanner scanner = fileset.getDirectoryScanner(project); + DirectoryScanner scanner = fileset.getDirectoryScanner(getProject()); String[] files = scanner.getIncludedFiles(); for(int i = 0; i < files.length; i++) { - File slice = new File(fileset.getDir(project), files[i]); + File slice = new File(fileset.getDir(getProject()), files[i]); sliceFiles.add(slice); if(!build) @@ -149,7 +149,7 @@ public class Slice2FreezeJTask extends SliceTask if(!build) { // - // Check that each dictionnary has been built at least + // Check that each dictionary has been built at least // once. // p = _dicts.iterator(); @@ -229,8 +229,6 @@ public class Slice2FreezeJTask extends SliceTask } } - - if(!build) { log("skipping" + dictString + indexString); @@ -323,6 +321,19 @@ public class Slice2FreezeJTask extends SliceTask cmd.append(indexString); // + // Add the --meta options. + // + if(!_meta.isEmpty()) + { + java.util.Iterator i = _meta.iterator(); + while(i.hasNext()) + { + SliceMeta m = (SliceMeta)i.next(); + cmd.append(" --meta " + m.getValue()); + } + } + + // // Add the slice files. // p = sliceFiles.iterator(); @@ -362,7 +373,7 @@ public class Slice2FreezeJTask extends SliceTask // Execute. // log(translator + " " + cmd); - ExecTask task = (ExecTask)project.createTask("exec"); + ExecTask task = (ExecTask)getProject().createTask("exec"); task.setFailonerror(true); Argument arg = task.createArg(); arg.setLine(cmd.toString()); @@ -437,7 +448,7 @@ public class Slice2FreezeJTask extends SliceTask // final String outputProperty = "slice2freezej.depend." + System.currentTimeMillis(); - task = (ExecTask)project.createTask("exec"); + task = (ExecTask)getProject().createTask("exec"); task.setFailonerror(true); arg = task.createArg(); arg.setLine(cmd.toString()); @@ -448,7 +459,7 @@ public class Slice2FreezeJTask extends SliceTask // // Update dependency file. // - java.util.List newDependencies = parseDependencies(project.getProperty(outputProperty)); + java.util.List newDependencies = parseDependencies(getProject().getProperty(outputProperty)); p = newDependencies.iterator(); while(p.hasNext()) { |