Changeset 3284

Timestamp:

May 2, 2007, 2:56:18 PM (16 years ago)

Author:

Martin Svensson

Message:

Would hopefully solve the problems to generate the documentation when not able to open DTD files over internet.
Re-organized in build/docbook/

Location:

trunk

Files:

• build.xml (modified) (5 diffs)
• lib/docbook/preprocess/catalog.xml (modified) (1 diff)
• lib/docbook/preprocess/dweiss-docbook-extensions.dtd (modified) (1 diff)

trunk/build.xml

@@ -1053 +1053 @@
     <mkdir dir="${doc}/docbook/html/userdoc/webclient"/>
     
-    <mkdir dir="${build}/docbook/" />
+    <mkdir dir="${build}/docbook/html" />
     <delete description="Delete existing documents">
       <fileset dir="${build}/docbook" defaultexcludes="no" />
@@ -1064 +1064 @@
       <property name="docbook.resources.dir" location="${docbook.src}/figures" />
       <property name="distribution.dir" location="${doc}/docbook/html" />
-      <property name="build.dir" location="${build}/docbook" />
+      <property name="build.dir" location="${build}/docbook/html" />
       <property name="base.version" value="${base.version}"/>
     </ant>
@@ -1081 +1081 @@
 
       <style
-          in      = "${build}/docbook/docbook-ready-file.tmp"
+          in      = "${build}/docbook/html/docbook-ready-file.tmp"
           style   = "${lib}/docbook/preprocess/webclient_helptext.xsl"
           out     = "data/helptexts.xml"
@@ -1106 +1106 @@
     >
     <!-- Generate a pdf file from the documentation source -->
-    <mkdir dir="${doc}/docbook" />
+    <mkdir dir="${build}/docbook/pdf" />
     <echo>Generate pdf file</echo>
     <ant antfile="${lib}/docbook/ant-build-docbook.xml" inheritall="false" target="pdf.fop">
@@ -1113 +1113 @@
       <property name="docbook.resources.dir" location="${docbook.src}/figures" />
       <property name="distribution.dir" location="${doc}/docbook" />
-      <property name="build.dir" location="${build}/docbook" />
+      <property name="build.dir" location="${build}/docbook/pdf" />
       <property name="base.version" value="${base.version}"/>
     </ant>

trunk/lib/docbook/preprocess/catalog.xml

@@ -2 +2 @@
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
 
+<group  xml:base="../" prefer="public" >
 <public publicId="-//Dawid Weiss//DTD DocBook V3.1-Based Extension for XML and graphics inclusion//EN" 
-      uri="dweiss-docbook-extensions.dtd" />
+      uri="preprocess/dweiss-docbook-extensions.dtd" />
 
 <public publicId="-//OASIS//DTD DocBook XML V4.2//EN" 
-    uri="../docbook/dtd/docbookx.dtd" />
-
+    uri="docbook/dtd/docbookx.dtd" />
+</group>
 
 </catalog>

trunk/lib/docbook/preprocess/dweiss-docbook-extensions.dtd

@@ -14 +14 @@
 <!-- load DocBook -->
 
-<!ENTITY % docbook-dtd PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!ENTITY % docbook-dtd PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "../docbook/dtd/docbookx.dtd">
 %docbook-dtd;