[pkg-java] r8961 - trunk/plexus-cli/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-07-08 20:04:01 +0000 (Wed, 08 Jul 2009)
New Revision: 8961

Added:
   trunk/plexus-cli/debian/build.properties
Removed:
   trunk/plexus-cli/debian/build.xml
Modified:
   trunk/plexus-cli/debian/control
   trunk/plexus-cli/debian/rules
Log:
* Update packaging to use maven-ant-helper

Added: trunk/plexus-cli/debian/build.properties
===================================================================
--- trunk/plexus-cli/debian/build.properties	                        (rev 0)
+++ trunk/plexus-cli/debian/build.properties	2009-07-08 20:04:01 UTC (rev 8961)
@@ -0,0 +1,2 @@
+javadoc.dir=build/api
+maven.test.skip=true

Deleted: trunk/plexus-cli/debian/build.xml
===================================================================
--- trunk/plexus-cli/debian/build.xml	2009-07-08 19:26:47 UTC (rev 8960)
+++ trunk/plexus-cli/debian/build.xml	2009-07-08 20:04:01 UTC (rev 8961)
@@ -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>

Modified: trunk/plexus-cli/debian/control
===================================================================
--- trunk/plexus-cli/debian/control	2009-07-08 19:26:47 UTC (rev 8960)
+++ trunk/plexus-cli/debian/control	2009-07-08 20:04:01 UTC (rev 8961)
@@ -4,7 +4,7 @@
 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

Modified: trunk/plexus-cli/debian/rules
===================================================================
--- trunk/plexus-cli/debian/rules	2009-07-08 19:26:47 UTC (rev 8960)
+++ trunk/plexus-cli/debian/rules	2009-07-08 20:04:01 UTC (rev 8961)
@@ -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