[pkg-java] r7456 - trunk/modello/debian
twerner at alioth.debian.org
twerner at alioth.debian.org
Sat Nov 29 15:16:45 UTC 2008
Author: twerner
Date: 2008-11-29 15:16:45 +0000 (Sat, 29 Nov 2008)
New Revision: 7456
Modified:
trunk/modello/debian/build.properties
trunk/modello/debian/build.xml
trunk/modello/debian/changelog
trunk/modello/debian/control
trunk/modello/debian/rules
Log:
Build all modules, plugins, and javadoc.
Modified: trunk/modello/debian/build.properties
===================================================================
--- trunk/modello/debian/build.properties 2008-11-29 12:54:22 UTC (rev 7455)
+++ trunk/modello/debian/build.properties 2008-11-29 15:16:45 UTC (rev 7456)
@@ -1,7 +1,9 @@
classpath.compile=\
/usr/share/java/plexus-container-default.jar:\
/usr/share/java/plexus-utils.jar:\
+ ${basedir}/modello-db-keywords/build/modello-db-keywords-${version}.jar:\
${basedir}/modello-core/build/modello-core-${version}.jar:\
+ ${basedir}/modello-plugins/modello-plugin-store/build/modello-plugin-store-${version}.jar:\
${basedir}/modello-plugins/modello-plugin-xml/build/modello-plugin-xml-${version}.jar
classpath.test=
javadoc.dir=build/api
Modified: trunk/modello/debian/build.xml
===================================================================
--- trunk/modello/debian/build.xml 2008-11-29 12:54:22 UTC (rev 7455)
+++ trunk/modello/debian/build.xml 2008-11-29 15:16:45 UTC (rev 7456)
@@ -34,8 +34,14 @@
<cleanmodule dir="modello-plugins/modello-plugin-converters"/>
<cleanmodule dir="modello-plugins/modello-plugin-dom4j"/>
<cleanmodule dir="modello-plugins/modello-plugin-jdom"/>
+ <cleanmodule dir="modello-plugins/modello-plugin-jpox"/>
+ <cleanmodule dir="modello-plugins/modello-plugin-plexus-registry"/>
+ <cleanmodule dir="modello-plugins/modello-plugin-stax"/>
+ <cleanmodule dir="modello-plugins/modello-plugin-store"/>
+ <cleanmodule dir="modello-plugins/modello-plugin-xdoc"/>
<cleanmodule dir="modello-plugins/modello-plugin-xml"/>
<cleanmodule dir="modello-plugins/modello-plugin-xpp3"/>
+ <cleanmodule dir="modello-plugins/modello-plugin-xsd"/>
</target>
<target name="package">
@@ -49,12 +55,24 @@
artifactId="modello-plugin-converters"/>
<packagemodule dir="modello-plugins/modello-plugin-xml"
artifactId="modello-plugin-xml"/>
+ <packagemodule dir="modello-plugins/modello-plugin-dom4j"
+ artifactId="modello-plugin-dom4j"/>
<packagemodule dir="modello-plugins/modello-plugin-jdom"
artifactId="modello-plugin-jdom"/>
- <packagemodule dir="modello-plugins/modello-plugin-dom4j"
- artifactId="modello-plugin-dom4j"/>
+ <packagemodule dir="modello-plugins/modello-plugin-store"
+ artifactId="modello-plugin-store"/>
+ <packagemodule dir="modello-plugins/modello-plugin-jpox"
+ artifactId="modello-plugin-jpox"/>
+ <packagemodule dir="modello-plugins/modello-plugin-plexus-registry"
+ artifactId="modello-plugin-plexus-registry"/>
+ <packagemodule dir="modello-plugins/modello-plugin-stax"
+ artifactId="modello-plugin-stax"/>
+ <packagemodule dir="modello-plugins/modello-plugin-xdoc"
+ artifactId="modello-plugin-xdoc"/>
<packagemodule dir="modello-plugins/modello-plugin-xpp3"
artifactId="modello-plugin-xpp3"/>
+ <packagemodule dir="modello-plugins/modello-plugin-xsd"
+ artifactId="modello-plugin-xsd"/>
</target>
<target name="javadoc">
@@ -64,10 +82,16 @@
<packageset dir="modello-db-keywords/src/main/java/"/>
<packageset dir="modello-maven-plugin/src/main/java/"/>
<packageset dir="modello-plugins/modello-plugin-converters/src/main/java/"/>
+ <packageset dir="modello-plugins/modello-plugin-dom4j/src/main/java/"/>
<packageset dir="modello-plugins/modello-plugin-jdom/src/main/java/"/>
- <packageset dir="modello-plugins/modello-plugin-dom4j/src/main/java/"/>
+ <packageset dir="modello-plugins/modello-plugin-jpox/src/main/java/"/>
+ <packageset dir="modello-plugins/modello-plugin-plexus-registry/src/main/java/"/>
+ <packageset dir="modello-plugins/modello-plugin-stax/src/main/java/"/>
+ <packageset dir="modello-plugins/modello-plugin-store/src/main/java/"/>
+ <packageset dir="modello-plugins/modello-plugin-xdoc/src/main/java/"/>
<packageset dir="modello-plugins/modello-plugin-xml/src/main/java/"/>
<packageset dir="modello-plugins/modello-plugin-xpp3/src/main/java/"/>
+ <packageset dir="modello-plugins/modello-plugin-xsd/src/main/java/"/>
</javadoc>
</target>
Modified: trunk/modello/debian/changelog
===================================================================
--- trunk/modello/debian/changelog 2008-11-29 12:54:22 UTC (rev 7455)
+++ trunk/modello/debian/changelog 2008-11-29 15:16:45 UTC (rev 7456)
@@ -5,7 +5,7 @@
* Add watch file.
* Add Vcs-* and Homepage header.
* Bump up Standards-Version: 3.8.0.
- * Build more modules, plugins, and javadoc.
+ * Build all modules, plugins, and javadoc.
* Refactor the build process.
-- Torsten Werner <twerner at debian.org> Sat, 29 Nov 2008 13:40:56 +0100
Modified: trunk/modello/debian/control
===================================================================
--- trunk/modello/debian/control 2008-11-29 12:54:22 UTC (rev 7455)
+++ trunk/modello/debian/control 2008-11-29 15:16:45 UTC (rev 7456)
@@ -6,7 +6,8 @@
Build-Depends-Indep: ant-optional, classpath-doc, java-gcj-compat-dev, junit,
libplexus-compiler-api-java, libplexus-compiler-javac-java,
libplexus-container-default-java, libplexus-container-default-java-doc,
- libplexus-utils-java, libplexus-utils-java-doc, maven-ant-helper, maven2
+ libplexus-utils-java, libplexus-utils-java-doc, libplexus-velocity-java,
+ maven-ant-helper, maven2, velocity
Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
Standards-Version: 3.8.0
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/modello
Modified: trunk/modello/debian/rules
===================================================================
--- trunk/modello/debian/rules 2008-11-29 12:54:22 UTC (rev 7455)
+++ trunk/modello/debian/rules 2008-11-29 15:16:45 UTC (rev 7456)
@@ -8,13 +8,14 @@
VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed "s,Version: \(.*\)-.*,\1,g")
JAVA_HOME := /usr/lib/jvm/java-gcj
DEB_JARS := ant-nodeps junit maven2 plexus-compiler-api \
- plexus-compiler-javac
+ plexus-compiler-javac plexus-velocity velocity
DEB_ANT_BUILD_TARGET := package javadoc
DEB_ANT_BUILDFILE := ./debian/build.xml
DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
API_DOCS := build/api
BASE_MODULES := core db-keywords maven-plugin test
-PLUGINS := converters dom4j jdom xml xpp3
+PLUGINS := converters dom4j jdom jpox plexus-registry stax store xdoc \
+ xml xpp3 xsd
get-orig-source:
uscan --force-download
More information about the pkg-java-commits
mailing list