2010-12-03 [paul] 3.7.7cvs11
authorPaul Mangan <paul@claws-mail.org>
Fri, 3 Dec 2010 13:08:23 +0000 (13:08 +0000)
committerPaul Mangan <paul@claws-mail.org>
Fri, 3 Dec 2010 13:08:23 +0000 (13:08 +0000)
* configure.ac
* manual/xml2pdf ** REMOVED **
* manual/dist/pdf/Makefile.am
* manual/es/dist/pdf/Makefile.am
* manual/fr/dist/pdf/Makefile.am
* manual/pl/dist/pdf/Makefile.am
simplify check for tools needed for manual building,
remove xml2pdf and use docbook2pdf instead

ChangeLog
PATCHSETS
configure.ac
manual/dist/pdf/Makefile.am
manual/es/dist/pdf/Makefile.am
manual/fr/dist/pdf/Makefile.am
manual/pl/dist/pdf/Makefile.am
manual/xml2pdf [deleted file]

index 0d2d215..fc7ed12 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-03 [paul]      3.7.7cvs11
+
+       * configure.ac
+       * manual/xml2pdf ** REMOVED **
+       * manual/dist/pdf/Makefile.am
+       * manual/es/dist/pdf/Makefile.am
+       * manual/fr/dist/pdf/Makefile.am
+       * manual/pl/dist/pdf/Makefile.am
+               simplify check for tools needed for manual building,
+               remove xml2pdf and use docbook2pdf instead
+
 2010-12-03 [mir]       3.7.7cvs10
 
        * configure.ac
index d797314..93090de 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.12.2.62 -r 1.12.2.63 src/action.c;  ) > 3.7.7cvs8.patchset
 ( cvs diff -u -r 1.23.2.34 -r 1.23.2.35 src/crash.c;  ) > 3.7.7cvs9.patchset
 ( cvs diff -u -r 1.654.2.4145 -r 1.654.2.4146 configure.ac;  ) > 3.7.7cvs10.patchset
+( cvs diff -u -r 1.654.2.4146 -r 1.654.2.4147 configure.ac;  cvs diff -u -r -1.1.2.6 -r -1.1.2.7 manual/xml2pdf;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 manual/dist/pdf/Makefile.am;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/es/dist/pdf/Makefile.am;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/fr/dist/pdf/Makefile.am;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/pl/dist/pdf/Makefile.am;  ) > 3.7.7cvs11.patchset
index 6f76c34..79e3356 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=7
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=10
+EXTRA_VERSION=11
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -212,42 +212,20 @@ dnl ******************************
 dnl ** Check for required tools **
 dnl ** to build manuals         **
 dnl ******************************
-SAXON=`which saxon 2> /dev/null`
-if test $? -ne 0; then
-       SAXON=
-fi
-if test -z "$SAXON"; then
-        SAXONJAR='/usr/share/java/saxon.jar'
-        if test ! -f "$SAXONJAR"; then
-                SAXONJAR='/usr/local/share/java/saxon.jar'
-                if test ! -f "$SAXONJAR"; then
-                        SAXONJAR=
-                fi
-        fi
-fi
-AM_CONDITIONAL(MANUAL_PDF, test -n "$SAXON" -o -n "$SAXONJAR")
 
-DOCBOOK2TXT=`which docbook2txt 2> /dev/null`
-if test $? -ne 0; then
-       DOCBOOK2TXT=
-fi
-AM_CONDITIONAL(MANUAL_TXT, test -n "$DOCBOOK2TXT")
+AC_PATH_PROG(DOCBOOK2HTML, docbook2html)
+AC_PATH_PROG(DOCBOOK2TXT, docbook2txt)
+AC_PATH_PROG(DOCBOOK2PS, docbook2ps)
+AC_PATH_PROG(DOCBOOK2PDF, docbook2pdf)
 
-DOCBOOK2HTML=`which docbook2html 2> /dev/null`
-if test $? -ne 0; then
-        DOCBOOK2HTML=
-fi
 AM_CONDITIONAL(MANUAL_HTML, test -n "$DOCBOOK2HTML")
-
-DOCBOOK2PS=`which docbook2ps 2> /dev/null`
-if test $? -ne 0; then
-        DOCBOOK2PS=
-fi
+AM_CONDITIONAL(MANUAL_TXT, test -n "$DOCBOOK2TXT")
+AM_CONDITIONAL(MANUAL_PDF, test -n "$DOCBOOK2PDF")
 AM_CONDITIONAL(MANUAL_PS, test -n "$DOCBOOK2PS")
 
 if test x"$ac_cv_enable_manual" = x"yes"; then
     if test -n "$DOCBOOK2TXT" -o -n "$DOCBOOK2HTML" \
-       -o -n "$DOCBOOK2PS" -o -n "$SAXON" -o -n "$SAXONJAR"; then
+       -o -n "$DOCBOOK2PS" -o -n "$DOCBOOK2PDF"; then
            ac_cv_enable_manual=yes
        else
            ac_cv_enable_manual=no
index bbd6877..0b5a57d 100644 (file)
@@ -16,8 +16,8 @@ claws-mail-manual.pdf: \
        ../../keyboard.xml \
        ../../plugins.xml \
        ../../starting.xml \
-       ../../claws-mail-manual.xml 
-       -sh ../../xml2pdf ../../dtd/manual.xsl ../../claws-mail-manual.xml
+       ../../claws-mail-manual.xml
+       -docbook2pdf -o . ../../claws-mail-manual.xml
        
 maintainer-clean:
        -rm claws-mail-manual.pdf claws-mail-manual.fo claws-mail-manual.xsl
index bab463f..44f0e06 100644 (file)
@@ -17,7 +17,7 @@ claws-mail-manual.pdf: \
        ../../plugins.xml \
        ../../starting.xml \
        ../../claws-mail-manual.xml 
-       -sh ../../../xml2pdf ../../../dtd/manual.xsl ../../claws-mail-manual.xml
+       -docbook2pdf -o . ../../claws-mail-manual.xml
        
 maintainer-clean:
        -rm claws-mail-manual.pdf claws-mail-manual.fo claws-mail-manual.xsl
index a62a134..8a67959 100644 (file)
@@ -17,7 +17,7 @@ claws-mail-manual.pdf: \
        ../../plugins.xml \
        ../../starting.xml \
        ../../claws-mail-manual.xml 
-       -sh ../../../xml2pdf ../../../dtd/manual.xsl ../../claws-mail-manual.xml
+       -docbook2pdf -o . ../../claws-mail-manual.xml
        
 maintainer-clean:
        -rm claws-mail-manual.pdf claws-mail-manual.fo claws-mail-manual.xsl
index 96d7b08..90aa608 100644 (file)
@@ -17,7 +17,7 @@ claws-mail-manual.pdf: \
        ../../plugins.xml \
        ../../starting.xml \
        ../../claws-mail-manual.xml 
-       -sh ../../../xml2pdf ../../../dtd/manual.xsl ../../claws-mail-manual.xml
+       -docbook2pdf -o . ../../claws-mail-manual.xml
        
 maintainer-clean:
        -rm claws-mail-manual.pdf claws-mail-manual.fo claws-mail-manual.xsl
diff --git a/manual/xml2pdf b/manual/xml2pdf
deleted file mode 100644 (file)
index d30fa0a..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/sh
-
-# pdf generation from xml and xsl
-# $1: .xsl file 
-# $2: .xml file
-
-if [ $# -ne 2 ]
-then
-       echo "usage: ${0##*/} <file.xsl> <file.xml>"
-       exit 1
-fi
-
-test -z "$JAVA" && \
-       JAVA=`which java`
-test -z "$JAVA" && \
-       JAVA="$JAVA_HOME/bin/java"
-if [ ! -x "$JAVA" ]
-then
-       echo 'error: java not found in your $PATH or in $JAVA_HOME/bin'
-       exit 1
-fi
-
-test -z "$SAXON" && \
-       SAXON=`which saxon`
-if [ -z "$SAXON" ]
-then
-       test -z "$SAXONJAR" && \
-               SAXONJAR='/usr/share/java/saxon.jar'
-       if [ ! -f "$SAXONJAR" ]
-       then
-               SAXONJAR='/usr/local/share/java/saxon.jar'
-               if [ ! -f "$SAXONJAR" ]
-               then
-                       echo "error: neither saxon nor saxon.jar were found"
-                       exit 1
-               fi
-       fi
-       SAXON="$JAVA -jar $SAXONJAR"
-fi
-
-
-if [ -n "$XML_CATALOG_FILES" ]
-then
-       CATALOG_FILES=$XML_CATALOG_FILES
-else
-       echo "warning: XML_CATALOG_FILES is not set or empty"
-       CATALOG_FILES="/usr/local/etc/xml/catalog /etc/xml/catalog
-                       /usr/local/share/xml/catalog $HOME/xml/catalog"
-fi
-KEY="http://docbook.sourceforge.net/release/xsl/current"
-
-# manual base name
-SCM=claws-mail-manual
-
-for CATALOG in $CATALOG_FILES
-do
-       if [ -s "$CATALOG" ]
-       then
-               DOCBOOKXSLPATH=$(xmlcatalog "$CATALOG" "$KEY/")
-               # second chance
-               if [ $? -ne 0 -o -z "$DOCBOOKXSLPATH" ]
-               then
-                       DOCBOOKXSLPATH=$(xmlcatalog "$CATALOG" "$KEY")
-                       # still not found
-                       test $? -ne 0 -o -z "$DOCBOOKXSLPATH" && \
-                               continue
-               fi
-
-               test "`echo ${DOCBOOKXSLPATH} | cut -c 1-7`" = "file://" && \
-                       DOCBOOKXSLPATH=`echo ${DOCBOOKXSLPATH} | cut -c 8-`
-               if [ -n "$DOCBOOKXSLPATH" ]
-               then
-                       echo "docbook-xsl path found: $DOCBOOKXSLPATH"
-                       sed "s|@DOCBOOK_XSL_PATH@|$DOCBOOKXSLPATH|g" "$1" \
-                           > ${SCM}.xsl && \
-                               $SAXON -o ${SCM}.fo "$2" ${SCM}.xsl && \
-                               fop -fo ${SCM}.fo -pdf ${SCM}.pdf
-                       exit $?
-               fi
-       fi
-done
-echo "couldn't find docbook-xsl path from any of the following catalog files:"
-echo "$CATALOG_FILES"
-exit 1