[apache-mime4j] 07/19: Manually build javadoc, waiting to understand how to properly configure maven-javadoc-plugin.

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository apache-mime4j.

commit d56e879fee62678370d4171b411e70315811eb11
Author: David Paleino <dapal at debian.org>
Date:   Sun Dec 30 21:34:49 2012 +0100

    Manually build javadoc, waiting to understand how to properly configure maven-javadoc-plugin.
---
 debian/changelog                         |  4 +++-
 debian/libapache-mime4j-java-doc.install |  2 +-
 debian/rules                             | 15 +++++++++++----
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 737572c..7c59299 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ apache-mime4j (0.7.2-1) UNRELEASED; urgency=low
   * New upstream version.
   * Build-Depend on default-jdk (Closes: #683501).
   * Fixed debian/watch.
+  * Manually build javadoc, waiting to understand how to properly
+    configure maven-javadoc-plugin.
 
- -- David Paleino <dapal at debian.org>  Fri, 28 Dec 2012 17:02:17 +0100
+ -- David Paleino <dapal at debian.org>  Sun, 30 Dec 2012 21:34:27 +0100
 
 apache-mime4j (0.6.1-2) unstable; urgency=low
 
diff --git a/debian/libapache-mime4j-java-doc.install b/debian/libapache-mime4j-java-doc.install
index ed8fc4a..0802033 100644
--- a/debian/libapache-mime4j-java-doc.install
+++ b/debian/libapache-mime4j-java-doc.install
@@ -1 +1 @@
-target/apidocs/		/usr/share/libapache-mime4j-java-doc/
+apidocs/		/usr/share/libapache-mime4j-java-doc/
diff --git a/debian/rules b/debian/rules
index 1ee7ea2..e92dd81 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,17 @@ override_dh_auto_build:
 	mh_patchpoms -plibapache-mime4j-java
 	mvn -o -s /etc/maven2/settings-debian.xml \
 	  -Dmaven.test.skip=$(SKIPTEST) package
+
+	# build javadoc
+	javadoc \
+		-d apidocs/ \
+		-sourcepath core/src/main/java/:benchmark/src/main/java/:storage/src/main/java/:dom/src/main/java/ \
+		-exclude org.apache.james.mime4j.field.address.parser:org.apache.james.mime4j.field.contentdisposition.parser:org.apache.james.mime4j.field.contenttype.parser:org.apache.james.mime4j.field.datetime.parser:org.apache.james.mime4j.field.language.parser:org.apache.james.mime4j.field.mimeversion.parser:org.apache.james.mime4j.field.structured.parser \
+		-subpackages org.apache.james.mime4j \
+			org.apache.james.mime4j.core \
+			org.apache.james.mime4j.dom \
+			org.apache.james.mime4j.benchmark \
+			org.apache.james.mime4j.storage
             
 override_dh_auto_install:
 	dh_auto_install
@@ -32,10 +43,6 @@ override_dh_auto_install:
 	    $$i/target/apache-mime4j-$$i-debian.jar ; \
 	done
 
-	# build docs after installing poms and jars to locations Maven can use
-	mvn -o -s /etc/maven2/settings-debian.xml \
-	  -Dmaven.test.skip=$(SKIPTEST) javadoc:javadoc
-
 override_dh_auto_clean:
 	dh_auto_clean
 	mh_unpatchpoms -plibapache-mime4j-java -v

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/apache-mime4j.git