This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-digest.
commit 9d226607ae26a2279e47ce569ee8d90766788b25 Author: Ludovic Claude <[email protected]> Date: Wed Jul 8 20:22:37 2009 +0000 * Update packaging to use maven-ant-helper --- debian/build.properties | 2 ++ debian/build.xml | 43 ------------------------------------------- debian/changelog | 3 ++- debian/control | 2 +- debian/rules | 14 +++++++------- 5 files changed, 12 insertions(+), 52 deletions(-) diff --git a/debian/build.properties b/debian/build.properties new file mode 100644 index 0000000..e2ae10b --- /dev/null +++ b/debian/build.properties @@ -0,0 +1,2 @@ +javadoc.dir=build/api +maven.test.skip=true diff --git a/debian/build.xml b/debian/build.xml deleted file mode 100644 index 4d97d88..0000000 --- a/debian/build.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project default="jar" name="${package}" basedir=".."> - - <target name="init"> - <property name="jar.name" value="${package}-${version}.jar" /> - <property name="classes.dir" value="classes" /> - <property name="source.dir" value="." /> - <property name="artifactId" value="${package}" /> - <property name="groupId" value="org.codehaus.plexus" /> - </target> - - <target name="clean" depends="init"> - <delete dir="${classes.dir}" quiet="true"/> - <delete file="${jar.name}" quiet="true"/> - </target> - - <target name="compile" depends="init"> - <mkdir dir="${classes.dir}"/> - <java classpath="/usr/share/maven-repo/org/debian/maven/maven-repo-helper/debian/maven-repo-helper-debian.jar" - classname="org.debian.maven.repo.POMCleaner"> - <arg value="-plib${package}-java" /> - <arg value="-rdebian/maven.rules" /> - <arg value="--no-parent" /> - <arg value="--keep-pom-version" /> - <arg value="pom.xml" /> - <arg value="${classes.dir}/META-INF/maven/${groupId}/${artifactId}/pom.xml" /> - <arg value="${classes.dir}/META-INF/maven/${groupId}/${artifactId}/pom.properties" /> - </java> - <copy file="${classes.dir}/META-INF/maven/${groupId}/${artifactId}/pom.xml" tofile="pom.xml" overwrite="true"/> - <javac srcdir="${source.dir}" destdir="${classes.dir}" - debug="true" source="1.5" excludes="**/*Test.java" /> - </target> - - <target name="jar" description="o Create the jar" depends="compile"> - <echo message="Building jar ${jar.name}" /> - <jar jarfile="${jar.name}"> - <fileset dir="${classes.dir}"> - <include name="**"/> - </fileset> - </jar> - </target> -</project> diff --git a/debian/changelog b/debian/changelog index 3916803..3f04e50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,8 @@ plexus-digest (1.1-1) unstable; urgency=low [Ludovic Claude] * Change section to java, bump up Standards-Version to 3.8.1 * Add the Maven POM to the package, - * Add a Build-Depends-Indep dependency on maven-repo-helper + * Add a Build-Depends-Indep dependency on maven-repo-helper and + maven-ant-helper, use maven-build.xml for the build * Use mh_installpom and mh_installjar to install the POM and the jar to the Maven repository * Update watch and orig-tar.sh to reflect changes on the web site diff --git a/debian/control b/debian/control index 9c74581..da7e9dc 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Paul Cager <[email protected]> Build-Depends: cdbs, debhelper (>= 6), default-jdk -Build-Depends-Indep: maven-repo-helper, ant, libplexus-utils-java +Build-Depends-Indep: maven-repo-helper, maven-ant-helper, ant, libplexus-utils-java Standards-Version: 3.8.1 Homepage: http://plexus.codehaus.org Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-digest diff --git a/debian/rules b/debian/rules index ff4638f..04b9404 100755 --- a/debian/rules +++ b/debian/rules @@ -6,18 +6,18 @@ include /usr/share/cdbs/1/class/ant.mk PACKAGE := $(DEB_SOURCE_PACKAGE) VERSION := $(DEB_UPSTREAM_VERSION) JAVA_HOME := /usr/lib/jvm/default-java -DEB_ANT_BUILD_TARGET := jar -DEB_ANT_BUILDFILE := debian/build.xml -DEB_JARS := plexus-utils -ANT_OPTS := -Dversion=$(DEB_UPSTREAM_VERSION) -Dpackage=$(DEB_SOURCE_PACKAGE) +DEB_JARS := ant-nodeps plexus-utils +DEB_ANT_BUILD_TARGET := package +DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml +DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION) makebuilddir/lib$(PACKAGE)-java:: - install -d classes/META-INF/plexus/ - install -m644 debian/components.xml classes/META-INF/plexus/ + install -d build/classes/META-INF/plexus/ + install -m644 debian/components.xml build/classes/META-INF/plexus/ binary-post-install/lib$(PACKAGE)-java:: mh_installpoms -plib$(PACKAGE)-java - mh_installjar -plib$(PACKAGE)-java -l pom.xml $(PACKAGE)-$(VERSION).jar + mh_installjar -plib$(PACKAGE)-java -l pom.xml build/$(PACKAGE)-$(VERSION).jar clean:: -rm -rf debian/tmp -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-digest.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
