svn commit: r497480 - in /velocity/docbook/trunk: build-docbook.xml project.properties

[he...@apache.org]

Author: henning
Date: Thu Jan 18 08:11:47 2007
New Revision: 497480

URL: http://svn.apache.org/viewvc?view=rev&rev=497480
Log:
Move velocity specific stuff out.


Modified:
    velocity/docbook/trunk/build-docbook.xml
    velocity/docbook/trunk/project.properties

Modified: velocity/docbook/trunk/build-docbook.xml
URL: http://svn.apache.org/viewvc/velocity/docbook/trunk/build-docbook.xml?view=diff&rev=497480&r1=497479&r2=497480
==============================================================================
--- velocity/docbook/trunk/build-docbook.xml (original)
+++ velocity/docbook/trunk/build-docbook.xml Thu Jan 18 08:11:47 2007
@@ -19,7 +19,7 @@
 <project name="docbook" default="all" basedir=".">
 
   <!-- Load our properties -->
-  <property file="project.properties"/>
+  <property file="docbook.properties"/>
 
   <!-- ======================================================================== -->
   <!-- ==                                                                    == -->
@@ -27,13 +27,13 @@
   <!-- ==                                                                    == -->
   <!-- ======================================================================== -->
   <path id="docbook.classpath">
-    <fileset dir="${basedir}/lib">
+    <fileset dir="${docbook.basedir}/lib">
       <include name="*.jar"/>
     </fileset>
     <fileset dir="${docbook.xsl.dir}/extensions">
       <include name="${xslt-db.jar}"/>
     </fileset>
-    <pathelement location="${basedir}"/>
+    <pathelement location="${docbook.basedir}"/>
   </path>
 
   <!-- ======================================================================== -->
@@ -159,6 +159,16 @@
           <and>
             <isset property="docbook.dir"/>
             <isset property="docbook.file"/>
+          </and>
+        </not>
+      </condition>
+    </fail>
+
+    <fail message="You must configure the docbook.basedir from your project.properties. That is usually ${basedir}/docbook!">
+      <condition>
+        <not>
+          <and>
+            <isset property="docbook.basedir"/>
           </and>
         </not>
       </condition>

Modified: velocity/docbook/trunk/project.properties
URL: http://svn.apache.org/viewvc/velocity/docbook/trunk/project.properties?view=diff&rev=497480&r1=497479&r2=497480
==============================================================================
--- velocity/docbook/trunk/project.properties (original)
+++ velocity/docbook/trunk/project.properties Thu Jan 18 08:11:47 2007
@@ -18,25 +18,29 @@
 docbook.xsl.version = 1.70.0
 
 # Where all the sources are located
-src.dir = ${basedir}/src
+docbook.src.dir = ${docbook.basedir}/src
 
-# Location of custom style files (XSL)
-style.src.dir = ${basedir}/src/styles
+# Location of the docbook reference archives
+docbook.zip.src.dir = ${docbook.src.dir}/zip
 
-# Location of the docbook files
-docbook.src.dir = ${src.dir}/docbook
+########################################################################
+#
+# The following parameter usually get overwritten by the caller. We
+# keep them here nevertheless to make sure that these expanded properties
+# are always resolved
+#
+########################################################################
 
-# Location of the docbook reference archives
-zip.src.dir = ${src.dir}/zip
+# The size of the PDF pages.
+paper.type= Letter
 
 # Target Directory
-target.dir = ${basedir}/target
+target.dir = ${docbook.basedir}/target
 
 # Directory for temporary files
 tmp.dir = ${target.dir}/tmp
 
-# The size of the PDF pages.
-paper.type= Letter
+########################################################################
 
 # Directories into which the docbook reference archives are expanded
 docbook.xml.dir = ${target.dir}/docbook-xml-${docbook.xml.version}