[Git][java-team/lombok][master] 2 commits: Split build.patch into smaller patches

Tue May 10 13:30:51 BST 2022


Emmanuel Bourg pushed to branch master at Debian Java Maintainers / lombok


Commits:
3eba17b4 by Emmanuel Bourg at 2022-05-10T13:32:15+02:00
Split build.patch into smaller patches

- - - - -
90dc721a by Emmanuel Bourg at 2022-05-10T14:30:22+02:00
Fixed the build failure (Closes: #1006023)

- - - - -


7 changed files:

- debian/changelog
- debian/patches/build-with-java11-only.patch
- + debian/patches/disable-changelog.patch
- debian/patches/build.patch → debian/patches/disable-download-dependencies.patch
- + debian/patches/eclipse-compiler-classpath.patch
- debian/patches/series
- + debian/patches/stubsstubs-classpath.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+lombok (1.18.12-2) unstable; urgency=medium
+
+  * Team upload.
+  * Fixed the build failure (Closes: #1006023)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 10 May 2022 14:30:08 +0200
+
 lombok (1.18.12-1) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/patches/build-with-java11-only.patch
=====================================
@@ -25,7 +25,7 @@ Forwarded: no
  		</ivy:compile>
 -		<ivy:compile destdir="build/stubs" source="1.5" target="1.5" ecj="true" nowarn="true">
 -			<bootclasspath path="${rt-openjdk8}" />
-+		<ivy:compile destdir="build/stubs" release="6" nowarn="true">
++		<ivy:compile destdir="build/stubs" source="1.6" target="1.6" nowarn="true">
  			<src path="src/stubs" />
  			<src path="src/javac-only-stubs" />
  			<classpath location="build/stubsstubs" />
@@ -35,7 +35,7 @@ Forwarded: no
 -		<ivy:compile destdir="build/lombok-utils" source="1.5" target="1.5" ecj="true" nowarn="true">
 -			<bootclasspath location="build/stubs" />
 -			<bootclasspath path="${rt-openjdk8}" />
-+		<ivy:compile destdir="build/lombok-utils" source="1.5" target="1.5" nowarn="true">
++		<ivy:compile destdir="build/lombok-utils" source="1.6" target="1.6" nowarn="true">
 +			<compilerarg value="-Xbootclasspath/p:build/stubs" />
  			<src path="src/utils" />
  			<exclude name="lombok/javac/**" />
@@ -57,7 +57,7 @@ Forwarded: no
 -		<ivy:compile destdir="build/lombok" source="1.4" target="1.4" ecj="true" nowarn="true">
 -			<bootclasspath location="build/stubs" />
 -			<bootclasspath path="${rt-openjdk8}" />
-+		<ivy:compile destdir="build/lombok" release="6" nowarn="true">
++		<ivy:compile destdir="build/lombok" source="6" target="6" nowarn="true">
 +			<compilerarg value="-Xbootclasspath/p:build/stubs" />
  			<src path="build/transformedSources" />
  		</ivy:compile>
@@ -65,7 +65,7 @@ Forwarded: no
 -		<ivy:compile destdir="build/lombok/Class50" source="1.4" target="1.6" ecj="true" nowarn="true">
 -			<bootclasspath location="build/stubs" />
 -			<bootclasspath path="${rt-openjdk8}" />
-+		<ivy:compile destdir="build/lombok/Class50" release="1.6" nowarn="true">
++		<ivy:compile destdir="build/lombok/Class50" source="6" target="6" nowarn="true">
 +			<compilerarg value="-Xbootclasspath/p:build/stubs" />
  			<src path="build/transformedSources" />
  		</ivy:compile>
@@ -73,7 +73,7 @@ Forwarded: no
 -		<ivy:compile destdir="build/lombok" source="1.5" target="1.5" ecj="true" nowarn="true">
 -			<bootclasspath location="build/stubs" />
 -			<bootclasspath path="${rt-openjdk8}" />
-+		<ivy:compile destdir="build/lombok" release="1.6" nowarn="true">
++		<ivy:compile destdir="build/lombok" source="6" target="6" nowarn="true">
 +			<compilerarg value="-Xbootclasspath/p:build/stubs" />
  			<src path="src/launch" />
  			<src path="src/core" />
@@ -85,7 +85,7 @@ Forwarded: no
 -		<ivy:compile destdir="build/lombok/Class50" source="1.5" target="1.6" ecj="true" nowarn="true">
 -			<bootclasspath location="build/stubs" />
 -			<bootclasspath path="${rt-openjdk8}" />
-+		<ivy:compile destdir="build/lombok/Class50" release="1.6" nowarn="true">
++		<ivy:compile destdir="build/lombok/Class50" source="6" target="6" nowarn="true">
 +			<compilerarg value="-Xbootclasspath/p:build/stubs" />
  			<src path="src/eclipseAgent" />
  			<include name="lombok/launch/PatchFixesHider.java" />
@@ -96,7 +96,7 @@ Forwarded: no
 -		<ivy:compile destdir="build/lombok" source="1.6" target="1.6" ecj="true" nowarn="true">
 -			<bootclasspath location="build/stubs" />
 -			<bootclasspath path="${rt-openjdk8}" />
-+		<ivy:compile destdir="build/lombok" release="6">
++		<ivy:compile destdir="build/lombok" source="6" target="6">
 +			<compilerarg value="-Xbootclasspath/p:build/stubs" />
  			<src path="src/core" />
  			<src path="src/delombok" />
@@ -106,7 +106,7 @@ Forwarded: no
  		</ivy:compile>
  		<delete dir="build/lombok-proc-result" quiet="true" />
 -		<ivy:compile destdir="build/lombok-proc-result" source="9" target="9">
-+		<ivy:compile destdir="build/lombok-proc-result" release="9">
++		<ivy:compile destdir="build/lombok-proc-result" source="8" target="8">
  			<classpath location="build/stubs" />
  			<compilerarg value="-proc:only" />
  			<compilerarg value="-processor" />


=====================================
debian/patches/disable-changelog.patch
=====================================
@@ -0,0 +1,14 @@
+Description: Do not generate the changelog
+Author: Markus Koschany <apo at debian.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -334,7 +334,7 @@
+ 		</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">
+ 		<mkdir dir="dist" />
+ 		<copy file="doc/changelog.markdown" tofile="build/changelog.txt" />
+ 		<tstamp>


=====================================
debian/patches/build.patch → debian/patches/disable-download-dependencies.patch
=====================================
@@ -1,26 +1,9 @@
-From: Markus Koschany <apo at debian.org>
-Date: Wed, 3 Oct 2018 15:42:47 +0200
-Subject: build
+Description: Do not download external dependencies
+Author: Markus Koschany <apo at debian.org>
+Forwarded: not-needed
 --- a/build.xml
 +++ b/build.xml
-@@ -39,6 +39,16 @@
- 		<fileset dir="lib/build">
- 			<include name="*.jar" />
- 		</fileset>
-+		<fileset dir="/usr/share/java">
-+			<include name="eclipse-core-jobs.jar" />
-+			<include name="eclipse-core-runtime.jar" />
-+			<include name="eclipse-core-resources.jar" />
-+			<include name="eclipse-jdt-core.jar" />
-+			<include name="eclipse-jdt-core-manipulation.jar" />
-+			<include name="eclipse-jdt-ui.jar" />
-+			<include name="eclipse-jface-text.jar" />
-+			<include name="equinox-common.jar" />
-+		</fileset>
- 	</path>
- 	
- 	<path id="runtime.path">
-@@ -89,14 +99,14 @@
+@@ -89,14 +89,14 @@
  		<fail>A new version of ivyplusplus was required and has been downloaded. Rerun the script to continue.</fail>
  	</target>
  	
@@ -37,7 +20,7 @@ Subject: build
  	
  	<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" />
-@@ -119,8 +129,6 @@
+@@ -119,8 +119,6 @@
  	</target>
  	
  	<target name="ensureRuntimeDeps" depends="config-ivy">
@@ -46,7 +29,7 @@ Subject: build
  	</target>
  	
  	<target name="ensureTestDeps" depends="config-ivy">
-@@ -157,7 +165,7 @@
+@@ -157,7 +155,7 @@
  		<echo level="info">Lombok version: ${lombok.version} (${lombok.fullversion})</echo>
  	</target>
  	
@@ -55,7 +38,7 @@ Subject: build
  		<ivy:cachedunjar dest="build/lombok" marker="build/unpackDeps.marker">
  			<path refid="runtime.path" />
  		</ivy:cachedunjar>
-@@ -170,7 +178,7 @@
+@@ -170,7 +168,7 @@
  		<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>
  	
@@ -64,20 +47,3 @@ Subject: build
          <fail>
  For compiling with Java9 'modulepath' an Ant version 1.9.7+ or 1.10.0+ is required. 
  Your current version is:
-@@ -287,6 +295,7 @@
- 			<include name="lombok/javac/**" />
- 			<include name="lombok/delombok/**" />
- 			<classpath location="build/lombok" />
-+			<classpath location="build/stubsstubs" />
- 			<classpath refid="build.path" />
- 		</ivy:compile>
- 		<delete dir="build/lombok-proc-result" quiet="true" />
-@@ -325,7 +334,7 @@
- 		</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">
- 		<mkdir dir="dist" />
- 		<copy file="doc/changelog.markdown" tofile="build/changelog.txt" />
- 		<tstamp>


=====================================
debian/patches/eclipse-compiler-classpath.patch
=====================================
@@ -0,0 +1,22 @@
+Description: Add the Eclipse compiler to the classpath
+Author: Markus Koschany <apo at debian.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -39,6 +39,16 @@
+ 		<fileset dir="lib/build">
+ 			<include name="*.jar" />
+ 		</fileset>
++		<fileset dir="/usr/share/java">
++			<include name="eclipse-core-jobs.jar" />
++			<include name="eclipse-core-runtime.jar" />
++			<include name="eclipse-core-resources.jar" />
++			<include name="eclipse-jdt-core.jar" />
++			<include name="eclipse-jdt-core-manipulation.jar" />
++			<include name="eclipse-jdt-ui.jar" />
++			<include name="eclipse-jface-text.jar" />
++			<include name="equinox-common.jar" />
++		</fileset>
+ 	</path>
+ 	
+ 	<path id="runtime.path">


=====================================
debian/patches/series
=====================================
@@ -1,4 +1,7 @@
-build.patch
+disable-download-dependencies.patch
+eclipse-compiler-classpath.patch
+stubsstubs-classpath.patch
+disable-changelog.patch
 java9-compatibility.patch
 disable-java6-and-java7-support.patch
 remove-j9stub.patch


=====================================
debian/patches/stubsstubs-classpath.patch
=====================================
@@ -0,0 +1,13 @@
+Description: Add the stubsstubs build directory to the compilation classpath
+Author: Markus Koschany <apo at debian.org>
+Forwarded: not-needed
+--- a/build.xml
++++ b/build.xml
+@@ -295,6 +295,7 @@
+ 			<include name="lombok/javac/**" />
+ 			<include name="lombok/delombok/**" />
+ 			<classpath location="build/lombok" />
++			<classpath location="build/stubsstubs" />
+ 			<classpath refid="build.path" />
+ 		</ivy:compile>
+ 		<delete dir="build/lombok-proc-result" quiet="true" />



View it on GitLab: https://salsa.debian.org/java-team/lombok/-/compare/1965783c272c7a3e99fb3641e80e61033c5a82c9...90dc721a43c823ae0a3ce7cefe5478951857afb3

-- 
View it on GitLab: https://salsa.debian.org/java-team/lombok/-/compare/1965783c272c7a3e99fb3641e80e61033c5a82c9...90dc721a43c823ae0a3ce7cefe5478951857afb3
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/20220510/162a2c29/attachment.htm>
