+Mon Jan 17 16:50:02 CET 2005 Daniel Veillard <daniel@veillard.com>
+
+ * configure.in libxslt/Makefile.am libxslt/xsltwin32config.h
+ tests/Makefile.am tests/plugins/Makefile.am
+ tests/plugins/testplugin.c: applied another patch from Joel Reed
+ still failing here but looking better
+
Sun Jan 16 00:09:11 CET 2005 Daniel Veillard <daniel@veillard.com>
* libxslt/extensions.c: applied another patch from Joel Reed
if test "${LOGNAME}" = "veillard" -a "`pwd`" = "/u/veillard/XSLT" ; then
if test "`uname -i`" != "x86_64" ;
then
- LIBXML_LIBS="../../XML/.libs/libxml2.a -lpthread -lz"
+ LIBXML_LIBS="$HOME/XML/.libs/libxml2.a -lpthread -lz"
fi
DV_LINK="1"
XSLTPROCDV="xsltproc.dv"
INSTALLED_XSLT_LIB=""
- LIBXML_SRC="../../XML/"
+ LIBXML_SRC="$HOME/XML/"
fi
WIN32_EXTRA_LIBADD=
tests/exslt/sets/Makefile
tests/exslt/strings/Makefile
tests/exslt/date/Makefile
+tests/plugins/Makefile
doc/Makefile
xslt-config
libxslt.spec
EXTRA_DIST = $(man_MANS) trio.h triodef.h
-
-# somewhat unconventional pkglibdir, but noinst_LTLIBRARIES
-# never build DSOs (afaik). NOTE: must be defined outside the AM_CONDITIONAL
-pkglibdir=$(shell pwd)/../tests/plugins
-
-if WITH_MODULES
-pkglib_LTLIBRARIES = xmlsoft_org_xslt_testplugin.la
-
-xmlsoft_org_xslt_testplugin_la_CFLAGS = -DMODULE_COMPILE $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
-xmlsoft_org_xslt_testplugin_la_SOURCES = testplugin.c
-xmlsoft_org_xslt_testplugin_la_LDFLAGS = -module -avoid-version $(LIBXML_LIBS) $(LIBXSLT_LIBS)
-
-check-local: install-pkglibLTLIBRARIES
-
-endif
-
xsltproc: all
@(cd ../xsltproc ; $(MAKE))
*
* extra version information, used to show a CVS compilation
*/
-#define LIBXML_VERSION_EXTRA "-CVS980"
+#define LIBXML_VERSION_EXTRA "-CVS982"
/**
* WITH_XSLT_DEBUG:
## Process this file with automake to produce Makefile.in
SUBDIRS=docs REC1 REC2 REC general namespaces keys numbers documents \
- extensions reports xmlspec multiple XSLTMark docbook exslt
+ extensions reports xmlspec multiple XSLTMark docbook exslt plugins
all:
# and (if errors are expected) in *.err
test tests:
@(cur=`pwd` ; for dir in $(SUBDIRS) ; do cd $$dir ; $(MAKE) CHECKER='$(CHECKER)' tests ; cd $$cur ; done)
- $(MAKE) plugin_tests
valgrind:
@echo '## Running the regression tests under Valgrind'
docbook_tests:
@(cd docbook ; $(MAKE) full)
-if WITH_MODULES
-
-plugin_tests:
- @echo Running the plugin tests...
- @(cd plugins && LIBXSLT_PLUGINS_PATH=. $(top_builddir)/../xsltproc/xsltproc plugin.xsl plugin.xml)
-
-else
-
-plugin_tests:
- @echo Skipping the plugin tests.
-
-endif
--- /dev/null
+## Process this file with automake to produce Makefile.in
+
+# somewhat unconventional pkglibdir, but noinst_LTLIBRARIES
+# never build DSOs (afaik). NOTE: must be defined outside the AM_CONDITIONAL
+pkglibdir=$(shell pwd)/plugin
+
+$(top_builddir)/xsltproc/xsltproc:
+ @(cd ../../../xsltproc ; $(MAKE) xsltproc)
+
+EXTRA_DIST = plugin.out plugin.xml plugin.xsl
+
+all:
+
+if WITH_MODULES
+pkglib_LTLIBRARIES = xmlsoft_org_xslt_testplugin.la
+
+xmlsoft_org_xslt_testplugin_la_CFLAGS = -DMODULE_COMPILE $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
+xmlsoft_org_xslt_testplugin_la_SOURCES = testplugin.c
+xmlsoft_org_xslt_testplugin_la_LDFLAGS = -module -avoid-version $(LIBXML_LIBS) $(LIBXSLT_LIBS)
+
+test-logall:
+ @echo '## Running plugin tests'
+ @echo '## Note: installing xmlsoft_org_xslt_testplugin.so'
+ @echo '## to $(pkglibdir)'
+
+test tests: $(top_builddir)/xsltproc/xsltproc test-logall install-pkglibLTLIBRARIES
+ @LIBXSLT_PLUGINS_PATH=./plugin $(top_builddir)/xsltproc/xsltproc plugin.xsl plugin.xml > plugin.res
+ @diff plugin.out plugin.res
+ @rm plugin.res
+
+else
+
+test tests:
+ @echo Skipping the plugin tests.
+
+endif
+
*/
#define IN_LIBXSLT
-#include "libxslt.h"
+#include <libxslt/libxslt.h>
#ifdef WITH_MODULES
#include <libxml/xpathInternals.h>
#include <libxml/list.h>
#include <libxml/xmlIO.h>
-#include "xslt.h"
-#include "xsltInternals.h"
-#include "xsltutils.h"
-#include "imports.h"
-#include "extensions.h"
+#include <libxslt/xslt.h>
+#include <libxslt/xsltInternals.h>
+#include <libxslt/xsltutils.h>
+#include <libxslt/imports.h>
+#include <libxslt/extensions.h>
#define XSLT_TESTPLUGIN_URL "http://xmlsoft.org/xslt/testplugin"