[Git][java-team/lombok][master] Build depend on libeclipse-jdt-ui-java instead of eclipse-jdt

[Emmanuel Bourg]

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


Commits:
40813a3b by Emmanuel Bourg at 2018-11-23T14:46:40Z
Build depend on libeclipse-jdt-ui-java instead of eclipse-jdt

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/patches/build.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+lombok (1.16.22-5) unstable; urgency=medium
+
+  * Team upload.
+  * Build depend on libeclipse-jdt-ui-java instead of eclipse-jdt
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 23 Nov 2018 15:46:34 +0100
+
 lombok (1.16.22-4) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/control
=====================================
@@ -11,11 +11,10 @@ Build-Depends:
  cmdreader,
  debhelper (>= 11),
  default-jdk,
- eclipse-jdt,
  ivyplusplus (>= 1.26),
  javahelper,
  libasm-java,
- libecj-java,
+ libeclipse-jdt-ui-java,
  libjna-java,
  liblombok-patcher-java,
  libosgi-core-java,


=====================================
debian/patches/build.patch
=====================================
@@ -1,32 +1,23 @@
 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 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
+@@ -37,6 +37,13 @@
  		<fileset dir="lib/build">
  			<include name="*.jar" />
  		</fileset>
-+        <fileset dir="/usr/share/eclipse/dropins/jdt/plugins/">
-+            <include name="*.jar" />
-+        </fileset>
-+        <fileset dir="/usr/share/eclipse/plugins/">
-+            <include name="*.jar" />
-+        </fileset>
-+        <fileset dir="/usr/lib/eclipse/plugins/">
-+            <include name="*.jar" />
-+        </fileset>
++		<fileset dir="/usr/share/java">
++			<include name="eclipse-core-runtime.jar" />
++			<include name="eclipse-core-resources.jar" />
++			<include name="eclipse-jdt-core.jar" />
++			<include name="eclipse-jdt-ui.jar" />
++			<include name="equinox-common.jar" />
++		</fileset>
  	</path>
  	
  	<path id="runtime.path">
-@@ -87,14 +96,14 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
+@@ -87,14 +94,14 @@
  		<fail>A new version of ivyplusplus was required and has been downloaded. Rerun the script to continue.</fail>
  	</target>
  	
@@ -43,7 +34,7 @@ index ed989fe..d27092b 100644
  	
  	<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 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
+@@ -117,8 +124,6 @@
  	</target>
  	
  	<target name="ensureRuntimeDeps" depends="config-ivy">
@@ -52,7 +43,7 @@ index ed989fe..d27092b 100644
  	</target>
  	
  	<target name="ensureTestDeps" depends="config-ivy">
-@@ -155,7 +162,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
+@@ -155,7 +160,7 @@
  		<echo level="info">Lombok version: ${lombok.version} (${lombok.fullversion})</echo>
  	</target>
  	
@@ -61,7 +52,7 @@ index ed989fe..d27092b 100644
  		<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
+@@ -176,7 +181,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>
  	
@@ -70,7 +61,7 @@ index ed989fe..d27092b 100644
  		<!-- 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 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
+@@ -280,6 +285,7 @@
  			<include name="lombok/javac/**" />
  			<include name="lombok/delombok/**" />
  			<classpath location="build/lombok" />
@@ -78,7 +69,7 @@ index ed989fe..d27092b 100644
  			<classpath refid="build.path" />
  		</ivy:compile>
  		<delete dir="build/lombok-proc-result" quiet="true" />
-@@ -318,7 +326,7 @@ lombok.launch.AnnotationProcessorHider$ClaimingProcessor,isolating</echo>
+@@ -318,7 +324,7 @@
  		</ant>
  	</target>
  	



View it on GitLab: https://salsa.debian.org/java-team/lombok/commit/40813a3b32e51771a91219a6148f4e46a8b71301

-- 
View it on GitLab: https://salsa.debian.org/java-team/lombok/commit/40813a3b32e51771a91219a6148f4e46a8b71301
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/20181123/82628f58/attachment.html>