From e2d2cb7b5e98a9e8cbfddf8c594bb94f12ab887f Mon Sep 17 00:00:00 2001 From: Niels Sascha Reedijk Date: Tue, 5 Sep 2006 15:52:15 +0000 Subject: [PATCH] This finishes my docbook infrastructure. It includes a change to xsltproc to accept catalog paths on the command line. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18763 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/DocumentationRules | 10 +- src/documentation/Jamfile | 2 +- src/documentation/haiku_book/Jamfile | 4 +- src/tools/Jamfile | 1 + src/tools/docbook/Jamfile | 4 + src/tools/docbook/libxml2/Jamfile | 65 ++++ src/tools/docbook/libxml2/config.h | 297 ++++++++++++++++++ .../libxml2/include/libxml/xmlversion.h | 12 +- src/tools/docbook/libxslt/Jamfile | 65 ++++ src/tools/docbook/libxslt/config.h | 161 ++++++++++ .../libexslt/{functions.c => efunctions.c} | 0 .../docbook/libxslt/libexslt/exsltconfig.h | 4 +- .../docbook/libxslt/libxslt/xsltconfig.h | 8 +- src/tools/docbook/libxslt/xsltproc/xsltproc.c | 20 +- 14 files changed, 625 insertions(+), 28 deletions(-) create mode 100644 src/tools/docbook/Jamfile create mode 100644 src/tools/docbook/libxml2/Jamfile create mode 100644 src/tools/docbook/libxml2/config.h create mode 100644 src/tools/docbook/libxslt/Jamfile create mode 100644 src/tools/docbook/libxslt/config.h rename src/tools/docbook/libxslt/libexslt/{functions.c => efunctions.c} (100%) diff --git a/build/jam/DocumentationRules b/build/jam/DocumentationRules index 2d64db0569..bd828221ef 100644 --- a/build/jam/DocumentationRules +++ b/build/jam/DocumentationRules @@ -32,8 +32,6 @@ rule Man2Docs } } -XSLTPROC ?= xsltproc ; - rule Doc2HTML { local source = [ FGristFiles $(1) ] ; @@ -59,14 +57,16 @@ rule Doc2HTML XSLOUTPUT on $(target) = "-o "\"$(target:D=$(basedir))\" ; } - Depends $(target) : $(source) ; + XSLCATALOGS on $(target) = \" [ FDirName $(HAIKU_TOP) src documentation docbook-dtd catalog.xml ] [ FDirName $(HAIKU_TOP) src documentation docbook-xsl catalog.xml ] \" ; + + Depends $(target) : $(source) xsltproc ; LocalDepends doc_files : $(target) ; XSLPROCPATHS on $(target) = -path \" $(paths:J=\ ) \" ; - Doc2HTML1 $(target) : $(source) ; + Doc2HTML1 $(target) : xsltproc $(source) ; LocalClean clean : $(target) ; } actions Doc2HTML1 { - $(XSLTPROC) -xinclude $(XSLPROCPATHS) $(XSLBASEDIR) $(XSLOPTIONS) $(XSLOUTPUT) $(XSLSHEET) $(2) + $(2[1]) --catalogs $(XSLCATALOGS) -xinclude $(XSLPROCPATHS) $(XSLBASEDIR) $(XSLOPTIONS) $(XSLOUTPUT) $(XSLSHEET) $(2[2-]) } diff --git a/src/documentation/Jamfile b/src/documentation/Jamfile index f188b5fdd0..b3ac1c235e 100644 --- a/src/documentation/Jamfile +++ b/src/documentation/Jamfile @@ -2,5 +2,5 @@ SubDir HAIKU_TOP src documentation ; SEARCH on license.xml = [ FDirName $(HAIKU_TOP) src documentation ] ; -#SubInclude HAIKU_TOP src documentation haiku_book ; +SubInclude HAIKU_TOP src documentation haiku_book ; SubInclude HAIKU_TOP src documentation shell_tools ; diff --git a/src/documentation/haiku_book/Jamfile b/src/documentation/haiku_book/Jamfile index f177bc92fa..d71ca51dbe 100644 --- a/src/documentation/haiku_book/Jamfile +++ b/src/documentation/haiku_book/Jamfile @@ -1,9 +1,11 @@ SubDir HAIKU_TOP src documentation haiku_book ; +SetSubDirSupportedPlatformsBeOSCompatible ; + Doc2HTML Haiku_Book.xml : index.html - : http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl + : [ FDirName $(HAIKU_TOP) src documentation docbook-xsl html chunk.xsl ] : Haiku_Book : : -stringparam use.id.as.filename 1 diff --git a/src/tools/Jamfile b/src/tools/Jamfile index 65ddef0a4d..6edd063444 100644 --- a/src/tools/Jamfile +++ b/src/tools/Jamfile @@ -41,6 +41,7 @@ BuildPlatformMain xres : xres.cpp : $(HOST_LIBBE) $(HOST_LIBSTDC++) ; SubInclude HAIKU_TOP src tools copy_to_bfs_image ; SubInclude HAIKU_TOP src tools cppunit ; +SubInclude HAIKU_TOP src tools docbook ; SubInclude HAIKU_TOP src tools elfsymbolpatcher ; SubInclude HAIKU_TOP src tools gensyscalls ; SubInclude HAIKU_TOP src tools keymap ; diff --git a/src/tools/docbook/Jamfile b/src/tools/docbook/Jamfile new file mode 100644 index 0000000000..a39ccbb76d --- /dev/null +++ b/src/tools/docbook/Jamfile @@ -0,0 +1,4 @@ +SubDir HAIKU_TOP src tools docbook ; + +SubInclude HAIKU_TOP src tools docbook libxml2 ; +SubInclude HAIKU_TOP src tools docbook libxslt ; \ No newline at end of file diff --git a/src/tools/docbook/libxml2/Jamfile b/src/tools/docbook/libxml2/Jamfile new file mode 100644 index 0000000000..6f8c194613 --- /dev/null +++ b/src/tools/docbook/libxml2/Jamfile @@ -0,0 +1,65 @@ +SubDir HAIKU_TOP src tools docbook libxml2 ; + +SetSubDirSupportedPlatformsBeOSCompatible ; + +# defines +local defines = [ FDefines HAVE_CONFIG_H=1 HAVE_BEOS_THREADS _REENTRANT ] ; + +SubDirCcFlags $(defines) ; +SubDirC++Flags $(defines) ; + +# system headers +SubDirSysHdrs [ FDirName $(HAIKU_TOP) src tools docbook libxml2 include ] ; + +BuildPlatformStaticLibrary libxml2.a : + SAX.c + entities.c + encoding.c + error.c + parserInternals.c + parser.c + tree.c + hash.c + list.c + xmlIO.c + xmlmemory.c + uri.c + valid.c + xlink.c + HTMLparser.c + HTMLtree.c + debugXML.c + xpath.c + xpointer.c + xinclude.c + nanohttp.c + nanoftp.c + DOCBparser.c + catalog.c + globals.c + threads.c + c14n.c + xmlstring.c + xmlregexp.c + xmlschemas.c + xmlschemastypes.c + xmlunicode.c + xmlreader.c + relaxng.c + dict.c + SAX2.c + xmlwriter.c + legacy.c + chvalid.c + pattern.c + xmlsave.c + xmlmodule.c + schematron.c +; + +BuildPlatformMain xmllint : + xmllint.c +; + +LinkAgainst xmllint + : libxml2.a net z ; \ No newline at end of file diff --git a/src/tools/docbook/libxml2/config.h b/src/tools/docbook/libxml2/config.h new file mode 100644 index 0000000000..e21ff7b824 --- /dev/null +++ b/src/tools/docbook/libxml2/config.h @@ -0,0 +1,297 @@ +/* config.h. Generated by configure. */ +/* config.h.in. Generated from configure.in by autoheader. */ +#define PACKAGE "libxml2" +#define VERSION "2.6.26" +#define HAVE_LIBZ +/* #undef HAVE_LIBM */ +#define HAVE_ISINF +#define HAVE_ISNAN +/* #undef HAVE_LIBHISTORY */ +/* #undef HAVE_LIBREADLINE */ +/* #undef HAVE_LIBPTHREAD */ +/* #undef HAVE_PTHREAD_H */ + +/* Define if IPV6 support is there */ +/* #undef SUPPORT_IP6 */ + +/* Define if getaddrinfo is there */ +/* #undef HAVE_GETADDRINFO */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ANSIDECL_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ARPA_INET_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ARPA_NAMESER_H */ + +/* Whether struct sockaddr::__ss_family exists */ +/* #undef HAVE_BROKEN_SS_FAMILY */ + +/* Define to 1 if you have the `class' function. */ +/* #undef HAVE_CLASS */ + +/* Define to 1 if you have the header file. */ +#define HAVE_CTYPE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DIRENT_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_DLFCN_H */ + +/* Have dlopen based dso */ +/* #undef HAVE_DLOPEN */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_DL_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `finite' function. */ +#define HAVE_FINITE 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FLOAT_H 1 + +/* Define to 1 if you have the `fpclass' function. */ +/* #undef HAVE_FPCLASS */ + +/* Define to 1 if you have the `fprintf' function. */ +#define HAVE_FPRINTF 1 + +/* Define to 1 if you have the `fp_class' function. */ +/* #undef HAVE_FP_CLASS */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FP_CLASS_H */ + +/* Define to 1 if you have the `ftime' function. */ +#define HAVE_FTIME 1 + +/* Define if getaddrinfo is there */ +/* #undef HAVE_GETADDRINFO */ + +/* Define to 1 if you have the `gettimeofday' function. */ +#define HAVE_GETTIMEOFDAY 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_IEEEFP_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define if isinf is there */ +#define HAVE_ISINF + +/* Define if isnan is there */ +#define HAVE_ISNAN + +/* Define to 1 if you have the `isnand' function. */ +/* #undef HAVE_ISNAND */ + +/* Define if history library is there (-lhistory) */ +/* #undef HAVE_LIBHISTORY */ + +/* Define if pthread library is there (-lpthread) */ +/* #undef HAVE_LIBPTHREAD */ + +/* Define if readline library is there (-lreadline) */ +/* #undef HAVE_LIBREADLINE */ + +/* Have compression library */ +#define HAVE_LIBZ + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if you have the `localtime' function. */ +#define HAVE_LOCALTIME 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MALLOC_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MATH_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_NAN_H */ + +/* Define to 1 if you have the header file, and it defines `DIR'. */ +/* #undef HAVE_NDIR_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_NETDB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_NETINET_IN_H 1 + +/* Define to 1 if you have the `printf' function. */ +#define HAVE_PRINTF 1 + +/* Define if is there */ +/* #undef HAVE_PTHREAD_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_RESOLV_H */ + +/* Have shl_load based dso */ +/* #undef HAVE_SHLLOAD */ + +/* Define to 1 if you have the `signal' function. */ +#define HAVE_SIGNAL 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the `snprintf' function. */ +#define HAVE_SNPRINTF 1 + +/* Define to 1 if you have the `sprintf' function. */ +#define HAVE_SPRINTF 1 + +/* Define to 1 if you have the `sscanf' function. */ +#define HAVE_SSCANF 1 + +/* Define to 1 if you have the `stat' function. */ +// Do not define stat on BeOS R5: it's not complete +//#define HAVE_STAT 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDARG_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_STDINT_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strdup' function. */ +#define HAVE_STRDUP 1 + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the `strftime' function. */ +#define HAVE_STRFTIME 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strndup' function. */ +/* #undef HAVE_STRNDUP */ + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_DIR_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_MMAN_H */ + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_NDIR_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_SELECT_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SOCKET_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIMEB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Whether va_copy() is available */ +/* #undef HAVE_VA_COPY */ + +/* Define to 1 if you have the `vfprintf' function. */ +#define HAVE_VFPRINTF 1 + +/* Define to 1 if you have the `vsnprintf' function. */ +#define HAVE_VSNPRINTF 1 + +/* Define to 1 if you have the `vsprintf' function. */ +#define HAVE_VSPRINTF 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ZLIB_H 1 + +/* Define to 1 if you have the `_stat' function. */ +/* #undef HAVE__STAT */ + +/* Whether __va_copy() is available */ +#define HAVE___VA_COPY 1 + +/* Name of package */ +#define PACKAGE "libxml2" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "" + +/* Define to 1 if the C compiler supports function prototypes. */ +#define PROTOTYPES 1 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Support for IPv6 */ +/* #undef SUPPORT_IP6 */ + +/* Version number of package */ +#define VERSION "2.6.26" + +/* Determine what socket length (socklen_t) data type is */ +#define XML_SOCKLEN_T int + +/* Using the Win32 Socket implementation */ +/* #undef _WINSOCKAPI_ */ + +/* Define like PROTOTYPES; this can be used by system headers. */ +#define __PROTOTYPES 1 + +/* Win32 Std C name mangling work-around */ +/* #undef snprintf */ + +/* ss_family is not defined here, use __ss_family instead */ +/* #undef ss_family */ + +/* Win32 Std C name mangling work-around */ +/* #undef vsnprintf */ diff --git a/src/tools/docbook/libxml2/include/libxml/xmlversion.h b/src/tools/docbook/libxml2/include/libxml/xmlversion.h index cc75dc027f..518fb78a50 100644 --- a/src/tools/docbook/libxml2/include/libxml/xmlversion.h +++ b/src/tools/docbook/libxml2/include/libxml/xmlversion.h @@ -50,7 +50,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * extra version information, used to show a CVS compilation */ -#define LIBXML_VERSION_EXTRA "-CVS2798" +#define LIBXML_VERSION_EXTRA "" /** * LIBXML_TEST_VERSION: @@ -263,7 +263,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * Whether iconv support is available */ -#if 1 +#if 0 #define LIBXML_ICONV_ENABLED #endif @@ -290,7 +290,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * Whether the memory debugging is configured in */ -#if 1 +#if 0 #define DEBUG_MEMORY_LOCATION #endif @@ -299,7 +299,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * Whether the runtime debugging is configured in */ -#if 1 +#if 0 #define LIBXML_DEBUG_RUNTIME #endif @@ -362,14 +362,14 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * Whether the module interfaces are compiled in */ -#if 1 +#if 0 #define LIBXML_MODULES_ENABLED /** * LIBXML_MODULE_EXTENSION: * * the string suffix used by dynamic modules (usually shared libraries) */ -#define LIBXML_MODULE_EXTENSION ".so" +#define LIBXML_MODULE_EXTENSION "" #endif /** diff --git a/src/tools/docbook/libxslt/Jamfile b/src/tools/docbook/libxslt/Jamfile new file mode 100644 index 0000000000..7f31c3ea8d --- /dev/null +++ b/src/tools/docbook/libxslt/Jamfile @@ -0,0 +1,65 @@ +SubDir HAIKU_TOP src tools docbook libxslt ; + +SetSubDirSupportedPlatformsBeOSCompatible ; + +# defines +local defines = [ FDefines HAVE_CONFIG_H ] ; + +SubDirCcFlags $(defines) ; +SubDirC++Flags $(defines) ; + +# source directories +local sourceDirs = + libexslt + libxslt + xsltproc +; + +local sourceDir ; +for sourceDir in $(sourceDirs) { + SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src tools docbook libxslt $(sourceDir) ] ; +} + +# system headers +SubDirSysHdrs [ FDirName $(HAIKU_TOP) src tools docbook libxml2 include ] ; +SubDirSysHdrs [ FDirName $(HAIKU_TOP) src tools docbook libxslt ] ; + +BuildPlatformStaticLibrary libxslt.a : + #xslt + attrvt.c + xslt.c + xsltutils.c + pattern.c + templates.c + variables.c + keys.c + numbers.c + extensions.c + extra.c + functions.c + namespaces.c + imports.c + attributes.c + documents.c + preproc.c + transform.c + security.c + #exslt + exslt.c + common.c + crypto.c + math.c + sets.c + efunctions.c + strings.c + date.c + saxon.c + dynamic.c +; + +BuildPlatformMain xsltproc : + xsltproc.c +; + +LinkAgainst xsltproc + : libxslt.a libxml2.a net z ; diff --git a/src/tools/docbook/libxslt/config.h b/src/tools/docbook/libxslt/config.h new file mode 100644 index 0000000000..f9d8861b90 --- /dev/null +++ b/src/tools/docbook/libxslt/config.h @@ -0,0 +1,161 @@ +/* config.h. Generated by configure. */ +/* config.h.in. Generated from configure.in by autoheader. */ +/* #undef HAVE_ISINF */ +/* #undef HAVE_ISNAN */ +/* #undef HAVE_POW */ +/* #undef HAVE_FLOOR */ +/* #undef HAVE_FABS */ +#define WITH_DEBUGGER 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ANSIDECL_H */ + +/* Define to 1 if you have the `asctime' function. */ +#define HAVE_ASCTIME 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_DLFCN_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_FLOAT_H 1 + +/* Define to 1 if you have the `fprintf' function. */ +#define HAVE_FPRINTF 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FP_CLASS_H */ + +/* Define to 1 if you have the `ftime' function. */ +#define HAVE_FTIME 1 + +/* Define if gcrypt library is available. */ +/* #undef HAVE_GCRYPT */ + +/* Define to 1 if you have the `gettimeofday' function. */ +#define HAVE_GETTIMEOFDAY 1 + +/* Define to 1 if you have the `gmtime_r' function. */ +#define HAVE_GMTIME_R 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_IEEEFP_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `localtime' function. */ +#define HAVE_LOCALTIME 1 + +/* Define to 1 if you have the `localtime_r' function. */ +#define HAVE_LOCALTIME_R 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MATH_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `mktime' function. */ +#define HAVE_MKTIME 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_NAN_H */ + +/* Define to 1 if you have the `printf' function. */ +#define HAVE_PRINTF 1 + +/* Define to 1 if you have the `snprintf' function. */ +#define HAVE_SNPRINTF 1 + +/* Define to 1 if you have the `sprintf' function. */ +#define HAVE_SPRINTF 1 + +/* Define to 1 if you have the `sscanf' function. */ +#define HAVE_SSCANF 1 + +/* Define to 1 if you have the `stat' function. */ +#define HAVE_STAT 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDARG_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_STDINT_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_SELECT_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIMEB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the `time' function. */ +#define HAVE_TIME 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the `vfprintf' function. */ +#define HAVE_VFPRINTF 1 + +/* Define to 1 if you have the `vsnprintf' function. */ +#define HAVE_VSNPRINTF 1 + +/* Define to 1 if you have the `vsprintf' function. */ +#define HAVE_VSPRINTF 1 + +/* Define to 1 if you have the `_stat' function. */ +/* #undef HAVE__STAT */ + +/* Name of package */ +#define PACKAGE "libxslt" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "" + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION "1.1.17" + +/* Using the Win32 Socket implementation */ +/* #undef _WINSOCKAPI_ */ + +/* Win32 Std C name mangling work-around */ +/* #undef snprintf */ + +/* Win32 Std C name mangling work-around */ +/* #undef vsnprintf */ diff --git a/src/tools/docbook/libxslt/libexslt/functions.c b/src/tools/docbook/libxslt/libexslt/efunctions.c similarity index 100% rename from src/tools/docbook/libxslt/libexslt/functions.c rename to src/tools/docbook/libxslt/libexslt/efunctions.c diff --git a/src/tools/docbook/libxslt/libexslt/exsltconfig.h b/src/tools/docbook/libxslt/libexslt/exsltconfig.h index 7efa3bd450..9f03ccbc50 100644 --- a/src/tools/docbook/libxslt/libexslt/exsltconfig.h +++ b/src/tools/docbook/libxslt/libexslt/exsltconfig.h @@ -39,14 +39,14 @@ extern "C" { * * extra version information, used to show a CVS compilation */ -#define LIBEXSLT_VERSION_EXTRA "-CVS1062" +#define LIBEXSLT_VERSION_EXTRA "" /** * WITH_CRYPTO: * * Whether crypto support is configured into exslt */ -#if 1 +#if 0 #define EXSLT_CRYPTO_ENABLED #endif diff --git a/src/tools/docbook/libxslt/libxslt/xsltconfig.h b/src/tools/docbook/libxslt/libxslt/xsltconfig.h index 4f87aa9f84..aaf4c8d6b1 100644 --- a/src/tools/docbook/libxslt/libxslt/xsltconfig.h +++ b/src/tools/docbook/libxslt/libxslt/xsltconfig.h @@ -41,7 +41,7 @@ extern "C" { * * extra version information, used to show a CVS compilation */ -#define LIBXSLT_VERSION_EXTRA "-CVS1062" +#define LIBXSLT_VERSION_EXTRA "" /** * WITH_XSLT_DEBUG: @@ -54,7 +54,7 @@ extern "C" { #define WITH_XSLT_DEBUG #endif -#if 1 +#if 0 /** * DEBUG_MEMORY: * @@ -112,11 +112,11 @@ extern "C" { * Whether module support is configured into libxslt * Note: no default module path for win32 platforms */ -#if 1 +#if 0 #ifndef WITH_MODULES #define WITH_MODULES #endif -#define LIBXSLT_DEFAULT_PLUGINS_PATH() "/usr/lib/libxslt-plugins" +#define LIBXSLT_DEFAULT_PLUGINS_PATH() "/usr/local/lib/libxslt-plugins" #endif /** diff --git a/src/tools/docbook/libxslt/xsltproc/xsltproc.c b/src/tools/docbook/libxslt/xsltproc/xsltproc.c index 2d8a9f44b1..81b2495114 100644 --- a/src/tools/docbook/libxslt/xsltproc/xsltproc.c +++ b/src/tools/docbook/libxslt/xsltproc/xsltproc.c @@ -506,7 +506,7 @@ static void usage(const char *name) { printf("\t--nomkdir : refuse to create directories\n"); printf("\t--writesubtree path : allow file write only with the path subtree\n"); #ifdef LIBXML_CATALOG_ENABLED - printf("\t--catalogs : use SGML catalogs from $SGML_CATALOG_FILES\n"); + printf("\t--catalogs paths: load the xml catalogs at 'paths' \n"); printf("\t otherwise XML Catalogs starting from \n"); printf("\t file:///etc/xml/catalog are activated by default\n"); #endif @@ -637,14 +637,8 @@ main(int argc, char **argv) #ifdef LIBXML_CATALOG_ENABLED } else if ((!strcmp(argv[i], "-catalogs")) || (!strcmp(argv[i], "--catalogs"))) { - const char *catalogs; - - catalogs = getenv("SGML_CATALOG_FILES"); - if (catalogs == NULL) { - fprintf(stderr, "Variable $SGML_CATALOG_FILES not set\n"); - } else { - xmlLoadCatalogs(catalogs); - } + i++; + xmlLoadCatalogs(argv[i]); #endif #ifdef LIBXML_XINCLUDE_ENABLED } else if ((!strcmp(argv[i], "-xinclude")) || @@ -761,7 +755,15 @@ main(int argc, char **argv) (!strcmp(argv[i], "--path"))) { i++; continue; +#ifdef LIBXML_CATALOG_ENABLED + } else if ((!strcmp(argv[i], "-catalogs")) || + (!strcmp(argv[i], "--catalogs"))) { + i++; + continue; +#endif } + + if ((!strcmp(argv[i], "-param")) || (!strcmp(argv[i], "--param"))) { i += 2; continue;