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/Slice2JavaTask.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/Slice2JavaTask.java')
| -rw-r--r-- | java/ant/Slice2JavaTask.java | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/java/ant/Slice2JavaTask.java b/java/ant/Slice2JavaTask.java index 1f1abf22a17..8e275eec57a 100644 --- a/java/ant/Slice2JavaTask.java +++ b/java/ant/Slice2JavaTask.java @@ -123,12 +123,12 @@ public class Slice2JavaTask extends SliceTask { FileSet fileset = (FileSet)p.next(); - DirectoryScanner scanner = fileset.getDirectoryScanner(project); + DirectoryScanner scanner = fileset.getDirectoryScanner(getProject()); scanner.scan(); 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]); SliceDependency depend = (SliceDependency)dependencies.get(getTargetKey(slice.toString())); if(depend == null || !depend.isUpToDate()) @@ -231,12 +231,28 @@ public class Slice2JavaTask extends SliceTask cmd.append(" --checksum " + _checksum); } + // + // Add --stream + // if(_stream) { cmd.append(" --stream"); } // + // Add --meta + // + if(!_meta.isEmpty()) + { + java.util.Iterator i = _meta.iterator(); + while(i.hasNext()) + { + SliceMeta m = (SliceMeta)i.next(); + cmd.append(" --meta " + m.getValue()); + } + } + + // // Add --ice // if(_ice) @@ -274,7 +290,7 @@ public class Slice2JavaTask 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()); @@ -330,7 +346,7 @@ public class Slice2JavaTask extends SliceTask // final String outputProperty = "slice2java.depend." + System.currentTimeMillis(); - task = (ExecTask)project.createTask("exec"); + task = (ExecTask)getProject().createTask("exec"); task.setFailonerror(true); arg = task.createArg(); arg.setLine(cmd.toString()); @@ -341,7 +357,7 @@ public class Slice2JavaTask 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()) { @@ -371,6 +387,6 @@ public class Slice2JavaTask extends SliceTask private File _translator; private boolean _tie; - private boolean _stream; private String _checksum; + private boolean _stream; } |