Преглед изворни кода

wip allowing flexibility in test infra for using modules with subdirs

tags/V1_9_0_RC3
Andy Clement пре 6 година
родитељ
комит
41a5b8077d
1 измењених фајлова са 10 додато и 5 уклоњено
  1. 10
    5
      org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java

+ 10
- 5
org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java Прегледај датотеку

if (FileUtil.hasSourceSuffix(args[i])) { if (FileUtil.hasSourceSuffix(args[i])) {
File f = new File(args[i]); File f = new File(args[i]);
// newArgs[i] = new File(baseDir,args[i]).getAbsolutePath(); // might be quicker? // newArgs[i] = new File(baseDir,args[i]).getAbsolutePath(); // might be quicker?
newArgs[i] = adjustFileOrDir(f, doCopy).getAbsolutePath();
newArgs[i] = adjustFileOrDir(f, doCopy, false).getAbsolutePath();
} else if (args[i].endsWith(".xml") && !args[i].startsWith("-")) { } else if (args[i].endsWith(".xml") && !args[i].startsWith("-")) {
if (i > 0 && args[i - 1].equals("-outxmlfile")) { if (i > 0 && args[i - 1].equals("-outxmlfile")) {
// dont adjust it // dont adjust it
} else { } else {
File f = new File(args[i]); File f = new File(args[i]);
// newArgs[i] = new File(baseDir,args[i]).getAbsolutePath(); // might be quicker? // newArgs[i] = new File(baseDir,args[i]).getAbsolutePath(); // might be quicker?
newArgs[i] = adjustFileOrDir(f, doCopy).getAbsolutePath();
newArgs[i] = adjustFileOrDir(f, doCopy, false).getAbsolutePath();
} }
} else { } else {
if ((args[i].equals("-aspectpath") || args[i].equals("-inpath") || args[i].equals("-injars") if ((args[i].equals("-aspectpath") || args[i].equals("-inpath") || args[i].equals("-injars")
copyThisTime = false; copyThisTime = false;
hasOutdir = true; hasOutdir = true;
} }
boolean isOutjar = args[i].equals("-outjar");
StringTokenizer strTok = new StringTokenizer(args[++i], File.pathSeparator); StringTokenizer strTok = new StringTokenizer(args[++i], File.pathSeparator);
while (strTok.hasMoreTokens()) { while (strTok.hasMoreTokens()) {
File f = new File(strTok.nextToken()); File f = new File(strTok.nextToken());
buff.append(adjustFileOrDir(f, copyThisTime).getAbsolutePath());
buff.append(adjustFileOrDir(f, copyThisTime, isOutjar).getAbsolutePath());
if (strTok.hasMoreTokens()) if (strTok.hasMoreTokens())
buff.append(File.pathSeparator); buff.append(File.pathSeparator);
} }
// could be resource file // could be resource file
File f = new File(args[i]); File f = new File(args[i]);
if (f.exists()) { if (f.exists()) {
newArgs[i] = adjustFileOrDir(f, doCopy).getAbsolutePath();
newArgs[i] = adjustFileOrDir(f, doCopy, false).getAbsolutePath();
} }
} }
} }
return newArgs; return newArgs;
} }


private File adjustFileOrDir(File from, boolean doCopy) throws IOException {
private File adjustFileOrDir(File from, boolean doCopy, boolean ensureDirsExist) throws IOException {
File to = from; File to = from;
File ret = from; File ret = from;
if (!from.isAbsolute()) { if (!from.isAbsolute()) {
String relativeToPath = (fromParent != null) ? (fromParent.getPath() + File.separator) : ""; String relativeToPath = (fromParent != null) ? (fromParent.getPath() + File.separator) : "";
if (baseDir != null) { if (baseDir != null) {
from = new File(baseDir, from.getPath()); from = new File(baseDir, from.getPath());
// if (ensureDirsExist) {
// File toMkdir = (ret.getPath().endsWith(".jar") || ret.getPath().endsWith(".zip"))?ret.getParentFile():ret;
// toMkdir.mkdirs();
// }
} }
if (!from.exists()) if (!from.exists())
return ret; return ret;

Loading…
Откажи
Сачувај