[lombok-ast] 02/03: remove code that downloads ivyplusplus
Hans-Christoph Steiner
eighthave at moszumanska.debian.org
Fri Dec 18 09:54:00 UTC 2015
This is an automated email from the git hooks/post-receive script.
eighthave pushed a commit to branch master
in repository lombok-ast.
commit 5f8ba64118466c3b6f615e17c3bf017b66f286a4
Author: Hans-Christoph Steiner <hans at eds.org>
Date: Fri Dec 18 10:45:36 2015 +0100
remove code that downloads ivyplusplus
---
debian/patches/fix_java7_build.patch | 8 ++---
.../patches/remove_dependency_on_ensure-ipp.patch | 35 ++++++++++++++++++----
debian/patches/use_https_always.patch | 26 +++-------------
3 files changed, 38 insertions(+), 31 deletions(-)
diff --git a/debian/patches/fix_java7_build.patch b/debian/patches/fix_java7_build.patch
index 1e5acea..432bee8 100644
--- a/debian/patches/fix_java7_build.patch
+++ b/debian/patches/fix_java7_build.patch
@@ -8,7 +8,7 @@ Description: building with openjdk-7 dies with an error
--- a/build.xml
+++ b/build.xml
-@@ -57,7 +57,7 @@
+@@ -56,7 +56,7 @@
<taskdef name="sshexec" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.SSHExec" classpathref="build.path" />
</target>
@@ -17,7 +17,7 @@ Description: building with openjdk-7 dies with an error
<mkdir dir="build/lombok.ast" />
<ivy:compile destdir="build/lombok.ast" srcdir="src/main" includes="lombok/ast/Version.java" />
<java
-@@ -65,6 +65,7 @@
+@@ -64,6 +64,7 @@
classpath="build/lombok.ast"
failonerror="true"
output="build/version.txt" />
@@ -25,7 +25,7 @@ Description: building with openjdk-7 dies with an error
<echo level="info">Lombok ast version: ${lombok.ast.version}</echo>
</target>
-@@ -82,7 +83,7 @@
+@@ -81,7 +82,7 @@
</target>
<target name="templateProcessor" depends="ensureBuildDeps" description="Builds the template processor.">
@@ -34,7 +34,7 @@ Description: building with openjdk-7 dies with an error
<classpath refid="build.path" />
</ivy:compile>
<mkdir dir="build/templateProcessor/META-INF" />
-@@ -191,7 +192,7 @@
+@@ -190,7 +191,7 @@
<ivy:show-html file="build/cobertura/index.html" />
</target>
diff --git a/debian/patches/remove_dependency_on_ensure-ipp.patch b/debian/patches/remove_dependency_on_ensure-ipp.patch
index 7ca86ce..5d432bf 100644
--- a/debian/patches/remove_dependency_on_ensure-ipp.patch
+++ b/debian/patches/remove_dependency_on_ensure-ipp.patch
@@ -1,7 +1,32 @@
--- a/build.xml
+++ b/build.xml
-@@ -43,8 +43,11 @@
- <target name="ensure-ipp" depends="load-ipp, redownload-ipp" />
+@@ -22,29 +22,20 @@
+ <project name="lombok.ast" default="dist" xmlns:ivy="antlib:com.zwitserloot.ivyplusplus">
+ <property name="build.compiler" value="javac1.6" />
+ <property name="ivy.retrieve.pattern" value="lib/[conf]/[artifact].[ext]" />
+- <available file="lib/ivyplusplus.jar" property="ivyplusplus.available" />
+ <available file="doc/jls/j3TOC.html" property="jls-available" />
+
+- <target name="download-ipp" unless="ivyplusplus.available">
+- <mkdir dir="lib" />
+- <get src="http://projectlombok.org/downloads/ivyplusplus.jar" dest="lib/ivyplusplus.jar" usetimestamp="true" />
++ <target name="load-ipp">
++ <taskdef classpath="/usr/share/java/ivyplusplus.jar" resource="com/zwitserloot/ivyplusplus/antlib.xml" uri="antlib:com.zwitserloot.ivyplusplus" />
+ </target>
+-
+- <target name="load-ipp" depends="download-ipp">
+- <taskdef classpath="lib/ivyplusplus.jar" resource="com/zwitserloot/ivyplusplus/antlib.xml" uri="antlib:com.zwitserloot.ivyplusplus" />
+- <ivy:ensureippversion version="1.12" property="ivyplusplus.minimumAvailable" />
+- </target>
+-
+- <target name="redownload-ipp" unless="ivyplusplus.minimumAvailable">
+- <get src="http://projectlombok.org/downloads/ivyplusplus.jar" dest="lib/ivyplusplus.jar" />
+- <fail>A new version of ivyplusplus was required and has been downloaded. Rerun the script to continue.</fail>
+- </target>
+-
+- <target name="ensure-ipp" depends="load-ipp, redownload-ipp" />
++
++ <target name="ensure-ipp" depends="load-ipp" />
<path id="build.path">
- <fileset dir="lib/build">
@@ -14,7 +39,7 @@
</fileset>
</path>
-@@ -65,7 +57,7 @@
+@@ -65,7 +56,7 @@
<taskdef name="sshexec" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.SSHExec" classpathref="build.path" />
</target>
@@ -23,7 +48,7 @@
<mkdir dir="build/lombok.ast" />
<ivy:compile destdir="build/lombok.ast" srcdir="src/main" includes="lombok/ast/Version.java" />
<java
-@@ -73,7 +65,6 @@
+@@ -73,7 +64,6 @@
classpath="build/lombok.ast"
failonerror="true"
output="build/version.txt" />
@@ -31,7 +56,7 @@
<echo level="info">Lombok ast version: ${lombok.ast.version}</echo>
</target>
-@@ -200,7 +191,7 @@
+@@ -200,7 +190,7 @@
<ivy:show-html file="build/cobertura/index.html" />
</target>
diff --git a/debian/patches/use_https_always.patch b/debian/patches/use_https_always.patch
index 767326c..e085f53 100644
--- a/debian/patches/use_https_always.patch
+++ b/debian/patches/use_https_always.patch
@@ -7,25 +7,7 @@ Description: always use HTTPS when downloading jars
--- a/build.xml
+++ b/build.xml
-@@ -27,7 +27,7 @@
-
- <target name="download-ipp" unless="ivyplusplus.available">
- <mkdir dir="lib" />
-- <get src="http://projectlombok.org/downloads/ivyplusplus.jar" dest="lib/ivyplusplus.jar" usetimestamp="true" />
-+ <get src="https://projectlombok.org/downloads/ivyplusplus.jar" dest="lib/ivyplusplus.jar" usetimestamp="true" />
- </target>
-
- <target name="load-ipp" depends="download-ipp">
-@@ -36,7 +36,7 @@
- </target>
-
- <target name="redownload-ipp" unless="ivyplusplus.minimumAvailable">
-- <get src="http://projectlombok.org/downloads/ivyplusplus.jar" dest="lib/ivyplusplus.jar" />
-+ <get src="https://projectlombok.org/downloads/ivyplusplus.jar" dest="lib/ivyplusplus.jar" />
- <fail>A new version of ivyplusplus was required and has been downloaded. Rerun the script to continue.</fail>
- </target>
-
-@@ -219,7 +219,7 @@
+@@ -218,7 +218,7 @@
<target name="fetchJLS" unless="jls-available">
<mkdir dir="doc/jls" />
@@ -34,7 +16,7 @@ Description: always use HTTPS when downloading jars
<unzip src="doc/jls/langspec-3.0.zip" dest="doc/jls" />
<delete file="doc/jls/langspec-3.0.zip" />
</target>
-@@ -268,7 +268,7 @@
+@@ -267,7 +267,7 @@
<classpath location="build/templateProcessor.jar" />
<classpath refid="build.path" />
<link href="http://download.oracle.com/javase/6/docs/api/" />
@@ -43,7 +25,7 @@ Description: always use HTTPS when downloading jars
<bottom><![CDATA[<i>Copyright © 2010-2011 The Project Lombok Authors, licensed under the <a href='http://www.opensource.org/licenses/mit-license.php'>MIT licence</a>.]]></bottom>
</javadoc>
<!-- bugfix for boneheaded javadoc bug where ?is-external=true is inserted before an anchor ref, breaking the anchor ref.
-@@ -370,7 +370,7 @@
+@@ -369,7 +369,7 @@
<srcdir dir="test/src" test="true" />
</module>
<settings>
@@ -52,7 +34,7 @@ Description: always use HTTPS when downloading jars
</settings>
<apt enabled="true" />
</ivy:intellijgen>
-@@ -389,7 +389,7 @@
+@@ -388,7 +388,7 @@
<conf name="build" sources="contrib" />
<conf name="test" sources="contrib" />
<settings>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lombok-ast.git
More information about the pkg-java-commits
mailing list