aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReinier Zwitserloot <r.zwitserloot@projectlombok.org>2021-03-19 01:54:38 +0100
committerReinier Zwitserloot <r.zwitserloot@projectlombok.org>2021-03-19 02:14:24 +0100
commit0c6a243c8ec7ef7a1a432b17cd865a1f54a3b827 (patch)
tree6d3165b63190d6f1ee361ba361a501d5a2274cfb
parent27f3917d892fcb507e3f5c5b7ecfbeb147c43c90 (diff)
downloadlombok-0c6a243c8ec7ef7a1a432b17cd865a1f54a3b827.tar.gz
lombok-0c6a243c8ec7ef7a1a432b17cd865a1f54a3b827.tar.bz2
lombok-0c6a243c8ec7ef7a1a432b17cd865a1f54a3b827.zip
[build] quality-of-life improvements for lombok dev on windows
On windows, Eclipse keeps annotation processors open, which means putting spiProcessor in 'build' is annoying, as you can't delete open files on windows. Fixed by moving it to dist
-rw-r--r--buildScripts/compile.ant.xml6
-rw-r--r--buildScripts/create-eclipse-project.ant.xml2
-rw-r--r--buildScripts/create-intellij-project.ant.xml2
3 files changed, 5 insertions, 5 deletions
diff --git a/buildScripts/compile.ant.xml b/buildScripts/compile.ant.xml
index cd0672b5..b87caa51 100644
--- a/buildScripts/compile.ant.xml
+++ b/buildScripts/compile.ant.xml
@@ -69,7 +69,7 @@ This buildfile is part of projectlombok.org. It takes care of compiling and buil
</ivy:compile>
<mkdir dir="build/spiProcessor/META-INF/services" />
<echo file="build/spiProcessor/META-INF/services/javax.annotation.processing.Processor">lombok.spi.SpiProcessor</echo>
- <jar destfile="build/spiProcessor.jar">
+ <jar destfile="dist/spiProcessor.jar">
<fileset dir="build/spiProcessor" />
</jar>
</target>
@@ -172,8 +172,8 @@ This buildfile is part of projectlombok.org. It takes care of compiling and buil
<classpath refid="cp.build" />
<classpath refid="cp.eclipse-oxygen" />
<classpath refid="cp.javac6" />
- <classpath path="build/lombok-utils:build/lombok-utils6:build/lombok-main:build/spiProcessor.jar" />
- <annotationProcessor jar="build/spiProcessor.jar" processor="lombok.spi.SpiProcessor" />
+ <classpath path="build/lombok-utils:build/lombok-utils6:build/lombok-main:dist/spiProcessor.jar" />
+ <annotationProcessor jar="dist/spiProcessor.jar" processor="lombok.spi.SpiProcessor" />
</ivy:compile>
<!-- This is really part of the eclipse agent, but references lombok, so that had to be compiled first -->
diff --git a/buildScripts/create-eclipse-project.ant.xml b/buildScripts/create-eclipse-project.ant.xml
index 0892340e..a9b1a5dc 100644
--- a/buildScripts/create-eclipse-project.ant.xml
+++ b/buildScripts/create-eclipse-project.ant.xml
@@ -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="build/spiProcessor.jar" />
+ <apt location="dist/spiProcessor.jar" />
</ivy:eclipsegen>
</target>
diff --git a/buildScripts/create-intellij-project.ant.xml b/buildScripts/create-intellij-project.ant.xml
index 54594206..33c1e449 100644
--- a/buildScripts/create-intellij-project.ant.xml
+++ b/buildScripts/create-intellij-project.ant.xml
@@ -29,7 +29,7 @@ This buildfile is part of projectlombok.org. It creates the infrastructure neede
<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
+ the source files for it are in `src/spiProcessor`, and a build of this is now in `dist/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.</echo>
<input>Press return to continue</input>