fix some build. Move AspectJrt5 test to AllTest15. Add weaver checks for @AJ annotations + tests from Andy H

2 files changed, 20 insertions, 2 deletions

diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java
index 605955cc9..ad654f8e3 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/Ajc.java
@@ -46,11 +46,21 @@ public class Ajc {
 	private static final String TESTER_PATH = 
 		".."+File.separator+"testing-client"+File.separator+"bin" + File.pathSeparator + 
 		".."+File.separator+"runtime"+File.separator+"bin" + File.pathSeparator +
+        //FIXME AV - can someone tell why those jar needs to be there ??
+        // 1/ see the line before: bin/ will take precedence..
+        // 2/ see below - aspectj5rt is added last which makes it UNconsistent with the way runtime is handled here..
 		".."+File.separator+"lib"+File.separator+"test"+File.separator+"aspectjrt.jar"+ File.pathSeparator+
 		".."+File.separator+"lib"+File.separator+"test"+File.separator+"testing-client.jar" + File.pathSeparator +
-		".."+File.separator+"aspectj5rt"+File.separator+"bin" + File.pathSeparator 
+		".."+File.separator+"aspectj5rt"+File.separator+"bin" + File.pathSeparator
+        //Alex: adding "_IDE" since there is no "bin" output when working within IDEA.
+        // my convention is thus to have a "modules/_IDE" folder where IDEA will write
+        // Since modules/* have circular dependancies, there is no way to have multiple "modules"
+        // (like Eclipse projects in one workspace) in IDEA, so all will be build there.
+        // Note: adding it last means that a change in the IDE aspectj5rt module f.e. without
+        // "ant compile" to rebuild "aspect5rt/bin" will not expose the IDE changes...
+        // but I don't want to have it first to avoid side effects when running from Ant.
+        + File.pathSeparator + ".." + File.separator + "_IDE"
         + File.pathSeparator+ ".."+File.separator+"lib"+File.separator+"junit"+File.separator+"junit.jar"
-        + File.pathSeparator+".."+File.separator+"aspectj5rt"+File.separator+"bin"
 		;
 	private CompilationResult result;
 	private File sandbox;
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java
index 111b631a1..77e8a3b40 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java
@@ -68,6 +68,14 @@ public class AjcTestCase extends TestCase {
 		File.pathSeparator +
 		".." + File.separator + "util" + File.separator + "bin" +
 		File.pathSeparator + ".." + File.separator + "aspectj5rt" + File.separator + "bin" +
+        //Alex: adding "_IDE" since there is no "bin" output when working within IDEA.
+        // my convention is thus to have a "modules/_IDE" folder where IDEA will write
+        // Since modules/* have circular dependancies, there is no way to have multiple "modules"
+        // (like Eclipse projects in one workspace) in IDEA, so all will be build there.
+        // Note: adding it last means that a change in the IDE aspectj5rt module f.e. without
+        // "ant compile" to rebuild "aspect5rt/bin" will not expose the IDE changes...
+        // but I don't want to have it first to avoid side effects when running from Ant.
+        File.pathSeparator + ".." + File.separator + "_IDE" +
 		File.pathSeparator+ ".."+File.separator+"lib"+File.separator+"junit"+File.separator+"junit.jar";
 
 	/**