From 58693486f0669de0b798fb19b82379bab8265d9d Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <r.zwitserloot@projectlombok.org>
Date: Wed, 17 Mar 2021 12:46:34 +0100
Subject: [build] Fixed the ant eclipse and ant intellij targets.

---
 buildScripts/compile.ant.xml                 | 4 ++--
 buildScripts/create-eclipse-project.ant.xml  | 4 ++--
 buildScripts/create-intellij-project.ant.xml | 8 ++++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'buildScripts')

diff --git a/buildScripts/compile.ant.xml b/buildScripts/compile.ant.xml
index 0d08d482..00909db8 100644
--- a/buildScripts/compile.ant.xml
+++ b/buildScripts/compile.ant.xml
@@ -62,7 +62,7 @@ This buildfile is part of projectlombok.org. It takes care of compiling and buil
 		<pathelement path="${packing.basedirs.colon}" />
 	</path>
 	
-	<target name="-compile.spiProcessor" depends="version, -setup.build" description="Compiles the services file generating processor">
+	<target name="create.spiProcessor" depends="version, -setup.build" description="Compiles the services file generating processor">
 		<ivy:compile destdir="build/spiProcessor" source="1.8" target="1.8" ecj="true">
 			<src path="src/spiProcessor" />
 			<classpath location="build/spiProcessor" />
@@ -74,7 +74,7 @@ This buildfile is part of projectlombok.org. It takes care of compiling and buil
 		</jar>
 	</target>
 	
-	<target name="compile" depends="version, deps, -setup.build, -compile.spiProcessor" description="Compiles the code">
+	<target name="compile" depends="version, deps, -setup.build, create.spiProcessor" description="Compiles the code">
 		<!--
 			1. Compile stubs.
 			2. Compile transplants.
diff --git a/buildScripts/create-eclipse-project.ant.xml b/buildScripts/create-eclipse-project.ant.xml
index 909645d0..0892340e 100644
--- a/buildScripts/create-eclipse-project.ant.xml
+++ b/buildScripts/create-eclipse-project.ant.xml
@@ -24,7 +24,7 @@
 This buildfile is part of projectlombok.org. It creates the infrastructure needed to develop lombok on eclipse.
 	</description>
 	
-	<target name="eclipse" depends="eclipse.projectfiles, eclipse.testtarget.default" description="Downloads dependencies, create eclipse project files, as well as debug/run test targets. Open this directory as project in eclipse (via import... existing projects)" />
+	<target name="eclipse" depends="create.spiProcessor, eclipse.projectfiles, eclipse.testtarget.default" description="Downloads dependencies, create eclipse project files, as well as debug/run test targets. Open this directory as project in eclipse (via import... existing projects)" />
 	
 	<target name="eclipse.projectfiles" depends="deps">
 		<ivy:eclipsegen source="1.6" srcout="bin/main">
@@ -53,7 +53,7 @@ This buildfile is part of projectlombok.org. It creates the infrastructure neede
 			<settings>
 				<url url="https://projectlombok.org/downloads/lombok.eclipse.settings" />
 			</settings>
-			<apt location="lib/build/projectlombok.org-spi.jar" />
+			<apt location="build/spiProcessor.jar" />
 		</ivy:eclipsegen>
 	</target>
 	
diff --git a/buildScripts/create-intellij-project.ant.xml b/buildScripts/create-intellij-project.ant.xml
index 865e8971..47ab891f 100644
--- a/buildScripts/create-intellij-project.ant.xml
+++ b/buildScripts/create-intellij-project.ant.xml
@@ -1,5 +1,5 @@
 <!--
- Copyright (C) 2010-2020 The Project Lombok Authors.
+ Copyright (C) 2010-2021 The Project Lombok Authors.
   
   Permission is hereby granted, free of charge, to any person obtaining a copy
   of this software and associated documentation files (the "Software"), to deal
@@ -24,10 +24,14 @@
 This buildfile is part of projectlombok.org. It creates the infrastructure needed to develop lombok on intellij.
 	</description>
 	
-	<target name="intellij" depends="deps" description="Creates intellij project files and downloads all dependencies. Open this directory as a project in IntelliJ after running this target">
+	<target name="intellij" depends="create.spiProcessor, deps" description="Creates intellij project files and downloads all dependencies. Open this directory as a project in IntelliJ after running this target">
 		<echo> ** WARNING ** The core lombok contributors all use eclipse to develop lombok. This script will attempt to set up your lombok directory up as intellij project; whether can be used in a modern intellij is currently unknown. Please do continue, but be aware that trying to work on lombok from intellij may run into problems. If you want to adopt 'work on lombok via intellij' as a task, we're open to it!</echo>
 		<echo>NOT IMPLEMENTED: The project should optimally be configured as a java1.6, using the rt.jar in lib/openjdk6_rt.jar as boot basis, to ensure lombok remains 1.6 compatible.</echo>
 		<echo>NOT IMPLEMENTED: Ability to run tests targeted at a specific jvm/javac/ecj/eclipse release; the relevant entrypoint test classes are lombok.RunBaseAndJavacTests and lombok.RunEclipseTests - you can run the eclipse tests even on intellij; an eclipse installation is not required.</echo>
+		<echo>NOT SURE: The annotation processor system that automatically generates the services files has been changed. This AP is now internal to the project, 
+		the source files for it are in `src/spiProcessor`, and a build of this is now in `build/spiProcessor.jar` - you may have to manually add it, though I'm not
+		sure if you actually need it - the files generated by this processor are relevant only when running lombok itself, and if intellij accomplishes this by
+		invoking ant, all will be well.
 		<input>Press return to continue</input>
 		<ivy:intellijgen>
 			<conf name="build" sources="contrib" />
-- 
cgit