Author: ludovicc-guest
Date: 2009-07-08 20:22:37 +0000 (Wed, 08 Jul 2009)
New Revision: 8962
Added:
trunk/plexus-digest/debian/build.properties
Removed:
trunk/plexus-digest/debian/build.xml
Modified:
trunk/plexus-digest/debian/changelog
trunk/plexus-digest/debian/control
trunk/plexus-digest/debian/rules
Log:
* Update packaging to use maven-ant-helper
Added: trunk/plexus-digest/debian/build.properties
===================================================================
--- trunk/plexus-digest/debian/build.properties (rev 0)
+++ trunk/plexus-digest/debian/build.properties 2009-07-08 20:22:37 UTC (rev
8962)
@@ -0,0 +1,2 @@
+javadoc.dir=build/api
+maven.test.skip=true
Deleted: trunk/plexus-digest/debian/build.xml
===================================================================
--- trunk/plexus-digest/debian/build.xml 2009-07-08 20:04:01 UTC (rev
8961)
+++ trunk/plexus-digest/debian/build.xml 2009-07-08 20:22:37 UTC (rev
8962)
@@ -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-digest/debian/changelog
===================================================================
--- trunk/plexus-digest/debian/changelog 2009-07-08 20:04:01 UTC (rev
8961)
+++ trunk/plexus-digest/debian/changelog 2009-07-08 20:22:37 UTC (rev
8962)
@@ -3,7 +3,8 @@
[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
Modified: trunk/plexus-digest/debian/control
===================================================================
--- trunk/plexus-digest/debian/control 2009-07-08 20:04:01 UTC (rev 8961)
+++ trunk/plexus-digest/debian/control 2009-07-08 20:22:37 UTC (rev 8962)
@@ -4,7 +4,7 @@
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
Modified: trunk/plexus-digest/debian/rules
===================================================================
--- trunk/plexus-digest/debian/rules 2009-07-08 20:04:01 UTC (rev 8961)
+++ trunk/plexus-digest/debian/rules 2009-07-08 20:22:37 UTC (rev 8962)
@@ -6,18 +6,18 @@
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
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
