This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libcommons-compress-java.
commit 7dc99e4e8dae8dd0344aa266888ae37f0a3f1655 Author: Damien Raude-Morvan <[email protected]> Date: Tue May 29 23:32:23 2012 +0000 * Team upload. * Enablement of JUnit test suite (LP: #876413) (Closes: 646090): - d/build.xml: Provide targets to compile and execute test suite. - d/control: Add B-D's on junit and ant-optional to support testing. - d/rules: Add ant-junit and junit to DEB_JARS for testing. * d/copyright: Updated for revised field names. * d/control: Bumped Standards-Version: 3.9.3, no changes. --- debian/ant.properties | 5 +++++ debian/build.xml | 41 ++++++++++++++++++++++++++++++++++++++++- debian/changelog | 16 ++++++++++++++++ debian/control | 10 ++++++++-- debian/copyright | 8 ++++---- debian/rules | 1 + 6 files changed, 74 insertions(+), 7 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties index 9e619b3..a4a55b0 100644 --- a/debian/ant.properties +++ b/debian/ant.properties @@ -2,3 +2,8 @@ project.name=commons-compress class.dir=build source.dir=src/main/java jar=commons-compress.jar +test.dir=test +test.class.dir=${test.dir}/build +test.source.dir=src/test/java +test.res.dir=src/test/resources +test.results.dir=${test.dir}/results diff --git a/debian/build.xml b/debian/build.xml index 4be14e1..7afaa23 100644 --- a/debian/build.xml +++ b/debian/build.xml @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<project default="jar" name="${project.name}" basedir=".."> +<project default="package" name="${project.name}" basedir=".."> <target name="clean"> <delete dir="${class.dir}" quiet="true"/> + <delete dir="${test.dir}" quiet="true"/> </target> <target name="compile" description="o Compile the source files"> @@ -12,6 +13,42 @@ debug="true" source="1.5"/> </target> + <target name="test-compile" description="o Compile the test source files" depends="compile"> + <mkdir dir="${test.class.dir}"/> + <javac srcdir="${test.source.dir}" destdir="${test.class.dir}" + debug="true" source="1.5" encoding="ISO-8859-1"> + <classpath> + <pathelement location="${class.dir}"/> + <pathelement path="${java.class.path}"/> + </classpath> + </javac> + <copy todir="${test.class.dir}"> + <fileset dir="${test.res.dir}"> + <exclude name="**/*.java"/> + </fileset> + </copy> + </target> + + <target name="test" depends="test-compile"> + <mkdir dir="${test.results.dir}"/> + <junit printsummary="yes" haltonfailure="yes"> + <classpath> + <pathelement location="${class.dir}"/> + <pathelement location="${test.class.dir}"/> + <pathelement path="${java.class.path}"/> + </classpath> + <formatter type="plain"/> + <batchtest todir="${test.results.dir}"> + <fileset dir="${test.source.dir}"> + <include name="**/*TestCase.java"/> + <include name="**/*Test.java"/> + <exclude name="**/*$*"/> + <exclude name="**/Abstract*"/> + </fileset> + </batchtest> + </junit> + </target> + <target name="jar" description="o Create the jar" depends="compile"> <jar jarfile="${jar}"> <fileset dir="${class.dir}"> @@ -20,4 +57,6 @@ </jar> </target> + <target name="package" depends="test,jar"/> + </project> diff --git a/debian/changelog b/debian/changelog index 22e2af3..29052ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +libcommons-compress-java (1.2-2) unstable; urgency=low + + * Team upload. + + [ James Page ] + * Enablement of JUnit test suite (LP: #876413) (Closes: 646090): + - d/build.xml: Provide targets to compile and execute test suite. + - d/control: Add B-D's on junit and ant-optional to support testing. + - d/rules: Add ant-junit and junit to DEB_JARS for testing. + * d/copyright: Updated for revised field names. + + [ Damien Raude-Morvan ] + * d/control: Bumped Standards-Version: 3.9.3, no changes. + + -- Damien Raude-Morvan <[email protected]> Wed, 30 May 2012 01:26:41 +0200 + libcommons-compress-java (1.2-1) unstable; urgency=low * New upstream release diff --git a/debian/control b/debian/control index a5906e1..ae8ca39 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,14 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]> -Build-Depends: ant, cdbs, debhelper (>= 5), default-jdk, maven-repo-helper -Standards-Version: 3.8.3 +Build-Depends: ant, + ant-optional, + cdbs, + debhelper (>= 5), + default-jdk, + junit, + maven-repo-helper +Standards-Version: 3.9.3 Homepage: http://commons.apache.org/compress/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-compress-java/ Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libcommons-compress-java diff --git a/debian/copyright b/debian/copyright index a01e68c..25f3c92 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,8 +1,9 @@ -Format-Specification: http://dep.debian.net/deps/dep5/ -Name: Apache Commons Compress -Maintainer: The Apache Software Foundation. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Apache Commons Compress +Upstream-Contact: The Apache Software Foundation. Source: http://commons.apache.org/compress/ +Files: * Copyright: 2001-2009, The Apache Software Foundation. License: Apache-2.0 @@ -13,4 +14,3 @@ License: Apache-2.0 License: Apache-2.0 On Debian GNU/Linux system you can find the complete text of the license in '/usr/share/common-licenses/Apache-2.0' - diff --git a/debian/rules b/debian/rules index a0e2e76..c984c33 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,7 @@ include /usr/share/cdbs/1/class/ant.mk JAVA_HOME := /usr/lib/jvm/default-java DEB_ANT_BUILDFILE := debian/build.xml +DEB_JARS := ant-junit junit PACKAGE := commons-compress install/lib$(PACKAGE)-java:: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libcommons-compress-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
