aboutsummaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
authoravasseur <avasseur>2005-04-22 10:12:14 +0000
committeravasseur <avasseur>2005-04-22 10:12:14 +0000
commitced5f6e66dff30a7b4acb6f2d5943757f810c645 (patch)
treeb5da93a142a24d98f0ccc624c40c78e3f46ada3a /runtime
parentb151d1a68ca711696f6f43a5e1ac03ce7b7c5431 (diff)
downloadaspectj-ced5f6e66dff30a7b4acb6f2d5943757f810c645.tar.gz
aspectj-ced5f6e66dff30a7b4acb6f2d5943757f810c645.zip
@AJ annotation are runtime visible, fixed all licenses from branch for EPL
Diffstat (limited to 'runtime')
-rw-r--r--runtime/build.xml17
-rw-r--r--runtime/src/org/aspectj/lang/Aspects.java13
-rw-r--r--runtime/src/org/aspectj/lang/ProceedingJoinPoint.java13
3 files changed, 30 insertions, 13 deletions
diff --git a/runtime/build.xml b/runtime/build.xml
index 3dd22e1ed..6ddcc7828 100644
--- a/runtime/build.xml
+++ b/runtime/build.xml
@@ -13,11 +13,26 @@
<path id="runtime.src.path">
</path>
- <target name="compile" depends="init">
+ <target name="compile" depends="init, compile:jdk13, compile:residual">
+ <!-- don't use the Ant macro srccompile that is Java 1.3 level -->
+ <!-- use an indirection level since Java 5 does not accept -source 1.1 anymore -->
+ <!-- under Java 5 we will only ensure source 1.2 -->
+ </target>
+ <target name="compile:jdk13" if="jdk13">
+ <!-- Note: note sure we can trust that. Pbly better if CruiseControl runs with a real 1.1 for this module -->
+ <!-- f.e. use a TreeMap (@since Java 1.2) somewhere, and it still compiles.. -->
+ <mkdir dir="../runtime/bin"/>
+ <javac debug="on" destdir="../runtime/bin" source="1.1" target="1.1">
+ <src path="../runtime/src"/>
+ <classpath refid="runtime.src.path"/>
+ </javac>
+ </target>
+ <target name="compile:residual">
<srccompile project="runtime" path="runtime.src.path"/>
</target>
<target name="test:compile" depends="compile">
+ <!-- TODO AV do we want to run them on 1.1 ? -->
<testcompile project="runtime" path="runtime.test.src.path"/>
</target>
diff --git a/runtime/src/org/aspectj/lang/Aspects.java b/runtime/src/org/aspectj/lang/Aspects.java
index 2f6fa5329..0d8cb5ccb 100644
--- a/runtime/src/org/aspectj/lang/Aspects.java
+++ b/runtime/src/org/aspectj/lang/Aspects.java
@@ -1,12 +1,13 @@
/*******************************************************************************
- * Copyright (c) 2005 Contributors
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * Copyright (c) 2005 Contributors.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
*
* Contributors:
- * initial implementation Jonas Bonér, Alexandre Vasseur
+ * initial implementation Alexandre Vasseur
*******************************************************************************/
package org.aspectj.lang;
diff --git a/runtime/src/org/aspectj/lang/ProceedingJoinPoint.java b/runtime/src/org/aspectj/lang/ProceedingJoinPoint.java
index 2a54d407b..9d220358d 100644
--- a/runtime/src/org/aspectj/lang/ProceedingJoinPoint.java
+++ b/runtime/src/org/aspectj/lang/ProceedingJoinPoint.java
@@ -1,12 +1,13 @@
/*******************************************************************************
- * Copyright (c) 2005 Contributors
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
+ * Copyright (c) 2005 Contributors.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
*
* Contributors:
- * initial implementation Jonas Bonér, Alexandre Vasseur
+ * initial implementation Alexandre Vasseur
*******************************************************************************/
package org.aspectj.lang;