From 26afeca9a2cf5aaad4063217ac4afc5e10d0fa3b Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 23 Jun 2010 12:24:48 +0000 Subject: [PATCH] configure: drop support for Jade/OpenJade/Saxon XSLT processors Drop configure support for Jade/OpenJade XSLT processors. Support is not functional nor is it clear it ever worked at all. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31535 b3059339-0415-0410-9bf9-f77b7e298cf2 Drop support for the Saxon XSLT processor. The XSLT processor detection needs to be overhauled and simplified. Since nobody appears to be using Saxon it is just a burden that hinders the simplification. It can be added back cleanly if there is popular request. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31536 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/README | 6 --- DOCS/xml/configure | 123 --------------------------------------------- 2 files changed, 129 deletions(-) diff --git a/DOCS/xml/README b/DOCS/xml/README index f05432aaa2..88813c1cb3 100644 --- a/DOCS/xml/README +++ b/DOCS/xml/README @@ -13,12 +13,6 @@ ones successfully, so they are required: * xsltproc (part of libxslt1) is used for transforming XML files into HTML files. Version 1.0.18 or later is recommended. -It's also possible to use the Saxon XSLT Processor. The Russian translator -used it (version 6.4.4) for a while. If you have a suitable JavaVM and a -saxon.jar installed somewhere, configure will try to detect them. If -autodetection fails, try to tweak DOCS/xml/configure to get it working and -send us a patch :) - On Red Hat systems you need the following packages: libxml2, libxslt, docbook-dtds, docbook-style-xsl diff --git a/DOCS/xml/configure b/DOCS/xml/configure index 42f0a51054..eb43e5d7c9 100755 --- a/DOCS/xml/configure +++ b/DOCS/xml/configure @@ -176,10 +176,6 @@ EOF done echo "Looking for a valid XSLT processor..." -# Checks for xsltproc, then checks for the Saxon processor (it needs Java). -# Also checks for Jade/OpenJade. -#FIXME: Add support for the xalan/xalan2 XSLT processors. - if xsltproc --version > /dev/null 2>&1 then if test -z "$_fake_chunk_xsl" @@ -199,124 +195,6 @@ then fi fi -# xsltproc not found. -# Now try to find a good Java virtual machine. -# FIXME: We need more checks for Java virtual machines. -if test -z "$_xsltcommand" -then - #FIXME: Add more suitable machines!!! - for _try_java in java gij-3.3 gij-3.2 gij-3.1 gij-3.0 gij - do - if $_try_java --version > /dev/null 2>&1 || $_try_java -version > /dev/null 2>&1 - then - _java=$_try_java - break - fi - done - if test -z "$_java" - then - echo "Java VM not found." - else - # Try to find the right jar files for classpath. - # This must not trigger on something like saxon-fop-6.4.4.jar. - for _try_saxon_jar in \ - /usr/share/java/saxon-[0-9]*.jar \ - /usr/local/share/java/saxon-[0-9]*.jar \ - /usr/share/java/saxon.jar \ - /usr/local/share/java/saxon.jar - do - if test -f "$_try_saxon_jar" - then - _saxon_jar=$_try_saxon_jar - #Don't break to find the _latest_ saxon.jar. - fi - done - if test -n "$_saxon_jar" - then - if test -z "$_fake_chunk_xsl" - then -# _xsltcommand="cd \$1 && if test \"\`dirname \$2 | head -c 1\`\" = \".\" ; then $_java -classpath $_saxon_jar com.icl.saxon.StyleSheet \$_IN_DIR/\$3 \$_IN_DIR/\$2 ; else $_java -classpath $_saxon_jar com.icl.saxon.StyleSheet \$_IN_DIR/\$3 \$2 ;fi" - _xsltcommand=" -if test \"\`dirname \$2 | head -c 1\`\" = \".\" -then - _STYLESHEET=\$_IN_DIR/\$2 -else - _STYLESHEET=\$2 -fi - -if test -d \$1 -then - _DIRNAME=\"\$1\" - _OUTPUT=\"\" -else - _DIRNAME=\"\`dirname \$1\`\" - _OUTPUT=\"-o \`basename \$1\`\" -fi - -cd \$_DIRNAME && - java -classpath /usr/share/java/saxon.jar com.icl.saxon.StyleSheet \$_OUTPUT \$_IN_DIR/\$3 \$_STYLESHEET - " - - echo "Found the Saxon XSLT Processor ($_saxon_jar), using Java VM '$_java'." - else - echo "Found the Saxon XSLT processor but no stylesheets on your system." - echo "Saxon is unusable without stylesheets." - fi - fi - fi -fi - -if test -z "$_xsltcommand" -then - # Java not found. - # now try openjade/jade. - for _try_jade in jade openjade - do - if command -v $_try_jade > /dev/null - then - _jade=$_try_jade - break - fi - done - if test -n "$_jade" - then - echo "xsltproc and Saxon XSLT processors not found." - echo "I will try to use OpenJade or Jade (using '$_jade')." - echo "They aren't (currently) fully supported, however." - for _try_docbook_dsl in \ - /usr/share/sgml/docbook/stylesheet/dsssl/modular/html/docbook.dsl \ - /usr/local/share/sgml/docbook/stylesheet/dsssl/modular/html/docbook.dsl - do - if test -f "$_try_docbook_dsl" - then - _docbook_dsl=$_try_docbook_dsl - break - fi - done - for _try_xml_dcl in \ - /usr/share/sgml/declaration/xml.dcl \ - /usr/local/share/sgml/declaration/xml.dcl - do - if test -f "$_try_xml_dcl" - then - _xml_dcl=$_try_xml_dcl - break - fi - done - if test "x$_docbook_dsl" = "x" -o "x$_xml_dcl" = "x" - then - echo "One of the files docbook.dsl and xml.dcl or both of them weren't found." - echo "Bailing out." - exit 1 - fi - _xsltcommand="cd \$1 && $_jade -t xml -d $_docbook_dsl $_xml_dcl \$_IN_DIR/\$3" - else - echo "No valid XSLT processor found." - echo "Bailing out." - exit 1 - fi -fi - cat > $_xsltwrapper << EOF @@ -326,7 +204,6 @@ cat > $_xsltwrapper << EOF # ************************************************** # This is a small wrapper script around many ways to call the XSLT processor. # It accepts 3 arguments:
-_IN_DIR=\`pwd\` $_sgmlcatalog $_xsltcommand