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

[he...@apache.org]

Author: henning
Date: Thu Jan 18 13:15:55 2007
New Revision: 497579

URL: http://svn.apache.org/viewvc?view=rev&rev=497579
Log:
Move some hard coded pathes out.


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

Modified: velocity/docbook/trunk/build-docbook.xml
URL: http://svn.apache.org/viewvc/velocity/docbook/trunk/build-docbook.xml?view=diff&rev=497579&r1=497578&r2=497579
==============================================================================
--- velocity/docbook/trunk/build-docbook.xml (original)
+++ velocity/docbook/trunk/build-docbook.xml Thu Jan 18 13:15:55 2007
@@ -148,7 +148,7 @@
     <mkdir dir="${@{type}.target.dir}/" />
 
     <!-- copy custom title page. If we don't have one, use the custom one. -->
-    <copy file="${src.dir}/styles/@{title}/titlepage.xml" tofile="${@{type}.tmp.titlepage}.xml" overwrite="true" failonerror="false" />
+    <copy file="${styles.src.dir}/@{title}/titlepage.xml" tofile="${@{type}.tmp.titlepage}.xml" overwrite="true" failonerror="false" />
     <copy file="${dbf.xsl.dir}/@{xsl}/titlepage.templates.xml" tofile="${@{type}.tmp.titlepage}.xml" overwrite="false" failonerror="true" />
 
     <saxon input="${@{type}.tmp.titlepage}.xml"
@@ -156,7 +156,7 @@
            style="${dbf.xsl.dir}/template/titlepage.xsl"/>
 
     <copy todir="${@{type}.target.dir}/images">
-      <fileset dir="${src.dir}/images"/>
+      <fileset dir="${images.src.dir}"/>
     </copy>
 
     <saxon input="${docbook.src.dir}/@{dir}/@{file}.xml"
@@ -274,7 +274,7 @@
     </copy>
 
     <copy todir="${html.target.dir}/css">
-      <fileset dir="${src.dir}/css/html"/>
+      <fileset dir="${css.src.dir}/html"/>
     </copy>
 
     <delete file="${html.target.file}.xml"/>
@@ -301,7 +301,7 @@
     </copy>
 
     <copy todir="${htmlsingle.target.dir}/css">
-      <fileset dir="${src.dir}/css/html"/>
+      <fileset dir="${css.src.dir}/html"/>
     </copy>
 
     <move file="${htmlsingle.target.file}.xml" tofile="${htmlsingle.target.file}.html"/>

Modified: velocity/docbook/trunk/docbook.properties
URL: http://svn.apache.org/viewvc/velocity/docbook/trunk/docbook.properties?view=diff&rev=497579&r1=497578&r2=497579
==============================================================================
--- velocity/docbook/trunk/docbook.properties (original)
+++ velocity/docbook/trunk/docbook.properties Thu Jan 18 13:15:55 2007
@@ -24,10 +24,16 @@
 src.dir = ${basedir}/src
 
 # Location of custom style files (XSL)
-style.src.dir = ${basedir}/src/styles
+style.src.dir = ${src.dir}/styles
 
 # Location of the docbook files
 docbook.src.dir = ${src.dir}/docbook
+
+# Location of the image files
+images.src.dir = ${src.dir}/images
+
+# Location of the CSS files
+css.src.dir = ${src.dir}/css
 
 # Target Directory
 target.dir = ${basedir}/target