From bf073285bca3a64192de1e1b94bc3b5614d4b948 Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Mon, 14 Jul 2008 20:30:22 +0000 Subject: [PATCH] PATCH: [ 2015434 ] Manual: Use own build tool package for building the manual --- Docs/Developers/readme-manual.html | 13 +++---------- Docs/Users/Manual/WinMerge_help.xml | 4 ++-- Docs/Users/Manual/build/build_html.bat | 2 +- Docs/Users/Manual/build/build_html.xsl | 2 +- Docs/Users/Manual/build/build_htmlhelp.bat | 2 +- Docs/Users/Manual/build/build_htmlhelp.xsl | 2 +- Docs/Users/Manual/build/configuration.bat | 15 +++++++++------ 7 files changed, 18 insertions(+), 22 deletions(-) diff --git a/Docs/Developers/readme-manual.html b/Docs/Developers/readme-manual.html index abc2f2393..491d9ef0f 100644 --- a/Docs/Developers/readme-manual.html +++ b/Docs/Developers/readme-manual.html @@ -99,10 +99,10 @@ where we want transparency, we use the GIF format, since older browsers have pro
  • XSL StyleSheets
  • HTML Help Compiler
    • -

    The easiest way is to install eDE, -because it install all required tools (except of Java).

    +

    The easiest way is to download our manual build tools package +(it includes all required tools except of Java) and unzip it to the build subdirectory at the Manual directory.

    -

    The batch files are located at the build subdirectory at the Manual directory. +

    The batch files are also located at the build subdirectory at the Manual directory. The main file ist build.bat. Paths to the installed tools are written in the configuration.bat file.

    build.bat html or build_html.bat
    @@ -115,13 +115,6 @@ The main file ist build.bat. Paths to the installed tools are writt
    Is the same like build.bat html.
    -

    Note: If you use a other path than C:\docbook\xsl for the XSL StyleSheets -you must change the files build_html.xsl and build_htmlhelp.xsl:

    -

    build_html.xsl:

    -
    <xsl:import href="file:/C:/docbook/xsl/html/chunk.xsl"/>
    -

    build_htmlhelp.xsl:

    -
    <xsl:import href="file:/C:/docbook/xsl/htmlhelp/htmlhelp.xsl"/>
    -

    Docbook support in SourceForge

    SourceForge has Docbook tools installed, and they can be used from shell server. Tools we are interested in:

    diff --git a/Docs/Users/Manual/WinMerge_help.xml b/Docs/Users/Manual/WinMerge_help.xml index 3d3fa8c4d..1658281e6 100644 --- a/Docs/Users/Manual/WinMerge_help.xml +++ b/Docs/Users/Manual/WinMerge_help.xml @@ -1,6 +1,6 @@ - diff --git a/Docs/Users/Manual/build/build_html.bat b/Docs/Users/Manual/build/build_html.bat index 04033b7c8..152e024bd 100644 --- a/Docs/Users/Manual/build/build_html.bat +++ b/Docs/Users/Manual/build/build_html.bat @@ -42,7 +42,7 @@ copy "..\css\all.css" "%docbook_outputdir%\css\all.css" copy "..\css\print.css" "%docbook_outputdir%\css\print.css" echo Create HTML files... -%docbook_java_exe% %docbook_java_parameters% -cp %docbook_saxon_jar%;%docbook_saxon_xsl% com.icl.saxon.StyleSheet %docbook_inputfile% %docbook_use_stylesheet% base.dir=%docbook_outputdir%\ +%docbook_java_exe% %docbook_java_parameters% -cp %docbook_saxon_jar%;%docbook_xerces_jar%;%docbook_saxon_xsl% -Djavax.xml.parsers.DocumentBuilderFactory=%DBFACTORY% -Djavax.xml.parsers.SAXParserFactory=%SPFACTORY% -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=%XINCLUDE% com.icl.saxon.StyleSheet %docbook_inputfile% %docbook_use_stylesheet% base.dir=%docbook_outputdir%\ echo Finished! diff --git a/Docs/Users/Manual/build/build_html.xsl b/Docs/Users/Manual/build/build_html.xsl index 49b7273df..cb17f1c06 100644 --- a/Docs/Users/Manual/build/build_html.xsl +++ b/Docs/Users/Manual/build/build_html.xsl @@ -1,6 +1,6 @@ - + diff --git a/Docs/Users/Manual/build/build_htmlhelp.bat b/Docs/Users/Manual/build/build_htmlhelp.bat index 392fb1208..1126f3cf9 100644 --- a/Docs/Users/Manual/build/build_htmlhelp.bat +++ b/Docs/Users/Manual/build/build_htmlhelp.bat @@ -28,7 +28,7 @@ if not exist "%docbook_outputdir%\css" mkdir "%docbook_outputdir%\css" copy "..\css\help.css" "%docbook_outputdir%\css\help.css" echo Create HTML files... -%docbook_java_exe% %docbook_java_parameters% -cp %docbook_saxon_jar%;%docbook_saxon_xsl% com.icl.saxon.StyleSheet %docbook_inputfile% %docbook_use_stylesheet% base.dir=%docbook_outputdir%\ +%docbook_java_exe% %docbook_java_parameters% -cp %docbook_saxon_jar%;%docbook_xerces_jar%;%docbook_saxon_xsl% -Djavax.xml.parsers.DocumentBuilderFactory=%DBFACTORY% -Djavax.xml.parsers.SAXParserFactory=%SPFACTORY% -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=%XINCLUDE% com.icl.saxon.StyleSheet %docbook_inputfile% %docbook_use_stylesheet% base.dir=%docbook_outputdir%\ if exist "htmlhelp.hhp" goto compile :compile diff --git a/Docs/Users/Manual/build/build_htmlhelp.xsl b/Docs/Users/Manual/build/build_htmlhelp.xsl index a316cd6f1..bf0bc9eed 100644 --- a/Docs/Users/Manual/build/build_htmlhelp.xsl +++ b/Docs/Users/Manual/build/build_htmlhelp.xsl @@ -1,6 +1,6 @@ - + set nop diff --git a/Docs/Users/Manual/build/configuration.bat b/Docs/Users/Manual/build/configuration.bat index c533c9aed..374f246c8 100644 --- a/Docs/Users/Manual/build/configuration.bat +++ b/Docs/Users/Manual/build/configuration.bat @@ -1,16 +1,19 @@ -rem DocBook... -set docbook_path=c:\docbook - rem Java... set docbook_java_exe=java.exe set docbook_java_parameters=-Xms8m -Xmx256m rem Saxon... -set docbook_saxon_jar=c:\docbook\saxon\saxon.jar -set docbook_saxon_xsl=c:\docbook\xsl\extensions\saxon651.jar +set docbook_saxon_jar=.\saxon\saxon.jar +set docbook_saxon_xsl=.\xsl\extensions\saxon655.jar + +rem Xerces2 Java Parser... +set DBFACTORY=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl +set SPFACTORY=org.apache.xerces.jaxp.SAXParserFactoryImpl +set XINCLUDE=org.apache.xerces.parsers.XIncludeParserConfiguration +set docbook_xerces_jar=.\xerces\xercesImpl.jar rem HTML Help Compiler... -set docbook_hhc_exe=c:\docbook\bin\hhc.exe +set docbook_hhc_exe=.\hhc\hhc.exe rem Build directory... rem Use "." for the current directory. -- 2.11.0