[plexus-cli] 05/22: * Update packaging to use maven-ant-helper

[Emmanuel Bourg]

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

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

commit 64af381df7d210c0e365e10a2db9fc37c4decbe7
Author: Ludovic Claude <ludovic.claude at laposte.net>
Date:   Wed Jul 8 20:04:01 2009 +0000

    * Update packaging to use maven-ant-helper
---
 debian/build.properties |  2 ++
 debian/build.xml        | 43 -------------------------------------------
 debian/control          |  2 +-
 debian/rules            | 16 ++++++++--------
 4 files changed, 11 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/control b/debian/control
index 53fa2e7..bb4998d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Paul Cager <paul-debian at home.paulcager.org>
 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,
  libplexus-containers-java, libcommons-cli-java
 Standards-Version: 3.8.1
 Homepage: http://plexus.codehaus.org
diff --git a/debian/rules b/debian/rules
index d0aad93..290bbd6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,17 +3,17 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 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-container-default-1.0 plexus-classworlds plexus-utils commons-cli
-ANT_OPTS		:= -Dversion=$(DEB_UPSTREAM_VERSION) -Dpackage=$(DEB_SOURCE_PACKAGE)
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION	             := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME 	         := /usr/lib/jvm/default-java
+DEB_JARS		     := ant-nodeps plexus-container-default plexus-classworlds plexus-utils commons-cli
+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)
 
 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-cli.git