[lombok] 03/05: add patches to force using jars from Debian
Hans-Christoph Steiner
eighthave at moszumanska.debian.org
Tue Dec 29 22:07:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
eighthave pushed a commit to branch master
in repository lombok.
commit 30112bf2dae81185632491658fcb64cc811f61fa
Author: Hans-Christoph Steiner <hans at eds.org>
Date: Tue Dec 29 10:07:22 2015 +0100
add patches to force using jars from Debian
Otherwise, this will try to download them from various places.
---
debian/patches/add_maven_repo.patch | 20 ++++++++
.../include_jars_from_debian_in_build_path.patch | 60 ++++++++++++++++++++++
.../patches/remove_dependency_on_ensure-ipp.patch | 27 ++++++++++
debian/patches/series | 3 ++
4 files changed, 110 insertions(+)
diff --git a/debian/patches/add_maven_repo.patch b/debian/patches/add_maven_repo.patch
new file mode 100644
index 0000000..517b2c3
--- /dev/null
+++ b/debian/patches/add_maven_repo.patch
@@ -0,0 +1,20 @@
+--- a/buildScripts/ivysettings.xml
++++ b/buildScripts/ivysettings.xml
+@@ -1,10 +1,14 @@
+ <ivysettings>
+ <resolvers>
+ <chain name="projectRepos">
+- <filesystem name="projectLocalRepo">
+- <ivy pattern="${ivy.settings.dir}/ivy-repo/[organization]-[module]-[revision].xml" />
++ <filesystem name="maven_repo">
++ <ivy pattern="${ivy.conf.dir}/ivy-[revision].xml" />
++ <artifact pattern="/usr/share/java/[artifact].[ext]" />
++ </filesystem>
++ <filesystem name="tempRepo">
++ <ivy pattern="${ivy.conf.dir}/ivy-[revision].xml" />
++ <artifact pattern="${ivy.settings.dir}/temp/[artifact].[ext]" />
+ </filesystem>
+- <ibiblio name="maven-repo2" m2compatible="true" root="http://repo2.maven.org/maven2" />
+ </chain>
+ </resolvers>
+ <settings defaultResolver="projectRepos" validate="false" />
diff --git a/debian/patches/include_jars_from_debian_in_build_path.patch b/debian/patches/include_jars_from_debian_in_build_path.patch
new file mode 100644
index 0000000..dd0fa59
--- /dev/null
+++ b/debian/patches/include_jars_from_debian_in_build_path.patch
@@ -0,0 +1,60 @@
+--- a/build.xml
++++ b/build.xml
+@@ -1,3 +1,4 @@
++<?xml version="1.0" encoding="utf-8"?>
+ <!--
+ Copyright (C) 2010-2014 The Project Lombok Authors.
+
+@@ -27,12 +28,32 @@
+
+ <property name="build.compiler" value="javac1.6" />
+ <property name="ivy.retrieve.pattern" value="lib/[conf]/[organisation]-[artifact].[ext]" />
+- <available file="lib/ivyplusplus.jar" property="ivyplusplus.available" />
++ <property file="debian/lombok.version.properties" />
++ <available file="/usr/share/java/ivyplusplus.jar" property="ivyplusplus.available" />
+
+ <path id="build.path">
+- <fileset dir="lib/build">
+- <include name="*.jar" />
+- </fileset>
++ <fileset dir="/usr/share/java">
++ <include name="ant.jar" />
++ <include name="asm3.jar" />
++ <include name="asm3-all.jar" />
++ <include name="com.zwitserloot.cmdreader.jar" />
++ <include name="ecj.jar" />
++ <include name="guava.jar" />
++ <include name="org.eclipse.osgi.jar" />
++ <include name="spi.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/lib/jvm/default-java/lib">
++ <include name="tools.jar" />
++ </fileset>
+ </path>
+
+ <path id="runtime.path">
+@@ -132,13 +153,13 @@
+ <echo level="info">Lombok version: ${lombok.version}</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>
+ </target>
+
+- <target name="compile" depends="version, ensureBuildDeps, -unpackLibs" description="Compiles the code.">
++ <target name="compile" depends="version" 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.
diff --git a/debian/patches/remove_dependency_on_ensure-ipp.patch b/debian/patches/remove_dependency_on_ensure-ipp.patch
new file mode 100644
index 0000000..c4028b2
--- /dev/null
+++ b/debian/patches/remove_dependency_on_ensure-ipp.patch
@@ -0,0 +1,27 @@
+--- a/build.xml
++++ b/build.xml
+@@ -90,12 +90,13 @@
+
+ <target name="ensure-ipp" depends="load-ipp, redownload-ipp" />
+
+- <target name="config-ivy" depends="ensure-ipp" unless="ivy.config">
++ <target name="config-ivy" unless="ivy.config">
++ <echo level="info">Lombok version: ${lombok.version}</echo>
+ <ivy:configure file="buildScripts/ivysettings.xml" />
+ <property name="ivy.config" value="true" />
+ </target>
+
+- <target name="deps" depends="ensureBuildDeps, ensureRuntimeDeps, ensureTestDeps, contrib" description="Downloads all dependencies." />
++ <target name="deps" depends="" description="no-op on Debian" />
+
+ <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" />
+@@ -119,7 +120,7 @@
+ <ivy:retrieve />
+ </target>
+
+- <target name="version" depends="ensure-ipp" description="Shows the version number." unless="lombok.version">
++ <target name="version" description="Shows the version number." unless="lombok.version">
+ <mkdir dir="build/lombok" />
+ <javac includeDestClasses="false" srcdir="src/core" debug="on" destdir="build/lombok" source="1.5" target="1.5" includes="lombok/core/Version.java" includeantruntime="false" />
+ <java
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..75aafab
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+remove_dependency_on_ensure-ipp.patch
+add_maven_repo.patch
+include_jars_from_debian_in_build_path.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lombok.git
More information about the pkg-java-commits
mailing list