[janino] 01/03: Build and install the commons-compiler-jdk component

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository janino.

commit bb762da508e66afb6ac314d8a0a578cf34b49c8d
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Oct 2 13:45:18 2013 +0200

    Build and install the commons-compiler-jdk component
---
 .../02-remove-nullanalysis-annotations.patch       |   45 ++++++++++++++++++++
 debian/patches/02-skip-commons-compiler-jdk.patch  |   31 --------------
 debian/patches/03-disable-signing.patch            |   16 ++++++-
 debian/patches/series                              |    2 +-
 debian/rules                                       |    3 ++
 5 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/debian/patches/02-remove-nullanalysis-annotations.patch b/debian/patches/02-remove-nullanalysis-annotations.patch
new file mode 100644
index 0000000..e79f8bd
--- /dev/null
+++ b/debian/patches/02-remove-nullanalysis-annotations.patch
@@ -0,0 +1,45 @@
+Description: Removes the use of the de.unkrig.commons.nullanalysis annotations
+ which aren't provided with the upstream sources.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/commons-compiler-jdk/src/org/codehaus/commons/compiler/jdk/package-info.java
++++ b/commons-compiler-jdk/src/org/codehaus/commons/compiler/jdk/package-info.java
+@@ -27,5 +27,5 @@
+ /**
+  * Main package of the plugin.
+  */
+- at de.unkrig.commons.nullanalysis.NotNullByDefault package org.codehaus.commons.compiler.jdk;
++package org.codehaus.commons.compiler.jdk;
+ 
+--- a/janino-dist/build.xml
++++ b/janino-dist/build.xml
+@@ -88,21 +88,6 @@
+ 		/>
+ 
+ 		<!-- Build 'build/commons-compiler-jdk.jar'. -->
+-		<delete dir="build/bin-de.unkrig.commons.nullanalysis"/>
+-		<mkdir dir="build/bin-de.unkrig.commons.nullanalysis"/>
+-		<javac
+-			fork="yes"
+-			source="1.6"
+-			target="1.6"
+-			srcdir="../de.unkrig.commons.nullanalysis/src"
+-			destdir="build/bin-de.unkrig.commons.nullanalysis"
+-			debug="true"
+-			debuglevel="lines,vars,source"
+-			includeantruntime="false"
+-		>
+-			<compilerarg value="-Xlint:none"/>
+-			<compilerarg value="-Xlint:deprecation"/>
+-		</javac>
+ 		<delete dir="build/bin-commons-compiler-jdk"/>
+ 		<mkdir dir="build/bin-commons-compiler-jdk"/>
+ 		<javac
+@@ -128,7 +113,6 @@
+ 				<attribute name="Implementation-URL"     value="http://janino.net"/>
+ 			</manifest>
+ 			<fileset dir="build/bin-commons-compiler-jdk"/>
+-			<fileset dir="build/bin-de.unkrig.commons.nullanalysis"/>
+ 		</jar>
+ 		<signjar
+ 			keystore="dummy-keystore"
diff --git a/debian/patches/02-skip-commons-compiler-jdk.patch b/debian/patches/02-skip-commons-compiler-jdk.patch
deleted file mode 100644
index 5e86410..0000000
--- a/debian/patches/02-skip-commons-compiler-jdk.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Do not build the commons-compiler-jdk component which fails to build
- due to the missing nullanalysis annotations. This component is not necessary for
- running janino.
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: no
---- a/janino-dist/build.xml
-+++ b/janino-dist/build.xml
-@@ -88,6 +88,7 @@
- 		/>
- 
- 		<!-- Build 'build/commons-compiler-jdk.jar'. -->
-+<!--
- 		<delete dir="build/bin-de.unkrig.commons.nullanalysis"/>
- 		<mkdir dir="build/bin-de.unkrig.commons.nullanalysis"/>
- 		<javac
-@@ -137,6 +138,7 @@
- 			jar="build/commons-compiler-jdk.jar"
- 			alias="dummy"
- 		/>
-+-->
- 
- 		<!-- Build source ZIP files. -->
- 		<zip destfile="build/commons-compiler-src.zip" filesonly="true">
-@@ -153,7 +155,6 @@
- 		<zip destfile="mirror/download/janino-${version}.zip" filesonly="true">
- 			<zipfileset file="build/commons-compiler.jar"     prefix="janino-${version}"/>
- 			<zipfileset file="build/janino.jar"               prefix="janino-${version}"/>
--			<zipfileset file="build/commons-compiler-jdk.jar" prefix="janino-${version}"/>
- 
- 			<zipfileset file="build/commons-compiler-src.zip"     prefix="janino-${version}"/>
- 			<zipfileset file="build/janino-src.zip"               prefix="janino-${version}"/>
diff --git a/debian/patches/03-disable-signing.patch b/debian/patches/03-disable-signing.patch
index 602f899..72dfd84 100644
--- a/debian/patches/03-disable-signing.patch
+++ b/debian/patches/03-disable-signing.patch
@@ -33,4 +33,18 @@ Forwarded: not-needed
 -		/>
  
  		<!-- Build 'build/commons-compiler-jdk.jar'. -->
- <!--
+ 		<delete dir="build/bin-commons-compiler-jdk"/>
+@@ -114,13 +100,6 @@
+ 			</manifest>
+ 			<fileset dir="build/bin-commons-compiler-jdk"/>
+ 		</jar>
+-		<signjar
+-			keystore="dummy-keystore"
+-			storepass="storepass"
+-			keypass="keypass"
+-			jar="build/commons-compiler-jdk.jar"
+-			alias="dummy"
+-		/>
+ 
+ 		<!-- Build source ZIP files. -->
+ 		<zip destfile="build/commons-compiler-src.zip" filesonly="true">
diff --git a/debian/patches/series b/debian/patches/series
index 8bafbe7..dd8cf2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 01-include-ant-runtime.patch
-02-skip-commons-compiler-jdk.patch
+02-remove-nullanalysis-annotations.patch
 03-disable-signing.patch
diff --git a/debian/rules b/debian/rules
index 8cf67f0..fcc92c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,9 @@ override_dh_auto_install:
 	mh_installpom -plibjanino-java --no-parent --has-package-version -e$(VERSION) commons-compiler/pom.xml
 	mh_installjar -plibjanino-java --java-lib -e$(VERSION) commons-compiler/pom.xml janino-dist/build/commons-compiler.jar
 	
+	mh_installpom -plibjanino-java --no-parent --has-package-version -e$(VERSION) commons-compiler-jdk/pom.xml
+	mh_installjar -plibjanino-java --java-lib -e$(VERSION) commons-compiler-jdk/pom.xml janino-dist/build/commons-compiler-jdk.jar
+	
 	mh_installpom -plibjanino-java --no-parent --has-package-version -e$(VERSION) janino/pom.xml
 	mh_installjar -plibjanino-java --java-lib -e$(VERSION) janino/pom.xml janino-dist/build/janino.jar
 	

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