From 4401562b8f7e0170b6a510f50c5ed3dc1b0cdad1 Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <r.zwitserloot@projectlombok.org>
Date: Mon, 18 Feb 2019 23:49:01 +0100
Subject: [build] ecj-ified all attempts to build anything targeted at below
 java9 (so, most of it), because right now only javac from JDK9 can be used to
 build lombok and that’s a sad state of affairs.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.xml | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/build.xml b/build.xml
index 4ab74f21..c1254f0e 100644
--- a/build.xml
+++ b/build.xml
@@ -190,7 +190,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 			<classpath location="build/stubs" />
 		</ivy:compile>
 		
-		<ivy:compile destdir="build/lombok-utils" source="1.5" target="1.5" ecj="true" nowarn="true" includeSystemBootclasspath="true">
+		<ivy:compile destdir="build/lombok-utils" source="1.5" target="1.5" ecj="true" nowarn="true">
 			<bootclasspath location="build/stubs" />
 			<bootclasspath path="${rt-openjdk8}" />
 			<src path="src/utils" />
@@ -198,9 +198,9 @@ 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-utils" source="1.6" target="1.6">
-			<compilerarg value="-Xbootclasspath/p:build/stubs${path.separator}${rt-openjdk6}" />
-			<compilerarg value="-Xlint:-options" />
+		<ivy:compile destdir="build/lombok-utils" source="1.6" target="1.6" ecj="true" nowarn="true">
+			<bootclasspath path="${rt-openjdk8}" />
+			<bootclasspath location="build/stubs" />
 			<src path="src/utils" />
 			<include name="lombok/javac/**" />
 			<classpath location="build/lombok-utils" />
@@ -223,19 +223,19 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 			</filterchain>
 		</copy>
 		
-		<ivy:compile destdir="build/lombok" source="1.4" target="1.4" ecj="true" nowarn="true" includeSystemBootclasspath="true">
+		<ivy:compile destdir="build/lombok" source="1.4" target="1.4" ecj="true" nowarn="true">
 			<bootclasspath location="build/stubs" />
 			<bootclasspath path="${rt-openjdk8}" />
 			<src path="build/transformedSources" />
 		</ivy:compile>
 		
-		<ivy:compile destdir="build/lombok/Class50" source="1.4" target="1.6" ecj="true" nowarn="true" includeSystemBootclasspath="true">
+		<ivy:compile destdir="build/lombok/Class50" source="1.4" target="1.6" ecj="true" nowarn="true">
 			<bootclasspath location="build/stubs" />
 			<bootclasspath path="${rt-openjdk8}" />
 			<src path="build/transformedSources" />
 		</ivy:compile>
 		
-		<ivy:compile destdir="build/lombok" source="1.5" target="1.5" ecj="true" nowarn="true" includeSystemBootclasspath="true">
+		<ivy:compile destdir="build/lombok" source="1.5" target="1.5" ecj="true" nowarn="true">
 			<bootclasspath location="build/stubs" />
 			<bootclasspath path="${rt-openjdk8}" />
 			<src path="src/launch" />
@@ -261,7 +261,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 		<mkdir dir="build/lombok/secondaryLoading.SCL.lombok/org/mapstruct/ap/spi" />
 		<move file="build/lombokMapstruct/org/mapstruct/ap/spi/AstModifyingAnnotationProcessor.class" tofile="build/lombok/secondaryLoading.SCL.lombok/org/mapstruct/ap/spi/AstModifyingAnnotationProcessor.SCL.lombok" />
 		
-		<ivy:compile destdir="build/lombok/Class50" source="1.5" target="1.6" ecj="true" nowarn="true" includeSystemBootclasspath="true">
+		<ivy:compile destdir="build/lombok/Class50" source="1.5" target="1.6" ecj="true" nowarn="true">
 			<bootclasspath location="build/stubs" />
 			<bootclasspath path="${rt-openjdk8}" />
 			<src path="src/eclipseAgent" />
@@ -270,9 +270,9 @@ 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">
-			<compilerarg value="-Xbootclasspath/p:build/stubs${path.separator}${rt-openjdk6}" />
-			<compilerarg value="-Xlint:-options" />
+		<ivy:compile destdir="build/lombok" source="1.6" target="1.6" ecj="true" nowarn="true">
+			<bootclasspath location="build/stubs" />
+			<bootclasspath path="${rt-openjdk8}" />
 			<src path="src/core" />
 			<src path="src/delombok" />
 			<include name="lombok/javac/**" />
@@ -281,8 +281,9 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 			<classpath refid="build.path" />
 		</ivy:compile>
 		<delete dir="build/lombok-proc-result" quiet="true" />
-		<ivy:compile destdir="build/lombok-proc-result" source="1.6" target="1.6" nowarn="true">
-			<compilerarg value="-Xbootclasspath/p:build/stubs" />
+		<ivy:compile destdir="build/lombok-proc-result" source="1.6" target="1.6" nowarn="true" ecj="true">
+			<bootclasspath location="build/stubs" />
+			<bootclasspath path="${rt-openjdk8}" />
 			<compilerarg value="-proc:only" />
 			<compilerarg value="-processor" />
 			<compilerarg value="org.mangosdk.spi.processor.SpiProcessor" />
@@ -1002,7 +1003,8 @@ You can also create your own by writing a 'testenvironment.properties' file. The
 	
 	<target name="testAp-compile" depends="ensureBuildDeps">
 		<delete file="build/testAP/META-INF/services/javax.annotation.processing.Processor" quiet="true" />
-		<ivy:compile destdir="build/testAP" source="1.7" target="1.7">
+		<ivy:compile destdir="build/testAP" source="1.7" target="1.7" ecj="true">
+			<bootclasspath path="${rt-openjdk8}" />
 			<src path="src/testAP" />
 		</ivy:compile>
 		
-- 
cgit