diff options
| author | Mark Spruiell <mes@zeroc.com> | 2003-02-03 17:50:40 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2003-02-03 17:50:40 +0000 |
| commit | b219b364f401f8fa4b21245b94b38ed5536877c9 (patch) | |
| tree | dfc18628019e874a793fedf09b8492e5fe5157cb /java/ant/Slice2JavaTask.java | |
| parent | minor (diff) | |
| download | ice-b219b364f401f8fa4b21245b94b38ed5536877c9.tar.bz2 ice-b219b364f401f8fa4b21245b94b38ed5536877c9.tar.xz ice-b219b364f401f8fa4b21245b94b38ed5536877c9.zip | |
added ice attribute for --ice flag, define element for -D options
Diffstat (limited to 'java/ant/Slice2JavaTask.java')
| -rw-r--r-- | java/ant/Slice2JavaTask.java | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/java/ant/Slice2JavaTask.java b/java/ant/Slice2JavaTask.java index 54608c8b1de..79ae2d16cdb 100644 --- a/java/ant/Slice2JavaTask.java +++ b/java/ant/Slice2JavaTask.java @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2002 +// Copyright (c) 2003 // ZeroC, Inc. // Billerica, MA, USA // @@ -53,6 +53,7 @@ import java.io.BufferedWriter; * <target name="generate"> * <mkdir dir="tags" /> * <slice2java tagdir="tags" outputdir="out" package="com.foo"> + * <define name="SYMBOL" value="VALUE"/> * <includepath> * <pathelement path="${slice.dir}" /> * </includepath> @@ -146,11 +147,6 @@ public class Slice2JavaTask extends SliceTask { StringBuffer cmd = new StringBuffer(); - // - // Add --ice - // - cmd.append(" --ice"); - // // Add --output-dir // @@ -183,6 +179,26 @@ public class Slice2JavaTask extends SliceTask } // + // Add defines + // + if(!_defines.isEmpty()) + { + java.util.Iterator i = _defines.iterator(); + while(i.hasNext()) + { + SliceDefine define = (SliceDefine)i.next(); + cmd.append(" -D"); + cmd.append(define.getName()); + String value = define.getValue(); + if(value != null) + { + cmd.append("="); + cmd.append(value); + } + } + } + + // // Add --tie // if(_tie) @@ -190,6 +206,14 @@ public class Slice2JavaTask extends SliceTask cmd.append(" --tie"); } + // + // Add --ice + // + if(_ice) + { + cmd.append(" --ice"); + } + // // Add --case-sensitive // |