From 5bed0e915def043bb88875b80a889d8940850491 Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Thu, 19 Sep 2002 21:08:11 +0000 Subject: Fixed a bug where dependencies wouldn't work on Java. --- java/ant/Slice2JavaTask.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'java/ant/Slice2JavaTask.java') diff --git a/java/ant/Slice2JavaTask.java b/java/ant/Slice2JavaTask.java index 965c23e5c66..dd74477df60 100644 --- a/java/ant/Slice2JavaTask.java +++ b/java/ant/Slice2JavaTask.java @@ -351,19 +351,23 @@ public class Slice2JavaTask extends org.apache.tools.ant.Task String line; while((line = in.readLine()) != null) { - depline.append(line); - - if(!line.endsWith("\\")) + if(line.endsWith("\\")) + { + depline.append(line.substring(0, line.length() - 1)); + } + else { - String[] deps = depline.toString().split("[\\s\\\\]"); + depline.append(line); + + String[] deps = depline.toString().split("[\\s]"); if(deps.length > 0) { - int pos = deps[0].indexOf('.'); + File slice = new File(deps[0]); + int pos = slice.getName().indexOf('.'); if(pos != -1) { - String sliceFile = deps[0].substring(0, pos); + String sliceFile = slice.getName().substring(0, pos); File tag = new File(_tagDir, "." + sliceFile + ".ice.tag"); - try { BufferedWriter out = new BufferedWriter(new FileWriter(tag)); -- cgit v1.2.3