[Git][java-team/lombok][master] 4 commits: Update build.patch and ensure that -unpackLibs is executed during the compile
Markus Koschany
gitlab at salsa.debian.org
Wed Oct 3 16:09:46 BST 2018
Markus Koschany pushed to branch master at Debian Java Maintainers / lombok
Commits:
776ac618 by Markus Koschany at 2018-10-03T13:39:53Z
Update build.patch and ensure that -unpackLibs is executed during the compile
step. Otherwise ASM and lombok-patcher classes will be missing from the
resulting lombok.jar which makes lombok-ast FTBFS.
- - - - -
9db7041e by Markus Koschany at 2018-10-03T13:40:27Z
Update changelog
- - - - -
7990a485 by Markus Koschany at 2018-10-03T13:45:04Z
Update -unpackLibs target in build.patch.
- - - - -
6d7786e2 by Markus Koschany at 2018-10-03T14:56:05Z
Add remove-j9stub.patch
- - - - -
4 changed files:
- debian/changelog
- debian/patches/build.patch
- + debian/patches/remove-j9stub.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+lombok (1.16.22-3) unstable; urgency=medium
+
+ * Team upload.
+ * Update build.patch and ensure that -unpackLibs is executed during the
+ compile step. Otherwise ASM and lombok-patcher classes will be missing from
+ the resulting lombok.jar which makes lombok-ast FTBFS.
+ * Add remove-j9stub.patch to fix a module error.
+
+ -- Markus Koschany <apo at debian.org> Wed, 03 Oct 2018 15:40:08 +0200
+
lombok (1.16.22-2) unstable; urgency=medium
* Team upload.
=====================================
debian/patches/build.patch
=====================================
@@ -1,8 +1,16 @@
-Description: build
-Author: Markus Koschany <apo at debian.org>
+From: Markus Koschany <apo at debian.org>
+Date: Wed, 3 Oct 2018 15:42:47 +0200
+Subject: build
+
+---
+ build.xml | 22 +++++++++++++++-------
+ 1 file changed, 15 insertions(+), 7 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index ed989fe..d27092b 100644
--- a/build.xml
+++ b/build.xml
-@@ -37,6 +37,15 @@
+@@ -37,6 +37,15 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
<fileset dir="lib/build">
<include name="*.jar" />
</fileset>
@@ -18,7 +26,7 @@ Author: Markus Koschany <apo at debian.org>
</path>
<path id="runtime.path">
-@@ -87,14 +96,14 @@
+@@ -87,14 +96,14 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
<fail>A new version of ivyplusplus was required and has been downloaded. Rerun the script to continue.</fail>
</target>
@@ -35,7 +43,7 @@ Author: Markus Koschany <apo at debian.org>
<target name="contrib" depends="config-ivy" description="Downloads various non-crucial documentation, sources, etc that are useful when developing lombok.ast.">
<ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="contrib, ecj7, ecj8, ecj9" />
-@@ -117,8 +126,6 @@
+@@ -117,8 +126,6 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
</target>
<target name="ensureRuntimeDeps" depends="config-ivy">
@@ -44,16 +52,25 @@ Author: Markus Koschany <apo at debian.org>
</target>
<target name="ensureTestDeps" depends="config-ivy">
-@@ -176,7 +183,7 @@
+@@ -155,7 +162,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
+ <echo level="info">Lombok version: ${lombok.version} (${lombok.fullversion})</echo>
+ </target>
+
+- <target name="-unpackLibs" depends="ensureRuntimeDeps">
++ <target name="-unpackLibs" depends="">
+ <ivy:cachedunjar dest="build/lombok" marker="build/unpackDeps.marker">
+ <path refid="runtime.path" />
+ </ivy:cachedunjar>
+@@ -176,7 +183,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
<fail if="java.version.insufficient">To compile lombok, you need JDK9 or higher; lombok requires this version because it's rather difficult to produce lombok builds that are compatible on JDK9 without at least building with JDK9. Sorry about that.</fail>
</target>
- <target name="compile" depends="version, ensureBuildDeps, -unpackLibs, -ensureJdk9" description="Compiles the code.">
-+ <target name="compile" depends="-ensureJdk9" description="Compiles the code.">
++ <target name="compile" depends="-unpackLibs, -ensureJdk9" description="Compiles the code.">
<!-- ant includes the destination dir on the classpath (and there are good reasons to do this), but that also means
the bleeding edge lombok from the previous build is run, which means if there are bugs in it, you can't compile
anymore until you 'ant clean'. That's very much not desired, so we kill the processor, which stops lombok from running.
-@@ -280,6 +287,7 @@
+@@ -280,6 +287,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
<include name="lombok/javac/**" />
<include name="lombok/delombok/**" />
<classpath location="build/lombok" />
@@ -61,7 +78,7 @@ Author: Markus Koschany <apo at debian.org>
<classpath refid="build.path" />
</ivy:compile>
<delete dir="build/lombok-proc-result" quiet="true" />
-@@ -318,7 +326,7 @@
+@@ -318,7 +326,7 @@ lombok.launch.AnnotationProcessorHider$ClaimingProcessor,isolating</echo>
</ant>
</target>
=====================================
debian/patches/remove-j9stub.patch
=====================================
@@ -0,0 +1,34 @@
+From: Markus Koschany <apo at debian.org>
+Date: Wed, 3 Oct 2018 16:49:47 +0200
+Subject: remove j9stub
+
+Apparently the Java 9 stub file is not needed anymore.
+
+Fix a FTBFS due to
+/build/lombok-1.16.22/src/j9stubs/org/mapstruct/ap/spi/AstModifyingAnnotationProcessor.java:21: error:
+package javax.lang.model.type is not visible
+[ivy:compile] import javax.lang.model.type.TypeMirror;
+[ivy:compile] ^
+[ivy:compile] (package javax.lang.model.type is declared in module java.compiler, but module
+ org.objectweb.asm does not read it)
+
+Forwarded: no
+---
+ build.xml | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 15e1d9c..c7531c0 100644
+--- a/build.xml
++++ b/build.xml
+@@ -267,10 +267,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
+ <compilerarg value="-Xlint:none" />
+ <!-- The above is because javac9 warns about 'service interface provided but not exported or used', probably because lombok uses SPI internally, and uses the 'old' classpath discovery system for it. We're fine with this, hence, ignore this warning. -->
+ <src path="src/core9" />
+- <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. -->
+ </ivy:compile>
+- <delete file="build/lombok/org/mapstruct/ap/spi/AstModifyingAnnotationProcessor.class" />
+
+ <ivy:compile destdir="build/lombok/Class50" source="1.5" target="1.6" ecj="true" nowarn="true" includeSystemBootclasspath="true">
+ <bootclasspath location="build/stubs" />
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
build.patch
java9-compatibility.patch
disable-java6-and-java7-support.patch
+remove-j9stub.patch
View it on GitLab: https://salsa.debian.org/java-team/lombok/compare/c855af77134c9e9eeef421cef99f9954e2581bbf...6d7786e2ae40682b9921a2fd8bfd77bb90d39e75
--
View it on GitLab: https://salsa.debian.org/java-team/lombok/compare/c855af77134c9e9eeef421cef99f9954e2581bbf...6d7786e2ae40682b9921a2fd8bfd77bb90d39e75
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181003/52ac6fc9/attachment.html>
More information about the pkg-java-commits
mailing list