Author: twerner
Date: 2008-11-29 12:16:54 +0000 (Sat, 29 Nov 2008)
New Revision: 7453
Modified:
trunk/modello/debian/build.xml
trunk/modello/debian/changelog
trunk/modello/debian/control
trunk/modello/debian/rules
Log:
Build modello-test and more javadoc.
Modified: trunk/modello/debian/build.xml
===================================================================
--- trunk/modello/debian/build.xml 2008-11-29 11:50:27 UTC (rev 7452)
+++ trunk/modello/debian/build.xml 2008-11-29 12:16:54 UTC (rev 7453)
@@ -8,20 +8,16 @@
<target name="clean">
<delete dir="build"/>
-<!--
- <ant target="clean" antfile="/usr/share/maven-ant-helper/build.xml"
dir="modello-test"/>
--->
+ <ant target="clean"
antfile="/usr/share/maven-ant-helper/maven-build.xml" dir="modello-test"/>
<ant target="clean"
antfile="/usr/share/maven-ant-helper/maven-build.xml" dir="modello-core"/>
<ant target="clean"
antfile="/usr/share/maven-ant-helper/maven-build.xml"
dir="modello-plugins/modello-plugin-xml"/>
<ant target="clean"
antfile="/usr/share/maven-ant-helper/maven-build.xml"
dir="modello-plugins/modello-plugin-xpp3"/>
</target>
<target name="package">
-<!-- Disabled as it depends on too much Maven stuff
- <ant target="package" antfile="/usr/share/maven-ant-helper/build.xml"
dir="modello-test">
+ <ant target="package"
antfile="/usr/share/maven-ant-helper/maven-build.xml" dir="modello-test">
<property name="artifactId" value="modello-test"/>
</ant>
--->
<ant target="package"
antfile="/usr/share/maven-ant-helper/maven-build.xml" dir="modello-core">
<property name="artifactId" value="modello-core"/>
</ant>
@@ -35,10 +31,10 @@
<target name="javadoc">
<javadoc destdir="${javadoc.dir}">
- <sourcepath>
- <fileset dir="modello-core/src/main/java"/>
- </sourcepath>
+ <packageset dir="modello-test/src/main/java/"/>
<packageset dir="modello-core/src/main/java/"/>
+ <packageset
dir="modello-plugins/modello-plugin-xml/src/main/java/"/>
+ <packageset
dir="modello-plugins/modello-plugin-xpp3/src/main/java/"/>
</javadoc>
</target>
Modified: trunk/modello/debian/changelog
===================================================================
--- trunk/modello/debian/changelog 2008-11-29 11:50:27 UTC (rev 7452)
+++ trunk/modello/debian/changelog 2008-11-29 12:16:54 UTC (rev 7453)
@@ -5,8 +5,9 @@
* Add watch file.
* Add Vcs-* and Homepage header.
* Bump up Standards-Version: 3.8.0.
+ * Build modello-test and more javadoc.
- -- Torsten Werner <[EMAIL PROTECTED]> Sat, 29 Nov 2008 12:48:58 +0100
+ -- Torsten Werner <[EMAIL PROTECTED]> Sat, 29 Nov 2008 13:06:03 +0100
modello (1.0-alpha-8-1) unstable; urgency=low
Modified: trunk/modello/debian/control
===================================================================
--- trunk/modello/debian/control 2008-11-29 11:50:27 UTC (rev 7452)
+++ trunk/modello/debian/control 2008-11-29 12:16:54 UTC (rev 7453)
@@ -3,14 +3,10 @@
Priority: optional
Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]>
Uploaders: Paul Cager <[EMAIL PROTECTED]>, Torsten Werner <[EMAIL PROTECTED]>
-Build-Depends-Indep: ant-optional,
- classpath-doc,
- java-gcj-compat-dev (>= 1.0.65),
- libplexus-container-default-java (>=
1.0-alpha-9-stable-1-2),
- libplexus-container-default-java-doc (>=
1.0-alpha-9-stable-1-2),
- libplexus-utils-java (>= 1:1.4.1),
- libplexus-utils-java-doc (>= 1:1.4.1),
- maven-ant-helper (>= 3)
+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
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 11:50:27 UTC (rev 7452)
+++ trunk/modello/debian/rules 2008-11-29 12:16:54 UTC (rev 7453)
@@ -7,8 +7,8 @@
PACKAGE := $(shell dpkg-parsechangelog | egrep '^Source:' | cut
-f2 -d' ')
VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed
"s,Version: \(.*\)-.*,\1,g")
JAVA_HOME := /usr/lib/jvm/java-gcj
-ANT_HOME := /usr/share/ant
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar
$(ANT_HOME)/lib/ant-trax.jar /usr/share/java/junit.jar
+DEB_JARS := ant-nodeps junit maven2 plexus-compiler-api \
+ plexus-compiler-javac
DEB_ANT_BUILD_TARGET := package javadoc
DEB_ANT_BUILDFILE := ./debian/build.xml
DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
@@ -24,6 +24,8 @@
dh_link -plib$(PACKAGE)-java
usr/share/java/$(PACKAGE)-plugin-xml-$(VERSION).jar
usr/share/java/$(PACKAGE)-plugin-xml.jar
dh_install -plib$(PACKAGE)-java
modello-plugins/modello-plugin-xpp3/build/$(PACKAGE)-plugin-xpp3-$(VERSION).jar
usr/share/java
dh_link -plib$(PACKAGE)-java
usr/share/java/$(PACKAGE)-plugin-xpp3-$(VERSION).jar
usr/share/java/$(PACKAGE)-plugin-xpp3.jar
+ dh_install -plib$(PACKAGE)-java
modello-test/build/$(PACKAGE)-test-$(VERSION).jar usr/share/java
+ dh_link -plib$(PACKAGE)-java
usr/share/java/$(PACKAGE)-test-$(VERSION).jar usr/share/java/$(PACKAGE)-test.jar
binary-post-install/lib$(PACKAGE)-java-doc::
dh_install -plib$(PACKAGE)-java-doc build/api
usr/share/doc/lib$(PACKAGE)-java
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
