Browse Source

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.
tags/Root_ajdt_support
acolyer 20 years ago
parent
commit
e7e3921327
1 changed files with 14 additions and 13 deletions
  1. 14
    13
      testing/src/org/aspectj/testing/harness/bridge/CompilerRun.java

+ 14
- 13
testing/src/org/aspectj/testing/harness/bridge/CompilerRun.java View File

@@ -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");

Loading…
Cancel
Save