Removed dependencies on docbook2pdf from main build path

dlsmith · dlsmith · commit a55412ec2ddf · 2005-10-28T15:49:05.000Z
git-svn-id: file:///tmp/test-svn/trunk@3481 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/docs/build.xml b/docs/build.xml
@@ -126,55 +126,62 @@
        Build Target
        ************ -->
   
-  <target name="build" depends="doc, jar" 
-          description="Shortcut for 'doc jar'">
+  <target name="build" depends="doc-html, jar" 
+          description="Shortcut for 'doc-html jar'">
   </target>
   
 
   <!-- *********************
        Documentation Targets
        ********************* -->
   
-  <target name="doc" depends="doc-user, doc-developer, doc-quickstart"
-          description="Generate all documentation">
+  <target name="doc" depends="doc-html doc-pdf"
+          description="Shortcut for 'doc-html doc-pdf'">
   </target>
   
-  <target name="doc-user">
+  
+  <target name="doc-html" description="Generate all html documentation">
     <echo message="Creating user documentation" />
     <antcall target="run-docbook2html" inheritall="false">
       <param name="docbook-dir" value="user" />
       <param name="docbook-srcfile" value="userdoc.docbook" />
     </antcall>
-    <antcall target="run-docbook2pdf" inheritall="false">
-      <param name="docbook-dir" value="user" />
-      <param name="docbook-srcfile" value="userdoc.docbook" />
-    </antcall>
-  </target>
-  
-  <target name="doc-quickstart">
+
     <echo message="Creating quickstart documentation" />
     <antcall target="run-docbook2html" inheritall="false">
       <param name="docbook-dir" value="quickstart" />
       <param name="docbook-srcfile" value="quickstart.docbook" />
     </antcall>
-    <antcall target="run-docbook2pdf" inheritall="false">
-      <param name="docbook-dir" value="quickstart" />
-      <param name="docbook-srcfile" value="quickstart.docbook" />
-    </antcall>
-  </target>
   
-  <target name="doc-developer">
     <echo message="Creating developer documentation" />
     <antcall target="run-docbook2html" inheritall="false">
       <param name="docbook-dir" value="developer" />
       <param name="docbook-srcfile" value="devdoc.docbook" />
     </antcall>
+  </target>
+  
+  
+  <target name="doc-pdf" description="Generate all pdf documentation">
+    <echo message="Creating user documentation" />
+    <antcall target="run-docbook2pdf" inheritall="false">
+      <param name="docbook-dir" value="user" />
+      <param name="docbook-srcfile" value="userdoc.docbook" />
+    </antcall>
+
+    <echo message="Creating quickstart documentation" />
+    <antcall target="run-docbook2pdf" inheritall="false">
+      <param name="docbook-dir" value="quickstart" />
+      <param name="docbook-srcfile" value="quickstart.docbook" />
+    </antcall>
+
+    <echo message="Creating developer documentation" />
     <antcall target="run-docbook2pdf" inheritall="false">
       <param name="docbook-dir" value="developer" />
       <param name="docbook-srcfile" value="devdoc.docbook" />
     </antcall>
   </target>
   
+  
   <target name="run-docbook2html" depends="assert-docbook2html-present">
     <mkdir dir="docs/${docbook-dir}" />
     <apply executable="docbook2html" failonerror="yes" type="file">
@@ -212,8 +219,8 @@
        Jar Targets
        *********** -->
        
-  <target name="jar" depends="doc, resolve-version-tag" 
-          description="Create the jar file with all docs (generating docs first)">
+  <target name="jar" depends="doc-html, resolve-version-tag" 
+          description="Create the jar file with distributed docs (generating html docs first)">
     <jar jarfile="${jar-filename}">
       <manifest>
         <attribute name="Built-By" value="${user.name}" />
