This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository janino.
commit 9b2a9134cd5f0159ded4c6b4d91202c32207b09a Author: Emmanuel Bourg <[email protected]> Date: Wed Oct 2 00:51:37 2013 +0200 Build with the upstream Ant build instead of javahelper Install the Maven artifacts in /usr/share/maven-repo --- debian/control | 2 +- debian/libjanino-java.jlibs | 3 -- debian/patches/01-include-ant-runtime.patch | 14 ++++++++ debian/patches/02-skip-commons-compiler-jdk.patch | 31 +++++++++++++++++ debian/patches/03-disable-signing.patch | 36 ++++++++++++++++++++ debian/patches/series | 3 ++ debian/rules | 37 ++++++++++----------- 7 files changed, 102 insertions(+), 24 deletions(-) diff --git a/debian/control b/debian/control index 7cdf907..d0db395 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <[email protected] Uploaders: Philipp Hagemeister <[email protected]>, Damien Raude-Morvan <[email protected]> Standards-Version: 3.9.4 -Build-Depends: debhelper (>= 9), javahelper +Build-Depends: debhelper (>= 9), javahelper, maven-repo-helper Build-Depends-Indep: ant, default-jdk, unzip Homepage: http://janino.net Vcs-Git: git://anonscm.debian.org/pkg-java/janino.git diff --git a/debian/libjanino-java.jlibs b/debian/libjanino-java.jlibs deleted file mode 100644 index d408e47..0000000 --- a/debian/libjanino-java.jlibs +++ /dev/null @@ -1,3 +0,0 @@ -commons-compiler.jar -commons-compiler-jdk.jar -janino.jar \ No newline at end of file diff --git a/debian/patches/01-include-ant-runtime.patch b/debian/patches/01-include-ant-runtime.patch new file mode 100644 index 0000000..ae02e15 --- /dev/null +++ b/debian/patches/01-include-ant-runtime.patch @@ -0,0 +1,14 @@ +Description: Include the Ant runtime to compile AntCompilerAdapter +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/janino-dist/build.xml ++++ b/janino-dist/build.xml +@@ -64,7 +64,7 @@ + classpath="${ant.jar}:build/bin-commons-compiler:../de.unkrig.jdisasm/bin" + debug="true" + debuglevel="lines,vars,source" +- includeantruntime="false" ++ includeantruntime="true" + > + <compilerarg value="-Xlint:none"/> + <compilerarg value="-Xlint:deprecation"/> diff --git a/debian/patches/02-skip-commons-compiler-jdk.patch b/debian/patches/02-skip-commons-compiler-jdk.patch new file mode 100644 index 0000000..5e86410 --- /dev/null +++ b/debian/patches/02-skip-commons-compiler-jdk.patch @@ -0,0 +1,31 @@ +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 <[email protected]> +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 new file mode 100644 index 0000000..602f899 --- /dev/null +++ b/debian/patches/03-disable-signing.patch @@ -0,0 +1,36 @@ +Description: Disable the code signing with a self signed certificated. + This doesn't play well with the manifest modification performed by + jh_manifest to make the jar executable (and signing with a self signed + certificate doesn't provide any security anyway). +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/janino-dist/build.xml ++++ b/janino-dist/build.xml +@@ -44,13 +44,6 @@ + </manifest> + <fileset dir="build/bin-commons-compiler"/> + </jar> +- <signjar +- keystore="dummy-keystore" +- storepass="storepass" +- keypass="keypass" +- jar="build/commons-compiler.jar" +- alias="dummy" +- /> + + <!-- Build 'build/janino.jar'. --> + <delete dir="build/bin-janino"/> +@@ -79,13 +72,6 @@ + </manifest> + <fileset dir="build/bin-janino"/> + </jar> +- <signjar +- keystore="dummy-keystore" +- storepass="storepass" +- keypass="keypass" +- jar="build/janino.jar" +- alias="dummy" +- /> + + <!-- Build 'build/commons-compiler-jdk.jar'. --> + <!-- diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..8bafbe7 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,3 @@ +01-include-ant-runtime.patch +02-skip-commons-compiler-jdk.patch +03-disable-signing.patch diff --git a/debian/rules b/debian/rules index 1a6b84c..8cf67f0 100755 --- a/debian/rules +++ b/debian/rules @@ -1,31 +1,28 @@ #!/usr/bin/make -f export JAVA_HOME=/usr/lib/jvm/default-java -export CLASSPATH=/usr/share/java/ant.jar:commons-compiler.jar +export CLASSPATH=/usr/share/java/ant.jar + +VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p') %: - dh $@ --with javahelper + dh $@ --buildsystem ant -# Package name (exclusively) for get-orig-source. ${DEB_SOURCE_PACKAGE} can't be used as it does not work when calling get-orig-source from any directory as -# http://www.debian.org/doc/debian-policy/ch-source.html#s-debianrules defines. -PACKAGE_NAME := janino +override_dh_auto_build: + dh_auto_build -- -buildfile janino-dist/build.xml build -override_dh_auto_configure: - unzip -q -o -d commons-compiler-jdk/ commons-compiler-jdk-src.zip - unzip -q -o -d commons-compiler/ commons-compiler-src.zip - unzip -q -o -d janino/ janino-src.zip +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) janino/pom.xml + mh_installjar -plibjanino-java --java-lib -e$(VERSION) janino/pom.xml janino-dist/build/janino.jar + + jh_manifest -plibjanino-java override_dh_auto_clean: - -rm -rf janino/ commons-compiler/ commons-compiler-jdk/ + -rm -rf janino-dist/build janino-dist/mirror + mh_clean get-orig-source:: - cd ${DEBIAN_DIR}/.. && \ - version=$$(uscan --force-download --dehs | sed -n 's/.*<upstream-version>\(.*\)<\/upstream-version>.*/\1/p') && \ - tmpDir=$$(mktemp -d) && \ - unzip -q ../janino-$${version}.zip -d $${tmpDir} -x "janino-$${version}/javadoc/*" "janino-$${version}/lib/*" && \ - rm ../janino-$${version}.zip && \ - mkdir -p $${tmpDir}/zipdir && \ - mv $${tmpDir}/janino-$${version} $${tmpDir}/zipdir/${PACKAGE_NAME}-$${version} && \ - tar cfz ${CURDIR}/${PACKAGE_NAME}_$${version}.orig.tar.gz -C $${tmpDir}/zipdir ${PACKAGE_NAME}-$${version} ; \ - rm -rf $${tmpDir} - + uscan --force-download -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/janino.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
