From d8d47c687d7ec22e481cf10782f1f889485c39fa Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@zwitserloot.com>
Date: Mon, 15 Aug 2011 22:11:25 +0200
Subject: Integrated Philipp's proof-of-concept delombok in javac7 fix, and
 used some creative stubbing to ensure both the javac7 and the javac6 source
 file can be loaded in the same project in eclipse without dependency
 warnings.

---
 build.xml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 055a75d0..9d06674d 100644
--- a/build.xml
+++ b/build.xml
@@ -130,7 +130,12 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 		anymore until you 'ant clean'. That's very much not desired, so we kill the processor, which stops lombok from running.
 		We re-create the file at the end of this target. -->
 		<delete file="build/lombok/META-INF/services/javax.annotation.processing.Processor" quiet="true" />
+		<ivy:compile destdir="build/stubs" source="1.5" target="1.5" includeantruntime="false">
+			<src path="src/stubs" />
+		</ivy:compile>
+		
 		<ivy:compile destdir="build/lombok" source="1.5" target="1.5" includeantruntime="false">
+			<compilerarg value="-Xbootclasspath/p:build/stubs" />
 			<src path="src/core" />
 			<src path="src/installer" />
 			<src path="src/eclipseAgent" />
@@ -138,7 +143,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 			<classpath refid="build.path" />
 		</ivy:compile>
 		<ivy:compile destdir="build/lombok" source="1.6" target="1.6" includeantruntime="false">
-			<src path="src/contrib" />
+			<compilerarg value="-Xbootclasspath/p:build/stubs" />
 			<src path="src/core" />
 			<src path="src/delombok" />
 			<include name="com/sun/**" />
@@ -147,12 +152,6 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 			<classpath location="build/lombok" />
 			<classpath refid="build.path" />
 		</ivy:compile>
-		<ivy:compile destdir="build/lombok" source="1.6" target="1.6" includeantruntime="false">
-			<src path="experimental/delombok_java7/src/main" />
-			<include name="lombok/delombok/**" />
-			<classpath location="build/lombok" />
-			<classpath location="experimental/delombok_java7/lib/javac7.jar" />
-		</ivy:compile>
 		<mkdir dir="build/lombok/META-INF" />
 		<mkdir dir="build/lombok/META-INF/services" />
 		<echo file="build/lombok/META-INF/services/javax.annotation.processing.Processor">lombok.core.AnnotationProcessor</echo>
@@ -191,7 +190,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 				<srcdir dir="src/eclipseAgent" />
 				<srcdir dir="src/installer" />
 				<srcdir dir="src/delombok" />
-				<srcdir dir="src/contrib" />
+				<srcdir dir="src/stubs" />
 				<srcdir dir="experimental/src" />
 				<srcdir dir="test/transform/src" test="true" />
 				<srcdir dir="test/core/src" test="true" />
@@ -210,7 +209,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 			<srcdir dir="src/eclipseAgent" />
 			<srcdir dir="src/installer" />
 			<srcdir dir="src/delombok" />
-			<srcdir dir="src/contrib" />
+			<srcdir dir="src/stubs" />
 			<srcdir dir="experimental/src" />
 			<srcdir dir="test/transform/src" />
 			<srcdir dir="test/core/src" />
-- 
cgit