diff options
| author | Brent Eagles <brent@zeroc.com> | 2007-07-06 16:15:09 -0230 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2007-07-06 16:15:09 -0230 |
| commit | ed6721d187392146212318fa0eef25380da0a8cb (patch) | |
| tree | 1d8e0e204a6d3f7652c1db1204cf9c431386d956 /java/ant/Slice2JavaTask.java | |
| parent | AMD testing + AMD "rollback on user exception" fix (diff) | |
| download | ice-ed6721d187392146212318fa0eef25380da0a8cb.tar.bz2 ice-ed6721d187392146212318fa0eef25380da0a8cb.tar.xz ice-ed6721d187392146212318fa0eef25380da0a8cb.zip | |
Change ice.bin.dir to ice.home. Fix comments in SliceTask.getIceHome() and
change order of precedence for property vs. environment variable. The proper
now takes precedence over the environment variable.
Diffstat (limited to 'java/ant/Slice2JavaTask.java')
| -rw-r--r-- | java/ant/Slice2JavaTask.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/java/ant/Slice2JavaTask.java b/java/ant/Slice2JavaTask.java index 97db610a637..43af64978d7 100644 --- a/java/ant/Slice2JavaTask.java +++ b/java/ant/Slice2JavaTask.java @@ -150,13 +150,19 @@ public class Slice2JavaTask extends SliceTask String translator; if(_translator == null) { - if(getIceHome() == null) + String iceInstall = getIceHome(); + + // + // If the location of the Ice install is not known, we + // rely on a path search to find the translator. + // + if(iceInstall == null) { translator = "slice2java"; } else { - translator = new File(getIceHome() + File.separator + "bin" + File.separator + "slice2java").toString(); + translator = new File(iceInstall + File.separator + "bin" + File.separator + "slice2java").toString(); } } else |