[lombok-ast] 05/08: fix error when building with openjdk-7

[Hans-Christoph Steiner]

This is an automated email from the git hooks/post-receive script.

eighthave pushed a commit to branch master
in repository lombok-ast.

commit e96c173141f8ddae336c76bca6e7eb2d29412cfb
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Fri Dec 18 10:07:06 2015 +0100

    fix error when building with openjdk-7
---
 debian/patches/fix_java7_build.patch | 45 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 2 files changed, 46 insertions(+)

diff --git a/debian/patches/fix_java7_build.patch b/debian/patches/fix_java7_build.patch
new file mode 100644
index 0000000..9e5659b
--- /dev/null
+++ b/debian/patches/fix_java7_build.patch
@@ -0,0 +1,45 @@
+Description: building with openjdk-7 dies with an error
+ It seems that ivy:compile defaults to Java8 source and target wen building
+ because when building against openjdk-7, it dies with this error:
+ .
+ [compile:javac] Compiling 10 source files to /export/share/code/pkg-java/lombok-ast/build/templateProcessor
+ [ivy:compile] javac: invalid source release: 1.8
+
+
+--- a/build.xml
++++ b/build.xml
+@@ -68,7 +68,7 @@
+ 		<taskdef name="sshexec" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.SSHExec" classpathref="build.path" />
+ 	</target>
+ 	
+-	<target name="version" description="Shows the version number.">
++	<target name="version" depends="ensure-ipp" description="Shows the version number.">
+ 		<mkdir dir="build/lombok.ast" />
+ 		<ivy:compile destdir="build/lombok.ast" srcdir="src/main" includes="lombok/ast/Version.java" />
+ 		<java
+@@ -76,6 +76,7 @@
+ 			classpath="build/lombok.ast"
+ 			failonerror="true"
+ 			output="build/version.txt" />
++		<ivy:loadversion property="lombok.ast.version" file="build/version.txt" />
+ 		<echo level="info">Lombok ast version: ${lombok.ast.version}</echo>
+ 	</target>
+ 	
+@@ -93,7 +94,7 @@
+ 	</target>
+ 	
+ 	<target name="templateProcessor" depends="ensureBuildDeps" description="Builds the template processor.">
+-		<ivy:compile destdir="build/templateProcessor" srcdir="src/template">
++		<ivy:compile destdir="build/templateProcessor" srcdir="src/template" source="1.7" target="1.7">
+ 			<classpath refid="build.path" />
+ 		</ivy:compile>
+ 		<mkdir dir="build/templateProcessor/META-INF" />
+@@ -202,7 +203,7 @@
+ 		<ivy:show-html file="build/cobertura/index.html" />
+ 	</target>
+ 		
+-	<target name="config-ivy">
++	<target name="config-ivy" depends="ensure-ipp">
+ 		<ivy:configure file="buildScripts/ivysettings.xml" />
+ 	</target>
+ 	
diff --git a/debian/patches/series b/debian/patches/series
index d48dadf..5b05df3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ remove_dependency_on_ensure-ipp.patch
 add_maven_repo.patch
 remove_missing_dependency.patch
 parboiled.patch
+fix_java7_build.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lombok-ast.git