[sikuli] 25/53: Generate libsikuli-script doc with javadoc

[Gilles Filippini]

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

pini pushed a commit to branch master
in repository sikuli.

commit 556f861fadf57b112e71d27b2bfe15deb9750751
Author: Gilles Filippini <pini at debian.org>
Date:   Sun May 11 22:44:11 2014 +0200

    Generate libsikuli-script doc with javadoc
    
    I tried using libmaven-javadoc-plugin-java but failed to find a way to
    correctly handle dependencies between subprojects, leading to errors
    such as:
     ...
     [INFO] Building Unnamed - org.sikuli:SikuliX-Natives:jar:1.1.0
     [INFO]    task-segment: [javadoc:jar]
     [INFO] ------------------------------------------------------------------------
     [INFO] ------------------------------------------------------------------------
     [ERROR] BUILD ERROR
     [INFO] ------------------------------------------------------------------------
     [INFO] Failed to resolve artifact.
    
     Missing:
     ----------
     1) org.sikuli:SikuliX-Basics:jar:1.1.0
     ...
---
 debian/control | 15 +++++++++++----
 debian/rules   | 17 +++++++++++------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index 610f313..79d976f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,18 @@ Section: java
 Priority: extra
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Gilles Filippini <pini at debian.org>
-Build-Depends: debhelper (>= 9~), cdbs, default-jdk (>= 1:1.6), maven-debian-helper, libmaven-exec-plugin-java, jython, swig,
- libopencv-dev, libtesseract-dev, libjxgrabkey-java, libcommons-cli-java, libswing-layout-java, libswingx-java, libjgoodies-forms-java, libjson-simple-java, libmac-widgets-java,
- default-jdk-doc, jython-doc, libswing-layout-java-doc, libswingx-java-doc, libjxgrabkey-doc, libjgoodies-forms-java-doc, libjson-simple-doc, libmac-widgets-doc
- , libjackson2-core-java, libjackson2-databind-java, testng, libjavassist-java, libjna-java, jruby, libbytelist-java, libjruby-joni-java, libjoda-time-java
+Build-Depends: debhelper (>= 9~), cdbs, default-jdk (>= 1:1.6)
+ , maven-debian-helper, libmaven-exec-plugin-java, jython, jruby, swig
+ , libopencv-dev, libtesseract-dev, libjxgrabkey-java, libcommons-cli-java
+ , libswing-layout-java, libswingx-java, libjgoodies-forms-java
+ , libjson-simple-java, libmac-widgets-java , libjackson2-core-java
+ , libjackson2-databind-java, testng, libjavassist-java, libjna-java
+ , libbytelist-java, libjruby-joni-java, libjoda-time-java
  , autoconf, automake, libtool
+# We only use the docs from java packages kept in the 'Depends' field of
+# libsikuli-script-java
+# No doc package exist for: libcommons-cli-java, testng, jruby
+ , default-jdk-doc, jython-doc, libswing-layout-java-doc, libjavassist-java-doc, libjxgrabkey-doc
 Standards-Version: 3.9.5
 Homepage: http://sikuli.org
 Vcs-Git: git://anonscm.debian.org/pkg-java/sikuli.git
diff --git a/debian/rules b/debian/rules
index b10ff37..0ec6e3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,9 +66,14 @@ binary-install/libsikuli-script-java::
 
 # Generate doc the good old way
 install/libsikuli-script-doc::
-	javadoc -windowtitle "Javadoc of Sikuli Script" -encoding UTF-8 -sourcepath Natives/src/main/java:Basics/src/main/java:Jython/src/main/java:JRuby/src/main/java:API/src/main/java -d debian/tmp/doc/ -classpath lib:/usr/share/java/jython.jar \
-		-link /usr/share/doc/default-jdk-doc/api \
-		-link /usr/share/doc/jython-doc/api-html \
-		-link /usr/share/doc/libswing-layout-java/api \
-		-link /usr/share/doc/libjxgrabkey-java/api \
-		org.sikuli.script
+	javadoc -windowtitle "Javadoc of Sikuli Script" \
+		-encoding UTF-8 \
+		-sourcepath Natives/src/main/java:Basics/src/main/java:Jython/src/main/java:JRuby/src/main/java:API/src/main/java \
+		-subpackages org.sikuli \
+		-d debian/tmp/doc/ \
+		-link file:///usr/share/doc/default-jdk-doc/api \
+		-link file:///usr/share/doc/jython-doc/html/javadoc \
+		-link file:///usr/share/doc/libswing-layout-java/api \
+		-link file:///usr/share/doc/libjxgrabkey-java/api \
+		-link file:///usr/share/doc/libjavassist-java-doc/api \
+

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