From: acolyer <acolyer>
Date: Tue, 16 Mar 2004 14:10:31 +0000 (+0000)
Subject: fix for Bugzilla Bug 43714
X-Git-Tag: Root_ajdt_support~117
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e7e39213279572e5315f5a24883f8a16c84f9c8b;p=aspectj.git

fix for Bugzilla Bug 43714
 	weaving from an input jar into that same jar.
fully qualify outjar location in sandbox, and don't specify both -d and outjar.
---

diff --git a/testing/src/org/aspectj/testing/harness/bridge/CompilerRun.java b/testing/src/org/aspectj/testing/harness/bridge/CompilerRun.java
index 76d340126..e50dd8174 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/CompilerRun.java
+++ b/testing/src/org/aspectj/testing/harness/bridge/CompilerRun.java
@@ -338,7 +338,7 @@ public class CompilerRun implements IAjcRun {
         }
         if (spec.outjar != null) {
         	arguments.add("-outjar");
-        	arguments.add(spec.outjar);
+        	arguments.add(new File(sandbox.classesDir,spec.outjar).getPath());
         }
         if (!LangUtil.isEmpty(extdirFiles)) {
             arguments.add("-extdirs");
@@ -438,18 +438,19 @@ public class CompilerRun implements IAjcRun {
         ArrayList argList = new ArrayList();
         final Spec.TestSetup setupResult = spec.testSetup;
         try {
-            argList.add("-d");
-            String outputDirPath = sandbox.classesDir.getAbsolutePath();
-            try { // worth it to try for canonical?
-                outputDirPath = sandbox.classesDir.getCanonicalPath();
-            } catch (IOException e) {
-                MessageUtil.abort(
-                    status,
-                    "canonical " + sandbox.classesDir,
-                    e);
-            }
-            argList.add(outputDirPath);
-
+        	if (spec.outjar == null) {
+	            argList.add("-d");
+	            String outputDirPath = sandbox.classesDir.getAbsolutePath();
+	            try { // worth it to try for canonical?
+	                outputDirPath = sandbox.classesDir.getCanonicalPath();
+	            } catch (IOException e) {
+	                MessageUtil.abort(
+	                    status,
+	                    "canonical " + sandbox.classesDir,
+	                    e);
+	            }
+	            argList.add(outputDirPath);
+        	}
             String path = sandbox.classpathToString(this);
             if (!LangUtil.isEmpty(path)) {
                 argList.add("-classpath");