From 0a32c9b126253af112b61445d061a0798011702b Mon Sep 17 00:00:00 2001
From: Roel Spilker <r.spilker@gmail.com>
Date: Fri, 28 Feb 2020 00:21:02 +0100
Subject: Re-add mapstruct code to secondaryLoading

---
 build.xml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index 4248b62e..5aaabf26 100644
--- a/build.xml
+++ b/build.xml
@@ -317,7 +317,7 @@ lombok.launch.AnnotationProcessorHider$ClaimingProcessor,isolating</echo>
 		</ant>
 	</target>
 	
-	<target name="dist" description="Builds THE lombok.jar file which contains everything." depends="version, compile, -latestChanges">
+	<target name="dist" description="Builds THE lombok.jar file which contains everything." depends="version, compile, -latestChanges, -compileMapstruct">
 		<mkdir dir="dist" />
 		<copy file="doc/changelog.markdown" tofile="build/changelog.txt" />
 		<tstamp>
@@ -1064,15 +1064,20 @@ You can also create your own by writing a 'testenvironment.properties' file. The
 			<compilerarg value="org.projectlombok.testAp.TestAp,lombok.launch.AnnotationProcessorHider$AnnotationProcessor" />
 		</javac>
 	</target>
-
-	<target name="-mapstructBindingPrepare">
+	
+	<target name="-compileMapstruct">
 		<mkdir dir="build/mapstruct" />
-		<mkdir dir="build/mapstruct-module-path" />
-		<copy file="dist/lombok.jar" todir="build/mapstruct-module-path" />
 		<javac includeAntRuntime="false" source="1.9" target="1.9" destdir="build/mapstruct">
 			<src path="src/j9stubs" />
 			<!-- This includes org.mapstruct.ap.spi.AstModifyingAnnotationProcessor; putting this on the classpath doesn't work (needs to be internal or a module) so we just add it and then delete the class file for convenience. -->
 		</javac>
+		<mkdir dir="build/lombok/secondaryLoading.SCL.lombok/org/mapstruct/ap/spi" />
+		<move file="build/mapstruct/org/mapstruct/ap/spi/AstModifyingAnnotationProcessor.class" tofile="build/lombok/secondaryLoading.SCL.lombok/org/mapstruct/ap/spi/AstModifyingAnnotationProcessor.SCL.lombok" />
+	</target>
+
+	<target name="-mapstructBindingPrepare" depends="-compileMapstruct">
+		<mkdir dir="build/mapstruct-module-path" />
+		<copy file="dist/lombok.jar" todir="build/mapstruct-module-path" />
 		<jar destfile="build/mapstruct-module-path/mapstruct-processor.jar" basedir="build/mapstruct" includes="org/**">
 			<manifest>
 				 <attribute name="Automatic-Module-Name" value="org.mapstruct.processor" />
-- 
cgit