[SCM] Plexus Compiler branch, master, updated. debian/1.6-2-27-g26ae018

[Ludovic Claude]

The following commit has been merged in the master branch:
commit 2ac735aba66d999e3a6d05f0c3609342e33fbea5
Author: Ludovic Claude <ludovic.claude at laposte.net>
Date:   Sun Jan 8 14:01:02 2012 +0100

    Fix generation of javadoc

diff --git a/debian/build.xml b/debian/build.xml
index df96d87..158e97a 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -27,6 +27,17 @@
         </sequential>
     </macrodef>
 
+    <macrodef name="package-module-doc">
+        <attribute name="dir"/>
+        <sequential>
+          <ant target="package-doc-and-local-install" antfile="${maven.build}" dir="@{dir}">
+            <property name="debian.dir" location="debian" />
+            <property name="project.dir" value="@{dir}" />
+            <property name="keep-cleaned-pom" value="true" />
+          </ant>
+        </sequential>
+    </macrodef>
+
     <target name="clean">
         <clean-module dir=""/>
         <clean-module dir="plexus-compiler-api/"/>
@@ -52,17 +63,15 @@
     </target>
 
     <target name="javadoc">
-        <javadoc destdir="${javadoc.dir}">
-            <packageset dir="plexus-compiler-api/src/main/java/"/>
-            <packageset dir="plexus-compiler-test/src/main/java/"/>
-            <packageset dir="plexus-compiler-manager/src/main/java/"/>
-            <packageset dir="plexus-compilers/plexus-compiler-csharp/src/main/java/"/>
-            <packageset dir="plexus-compilers/plexus-compiler-eclipse/src/main/java/"/>
-            <packageset dir="plexus-compilers/plexus-compiler-jikes/src/main/java/"/>
-            <packageset dir="plexus-compilers/plexus-compiler-javac/src/main/java/"/>
-        </javadoc>
+        <package-module-doc dir="plexus-compiler-api/"/>
+        <package-module-doc dir="plexus-compiler-test/"/>
+        <package-module-doc dir="plexus-compiler-manager/"/>
+        <package-module-doc dir="plexus-compilers/plexus-compiler-csharp/"/>
+        <package-module-doc dir="plexus-compilers/plexus-compiler-eclipse/"/>
+        <package-module-doc dir="plexus-compilers/plexus-compiler-jikes/"/>
+        <package-module-doc dir="plexus-compilers/plexus-compiler-javac/"/>
     </target>
 
     <target name="build-all" depends="package, javadoc" />
 
-</project>
\ No newline at end of file
+</project>
diff --git a/debian/libplexus-compiler-java-doc.poms b/debian/libplexus-compiler-java-doc.poms
index 1a680c5..a8074c9 100644
--- a/debian/libplexus-compiler-java-doc.poms
+++ b/debian/libplexus-compiler-java-doc.poms
@@ -25,10 +25,10 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-plexus-compiler-api/target/plexus-compiler-api.javadoc.pom --has-package-version --artifact=plexus-compiler-api/target/plexus-compiler-api.javadoc.jar --classifier=javadoc --ignore-pom
-plexus-compiler-test/target/plexus-compiler-test.javadoc.pom --has-package-version --artifact=plexus-compiler-test/target/plexus-compiler-test.javadoc.jar --classifier=javadoc --ignore-pom
-plexus-compiler-manager/target/plexus-compiler-manager.javadoc.pom --has-package-version --artifact=plexus-compiler-manager/target/plexus-compiler-manager.javadoc.jar --classifier=javadoc --ignore-pom
-plexus-compilers/plexus-compiler-csharp/target/plexus-compiler-csharp.javadoc.pom --has-package-version --artifact=plexus-compilers/plexus-compiler-csharp/target/plexus-compiler-csharp.javadoc.jar --classifier=javadoc --ignore-pom
-plexus-compilers/plexus-compiler-eclipse/target/plexus-compiler-eclipse.javadoc.pom --has-package-version --artifact=plexus-compilers/plexus-compiler-eclipse/target/plexus-compiler-eclipse.javadoc.jar --classifier=javadoc --ignore-pom
-plexus-compilers/plexus-compiler-jikes/target/plexus-compiler-jikes.javadoc.pom --has-package-version --artifact=plexus-compilers/plexus-compiler-jikes/target/plexus-compiler-jikes.javadoc.jar --classifier=javadoc --ignore-pom
-plexus-compilers/plexus-compiler-javac/target/plexus-compiler-javac.javadoc.pom --has-package-version --artifact=plexus-compilers/plexus-compiler-javac/target/plexus-compiler-javac.javadoc.jar --classifier=javadoc --ignore-pom
+plexus-compiler-api/pom.xml --has-package-version --artifact=plexus-compiler-api/target/plexus-compiler-api.javadoc.jar --classifier=javadoc --ignore-pom
+plexus-compiler-test/pom.xml --has-package-version --artifact=plexus-compiler-test/target/plexus-compiler-test.javadoc.jar --classifier=javadoc --ignore-pom
+plexus-compiler-manager/pom.xml --has-package-version --artifact=plexus-compiler-manager/target/plexus-compiler-manager.javadoc.jar --classifier=javadoc --ignore-pom
+plexus-compilers/plexus-compiler-csharp/pom.xml --has-package-version --artifact=plexus-compilers/plexus-compiler-csharp/target/plexus-compiler-csharp.javadoc.jar --classifier=javadoc --ignore-pom
+plexus-compilers/plexus-compiler-eclipse/pom.xml --has-package-version --artifact=plexus-compilers/plexus-compiler-eclipse/target/plexus-compiler-eclipse.javadoc.jar --classifier=javadoc --ignore-pom
+plexus-compilers/plexus-compiler-jikes/pom.xml --has-package-version --artifact=plexus-compilers/plexus-compiler-jikes/target/plexus-compiler-jikes.javadoc.jar --classifier=javadoc --ignore-pom
+plexus-compilers/plexus-compiler-javac/pom.xml --has-package-version --artifact=plexus-compilers/plexus-compiler-javac/target/plexus-compiler-javac.javadoc.jar --classifier=javadoc --ignore-pom

-- 
Plexus Compiler