click-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sa...@apache.org
Subject svn commit: r749719 - in /incubator/click/trunk/tools/docbook: ./ build-docbook.xml build.xml lib/ project.properties
Date Tue, 03 Mar 2009 19:59:26 GMT
Author: sabob
Date: Tue Mar  3 19:59:25 2009
New Revision: 749719

URL: http://svn.apache.org/viewvc?rev=749719&view=rev
Log:
cleanup

Added:
    incubator/click/trunk/tools/docbook/lib/   (with props)
Modified:
    incubator/click/trunk/tools/docbook/   (props changed)
    incubator/click/trunk/tools/docbook/build-docbook.xml
    incubator/click/trunk/tools/docbook/build.xml
    incubator/click/trunk/tools/docbook/project.properties

Propchange: incubator/click/trunk/tools/docbook/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar  3 19:59:25 2009
@@ -1,3 +1,4 @@
 dbf-click.zip
 target
+click-docbook
 dbf-click

Modified: incubator/click/trunk/tools/docbook/build-docbook.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/docbook/build-docbook.xml?rev=749719&r1=749718&r2=749719&view=diff
==============================================================================
--- incubator/click/trunk/tools/docbook/build-docbook.xml (original)
+++ incubator/click/trunk/tools/docbook/build-docbook.xml Tue Mar  3 19:59:25 2009
@@ -28,7 +28,15 @@
 <project name="build-docbook" default="all" basedir=".">
 
     <!-- Load the properties -->
-    <!--<property file="project.properties"/>-->
+    <property file="project.properties"/>
+
+    <!-- Ensure Velocity Docbook Framework is available -->
+    <available file="${dbf.path}" property="dbf.downloaded"/>
+    <fail message="The Velocity Docbook Framework is not available. To resolve this download
the dependencies (~9 MB) with 'ant get-deps'.">
+        <condition>
+            <or><isfalse value="${dbf.downloaded}"/></or>
+        </condition>
+    </fail>
 
     <import file="${dbf.basedir}/build-docbook.xml"/>
 
@@ -40,7 +48,7 @@
   <!-- == Build all the Velocity Docbook Documentation                       == -->
   <!-- ==                                                                    == -->
   <!-- ======================================================================== -->
-    <target name="all" description="--> Build all documentation">
+    <target name="all" description="Build all documentation">
 
         <!-- Build the Users Guide -->
         <antcall target="html"/>
@@ -58,17 +66,17 @@
   <!-- ==                                                                    == -->
   <!-- ======================================================================== -->
 
-    <taskdef name="fop"
-         classname="org.apache.fop.tools.anttasks.Fop">
-        <classpath>
-            <fileset dir="${fop.basedir}/build">
-                <include name="*.jar"/>
-            </fileset>
-        </classpath>
-    </taskdef>
-
     <target name="pdf" description="Generates a single PDF file" depends="prepare">
 
+        <taskdef name="fop"
+             classname="org.apache.fop.tools.anttasks.Fop">
+            <classpath>
+                <fileset dir="${dbf.basedir}/lib">
+                    <include name="*.jar"/>
+                </fileset>
+            </classpath>
+        </taskdef>
+
         <transform type="pdf" target="tmp" title="pdf" xsl="fo" dir="${docbook.dir}" file="${docbook.file}"/>
 
         <mkdir dir="target/${docbook.dir}/pdf"/>
@@ -86,8 +94,7 @@
 
     </target>
 
-    <target name="html"
-            description="--> Generate HTML docs in multiple files">
+    <target name="html" description="Generate HTML docs in multiple files">
 
         <ant antfile="${dbf.basedir}/build-docbook.xml" target="html">
             <property name="docbook.dir" value="${docbook.dir}"/>
@@ -104,8 +111,7 @@
 
     </target>
 
-    <target name="htmlsingle"
-            description="--> Generate HTML docs in a single, big file">
+    <target name="htmlsingle" description="Generate HTML docs in a single, big file">
 
         <ant antfile="${dbf.basedir}/build-docbook.xml" target="htmlsingle">
             <property name="docbook.dir" value="${docbook.dir}"/>
@@ -126,8 +132,7 @@
   <!-- == Clean up the target directory                                      == -->
   <!-- ==                                                                    == -->
   <!-- ======================================================================== -->
-    <target name="clean"
-          description="--> Delete temporary and distribution directories for docs">
+    <target name="clean" description="Delete temporary and distribution directories for
docs">
         <ant antfile="${dbf.basedir}/build-docbook.xml" target="clean"/>
     </target>
 </project>

Modified: incubator/click/trunk/tools/docbook/build.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/docbook/build.xml?rev=749719&r1=749718&r2=749719&view=diff
==============================================================================
--- incubator/click/trunk/tools/docbook/build.xml (original)
+++ incubator/click/trunk/tools/docbook/build.xml Tue Mar  3 19:59:25 2009
@@ -30,14 +30,42 @@
     <!-- Load the properties -->
     <property file="project.properties"/>
 
+    <target name="all" description="Build all documentation" depends="prepare">
+        <ant antfile="build-docbook.xml" target="all"/>
+    </target>
+
+    <target name="clean" depends="prepare"
+        description="--> Delete temporary and distribution directories for docs">
+        <delete dir="target"/>
+        <delete dir="${dbf.basedir}"/>
+    </target>
+
+    <target name="html" description="Generate HTML docs in multiple files" depends="prepare">
+        <ant antfile="build-docbook.xml" target="html"/>
+    </target>
+
+    <target name="htmlsingle" description="Generate HTML docs in a single, big file" depends="prepare">
+        <ant antfile="build-docbook.xml" target="htmlsingle"/>
+    </target>
+
+    <target name="extract" unless="dbf.extracted">
+        <unzip src="${dbf.path}" dest="${dbf.basedir}/"/>
+    </target>
+
     <target name="get-deps">
+        <get src="http://click-docbook.googlecode.com/svn/trunk/build/${dbf.zip}"
+ 	       dest="${dbf.path}"
+ 	       verbose="true"
+ 	       usetimestamp="true"/>
+    </target>
 
+    <target name="pdf" description="Generates a single PDF file" depends="prepare">
+        <ant antfile="build-docbook.xml" target="pdf"/>
     </target>
 
-    <target name="do-prepare">
-        <available file="${dbf.zip}" property="dbf.downloaded"/>
-        <echo>${dbf.downloaded} ${dbf.zip}</echo>
-        <fail message="The Velocity Docbook Framework is not available. To resolve this
download the dependencies with 'ant get-deps'.">
+    <target name="prepare">
+        <available file="${dbf.path}" property="dbf.downloaded"/>
+        <fail message="The Velocity Docbook Framework is not available. To resolve this
download the dependencies (~9 MB) with 'ant get-deps'.">
             <condition>
                 <or><isfalse value="${dbf.downloaded}"/></or>
             </condition>
@@ -47,13 +75,4 @@
         <antcall target="extract"/>
     </target>
 
-    <target name="extract" unless="dbf.extracted">
-        <unzip src="${dbf.zip}" dest="${dbf.basedir}/"/>
-    </target>
-
-    <target name="clean" depends="do-prepare"
-        description="--> Delete temporary and distribution directories for docs">
-        <ant antfile="build-docbook.xml" target="clean"/>
-        <delete dir="${dbf.basedir}"/>
-    </target>
 </project>

Propchange: incubator/click/trunk/tools/docbook/lib/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar  3 19:59:25 2009
@@ -0,0 +1 @@
+click-docbook-0.1.zip

Modified: incubator/click/trunk/tools/docbook/project.properties
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/docbook/project.properties?rev=749719&r1=749718&r2=749719&view=diff
==============================================================================
--- incubator/click/trunk/tools/docbook/project.properties (original)
+++ incubator/click/trunk/tools/docbook/project.properties Tue Mar  3 19:59:25 2009
@@ -21,6 +21,9 @@
 # DBF zip file name
 dbf.zip = click-docbook-0.1.zip
 
+# DBF path
+dbf.path = lib/${dbf.zip}
+
 # Basedir for Click
 click.basedir = ../../click-svn
 



Mime
View raw message