This change allows users to set the level of the javadocs task to

private, package or public. It also allows users to set a user
hyphenation directory from which hyphenation files are compiled and
added to the hyph directory in the build.
PR:
Obtained from:
Submitted by:
Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197864 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index f4e4808ecf0511a5864bc718456a97e41bc36aa2..fd84a96c8bbd4d4e9b5db36181957a14d6e158e9 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -461,17 +461,29 @@ list of possible build targets.
   <!-- =================================================================== -->
   <!-- compiles hyphenation patterns                                       -->
   <!-- =================================================================== -->
-  <target name="hyphenation" depends="prepare">
+  <target name="hyphenation" depends="fop-hyphenation,user-hyphenation"/>
+
+  <target name="prepare-hyphenation" depends="prepare">
     <path id="hyph-classpath">
       <path refid="libs-build-classpath"/>
       <pathelement location="${build.dir}/classes"/>
     </path>
     <taskdef name="serHyph" classname="org.apache.fop.tools.anttasks.SerializeHyphPattern" classpathref="hyph-classpath"/>
+  </target>
+
+  <target name="fop-hyphenation" depends="prepare-hyphenation">
     <serHyph includes="*.xml"
              sourceDir="${hyph.dir}"
              targetDir="${build.dest}/hyph"/>
   </target>
 
+  <target name="user-hyphenation" depends="prepare-hyphenation" if="user.hyph.dir">
+    <property name="user.hyphdest.dir" value="${build.dest}/hyph"/>
+    <serHyph includes="*.xml"
+             sourceDir="${user.hyph.dir}"
+             targetDir="${user.hyphdest.dir}"/>
+  </target>
+
   <!-- =================================================================== -->
   <!-- Creates the class package                                           -->
   <!-- =================================================================== -->
@@ -724,7 +736,20 @@ list of possible build targets.
   <!-- Creates the API documentation                                       -->
   <!-- =================================================================== -->
   <target name="javadocs" depends="prepare" description="Generates javadocs">
-    <echo message="Producing the javadoc files "/>
+    <property name="javadoc.public"  value="false"/>
+    <property name="javadoc.package" value="false"/>
+    <property name="javadoc.private" value="false"/>
+    <condition property="javadoc.level" value=" (level: private)">
+      <equals arg1="${javadoc.private}" arg2="true"/>
+    </condition>
+    <condition property="javadoc.level" value=" (level: package)">
+      <equals arg1="${javadoc.package}" arg2="true"/>
+    </condition>
+    <condition property="javadoc.level" value=" (level: public)">
+      <equals arg1="${javadoc.public}" arg2="true"/>
+    </condition>
+    <property name="javadoc.level" value=""/>
+    <echo message="Producing the javadoc files${javadoc.level}"/>
     <mkdir dir="${build.javadocs}"/>
 
     <javadoc
@@ -738,7 +763,10 @@ list of possible build targets.
         bottom="Copyright ${year} The Apache Software Foundation. All Rights Reserved."
         overview="${src.dir}/java/org/apache/fop/overview.html"
         use="true"
-        failonerror="true">
+        failonerror="true"
+        public="${javadoc.public}"
+        package="${javadoc.package}"
+        private="${javadoc.private}">
       <sourcepath>
         <pathelement path="${src.java}"/>
         <pathelement path="${build.gensrc}"/>