[xml/sgml-commit] r469 - in packages/libxslt/trunk: . debian doc
libexslt libxslt python python/tests tests tests/REC
tests/REC1 tests/REC2 tests/XSLTMark tests/docbook tests/docs
tests/documents tests/exslt tests/exslt/common
tests/exslt/date tests/exslt/functions tests/exslt/math
tests/exslt/sets tests/exslt/strings tests/extensions
tests/general tests/keys tests/multiple tests/namespaces
tests/numbers tests/plugins tests/reports tests/xinclude
tests/xmlspec win32 xsltproc
Mike Hommey
glandium at costa.debian.org
Mon Sep 5 17:45:55 UTC 2005
Author: glandium
Date: 2005-09-05 17:45:46 +0000 (Mon, 05 Sep 2005)
New Revision: 469
Added:
packages/libxslt/trunk/tests/docs/bug-163.xml
packages/libxslt/trunk/tests/exslt/dynamic/
packages/libxslt/trunk/tests/general/bug-163.out
packages/libxslt/trunk/tests/general/bug-163.xsl
Removed:
packages/libxslt/trunk/breakpoint/
Modified:
packages/libxslt/trunk/ChangeLog
packages/libxslt/trunk/Makefile.am
packages/libxslt/trunk/Makefile.in
packages/libxslt/trunk/NEWS
packages/libxslt/trunk/configure
packages/libxslt/trunk/configure.in
packages/libxslt/trunk/debian/changelog
packages/libxslt/trunk/debian/control
packages/libxslt/trunk/debian/rules
packages/libxslt/trunk/doc/Makefile.in
packages/libxslt/trunk/doc/libxslt.xsa
packages/libxslt/trunk/doc/news.html
packages/libxslt/trunk/doc/xslt.html
packages/libxslt/trunk/libexslt/Makefile.in
packages/libxslt/trunk/libexslt/dynamic.c
packages/libxslt/trunk/libexslt/exslt.c
packages/libxslt/trunk/libexslt/exsltconfig.h
packages/libxslt/trunk/libexslt/libexslt.3
packages/libxslt/trunk/libexslt/libexslt.h
packages/libxslt/trunk/libxslt.spec
packages/libxslt/trunk/libxslt.spec.in
packages/libxslt/trunk/libxslt/Makefile.in
packages/libxslt/trunk/libxslt/libxslt.h
packages/libxslt/trunk/libxslt/numbers.c
packages/libxslt/trunk/libxslt/pattern.c
packages/libxslt/trunk/libxslt/transform.c
packages/libxslt/trunk/libxslt/win32config.h
packages/libxslt/trunk/libxslt/xslt.c
packages/libxslt/trunk/libxslt/xsltconfig.h
packages/libxslt/trunk/libxslt/xsltutils.c
packages/libxslt/trunk/libxslt/xsltutils.h
packages/libxslt/trunk/libxslt/xsltwin32config.h
packages/libxslt/trunk/libxslt/xsltwin32config.h.in
packages/libxslt/trunk/python/Makefile.in
packages/libxslt/trunk/python/tests/Makefile.in
packages/libxslt/trunk/tests/Makefile.in
packages/libxslt/trunk/tests/REC/Makefile.in
packages/libxslt/trunk/tests/REC1/Makefile.in
packages/libxslt/trunk/tests/REC2/Makefile.in
packages/libxslt/trunk/tests/XSLTMark/Makefile.in
packages/libxslt/trunk/tests/docbook/Makefile.in
packages/libxslt/trunk/tests/docs/Makefile.am
packages/libxslt/trunk/tests/docs/Makefile.in
packages/libxslt/trunk/tests/documents/Makefile.in
packages/libxslt/trunk/tests/exslt/Makefile.am
packages/libxslt/trunk/tests/exslt/Makefile.in
packages/libxslt/trunk/tests/exslt/common/Makefile.in
packages/libxslt/trunk/tests/exslt/date/Makefile.in
packages/libxslt/trunk/tests/exslt/functions/Makefile.in
packages/libxslt/trunk/tests/exslt/math/Makefile.in
packages/libxslt/trunk/tests/exslt/sets/Makefile.in
packages/libxslt/trunk/tests/exslt/strings/Makefile.in
packages/libxslt/trunk/tests/extensions/Makefile.in
packages/libxslt/trunk/tests/general/Makefile.am
packages/libxslt/trunk/tests/general/Makefile.in
packages/libxslt/trunk/tests/general/bug-142.out
packages/libxslt/trunk/tests/general/bug-152.out
packages/libxslt/trunk/tests/general/bug-89.xsl
packages/libxslt/trunk/tests/keys/Makefile.in
packages/libxslt/trunk/tests/multiple/Makefile.in
packages/libxslt/trunk/tests/namespaces/Makefile.in
packages/libxslt/trunk/tests/namespaces/tst7.out
packages/libxslt/trunk/tests/numbers/Makefile.in
packages/libxslt/trunk/tests/plugins/Makefile.am
packages/libxslt/trunk/tests/plugins/Makefile.in
packages/libxslt/trunk/tests/reports/Makefile.in
packages/libxslt/trunk/tests/xinclude/Makefile.in
packages/libxslt/trunk/tests/xmlspec/Makefile.in
packages/libxslt/trunk/win32/.cvsignore
packages/libxslt/trunk/win32/Makefile.mingw
packages/libxslt/trunk/win32/Makefile.msvc
packages/libxslt/trunk/win32/configure.js
packages/libxslt/trunk/xsltproc/Makefile.in
packages/libxslt/trunk/xsltproc/xsltproc.c
Log:
New upstream release
Modified: packages/libxslt/trunk/ChangeLog
===================================================================
--- packages/libxslt/trunk/ChangeLog 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/ChangeLog 2005-09-05 17:45:46 UTC (rev 469)
@@ -1,3 +1,101 @@
+Mon Sep 5 00:44:24 CEST 2005 Daniel Veillard <daniel at veillard.com>
+
+ * configure.in NEWS doc/*: preparing release 1.1.15
+ * libxslt/pattern.c libxslt/xsltutils.c: a bit more cleanup
+
+Mon Sep 5 00:07:40 CEST 2005 Daniel Veillard <daniel at veillard.com>
+
+ * libxslt/pattern.c: fixed #303289 variable in match are forbidden
+ * tests/general/bug-89.xsl: had to fix that test which was doing this
+ * tests/general/bug-142.out tests/general/bug-152.out
+ tests/namespaces/tst7.out: small output change on libxml2-2.6.21
+ new way of serializing encoding meta in HTML
+
+Wed Aug 31 13:49:51 CEST 2005 Daniel Veillard <daniel at veillard.com>
+
+ * libxslt/transform.c: fixed #314936 a dictionnary issue on text
+ node merging, which probably fixed #311267 too.
+
+Thu Aug 25 13:29:20 CEST 2005 Daniel Veillard <daniel at veillard.com>
+
+ * libxslt/xslt.c: libxslt should deallocate directly text node content
+ use xmlSetNodeContent(..., NULL)
+
+Fri Aug 12 12:17:10 CEST 2005 Daniel Veillard <daniel at veillard.com>
+
+ * tests/general/bug-163.*, tests/general/Makefile.am,
+ tests/docs/bug-163.*, tests/docs/Makefile.am: check fix for
+ #310692
+
+Tue Aug 9 22:13:18 CEST 2005 Daniel Veillard <daniel at veillard.com>
+
+ * tests/plugins/Makefile.am: try to get rid of complaints from
+ jhbuild newbies.
+
+Sun Aug 7 16:04:47 CEST 2005 Daniel Veillard <daniel at veillard.com>
+
+ * libxslt/xsltutils.c: fixed a bug when size of xmlXPathContext
+ changes, uses the libxml2 alloc and dealloc functions instead.
+
+Tue Jul 13 22:41:03 PDT 2005 William Brack <wbrack at mmm.com.hk>
+
+ * libxslt/transform.c: added check in xsltCopyText to assure
+ content is in dictionary before doing a straight copy of
+ content (bug 302821)
+
+Tue Jul 13 16:16:31 PDT 2005 William Brack <wbrack at mmm.com.hk>
+
+ * libxslt/transform.c: fixed to set current default value for
+ XInclude when creating new TransformContext
+ * libxslt/xslt.c: minor change for per-mille
+
+Sun Jul 10 16:17:53 CEST 2005 Daniel Veillard <daniel at veillard.com>
+
+ * libxslt/xsltwin32config.h*: try to avoid generating conflicts
+ * libexslt/dynamic.c: applied patch from Mark Vakoc to implement
+ dyn:map
+ * configure.in tests/exslt/Makefile.am tests/exslt/dynamic/*:
+ added test for dyn:map to the regression suite
+
+Sat Jul 2 02:32:24 PDT 2005 <wbrack at mmm.com.hk>
+
+ * libxslt/numbers.c: further fixes for bug 309209, changing
+ behaviour of format-number.
+ * libxslt/xslt.c: changed definition of per-mille character from
+ '?' to Unicode #2030 (UTF-8 '‰') (ref XSLT spec 12.3)
+
+2005-06-30 Federico Mena Quintero <federico at ximian.com>
+
+ * libxslt/xsltwin32config.h: Added this file back. We'll have to
+ figure out a way to make jhbuild not get CVS conflicts with it.
+
+Thu Jun 30 14:09:55 PDT 2005 William Brack <wbrack at mmm.com.hk>
+
+ * libxslt/numbers.c: fixed bug in negative prefix (bug 309209)
+
+2005-06-17 Federico Mena Quintero <federico at ximian.com>
+
+ * libxslt/xsltwin32config.h: Removed from CVS; this is a generated
+ file anyway and it breaks jhbuild all the time.
+
+Sat May 7 11:28:41 CEST 2005 Daniel Veillard <daniel at veillard.com>
+
+ * libexslt/libexslt.3: applied patch from Jonathan Wakely to fix
+ the namespace name for the EXSLT date and time functions in the man
+ page.
+
+Wed Apr 6 23:58:12 CEST 2005 Igor Zlatkovic <igor at zlatkovic.com>
+
+ * libexslt/exslt.c libexslt/libexslt.h: Windows build cleanups,
+ removed obsolete checks
+ * libxslt/libxslt.h libxslt/win32config.h libxslt/xsltutils.h:
+ Windows build cleanups, removed obsolete checks
+ * win32/configure.js: removed obsolete copy operations
+ * win32/Makefile.*: make install cleanup
+ * xsltproc/xsltproc.c: Windows build cleanup, removed obsolete
+ macro definitions
+ * .cvsignore: added Eclipse project files
+
Sat Apr 2 13:34:11 CEST 2005 Daniel Veillard <daniel at veillard.com>
* configure.in NEWS doc/*: preparing release of 1.1.14, updated docs
Modified: packages/libxslt/trunk/Makefile.am
===================================================================
--- packages/libxslt/trunk/Makefile.am 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/Makefile.am 2005-09-05 17:45:46 UTC (rev 469)
@@ -1,24 +1,12 @@
-## don't bother compiling the breakpoint library unless it is needed
-if WITH_DEBUGGER
SUBDIRS = \
- libxslt \
- breakpoint \
- libexslt \
- xsltproc \
- doc \
- @PYTHON_SUBDIR@ \
- tests
-else
-SUBDIRS = \
libxslt \
libexslt \
xsltproc \
doc \
@PYTHON_SUBDIR@ \
tests
-endif
-DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests breakpoint
+DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests
confexecdir=$(libdir)
confexec_DATA = xsltConf.sh
Modified: packages/libxslt/trunk/Makefile.in
===================================================================
--- packages/libxslt/trunk/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -137,12 +137,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
@@ -247,24 +241,15 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
- at WITH_DEBUGGER_FALSE@SUBDIRS = \
- at WITH_DEBUGGER_FALSE@ libxslt \
- at WITH_DEBUGGER_FALSE@ libexslt \
- at WITH_DEBUGGER_FALSE@ xsltproc \
- at WITH_DEBUGGER_FALSE@ doc \
- at WITH_DEBUGGER_FALSE@ @PYTHON_SUBDIR@ \
- at WITH_DEBUGGER_FALSE@ tests
+SUBDIRS = \
+ libxslt \
+ libexslt \
+ xsltproc \
+ doc \
+ @PYTHON_SUBDIR@ \
+ tests
- at WITH_DEBUGGER_TRUE@SUBDIRS = \
- at WITH_DEBUGGER_TRUE@ libxslt \
- at WITH_DEBUGGER_TRUE@ breakpoint \
- at WITH_DEBUGGER_TRUE@ libexslt \
- at WITH_DEBUGGER_TRUE@ xsltproc \
- at WITH_DEBUGGER_TRUE@ doc \
- at WITH_DEBUGGER_TRUE@ @PYTHON_SUBDIR@ \
- at WITH_DEBUGGER_TRUE@ tests
-
-DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests breakpoint
+DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests
confexecdir = $(libdir)
confexec_DATA = xsltConf.sh
bin_SCRIPTS = xslt-config
Modified: packages/libxslt/trunk/NEWS
===================================================================
--- packages/libxslt/trunk/NEWS 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/NEWS 2005-09-05 17:45:46 UTC (rev 469)
@@ -10,6 +10,20 @@
to the CVS at
http://cvs.gnome.org/viewcvs/libxslt/
code base.Those are the public releases made:
+1.1.15: Sep 04 2005:
+ - build fixes: Windows build cleanups and updates (Igor Zlatkovic), remove
+ jhbuild warnings
+ - bug fixes: negative number formatting (William Brack), number formatting
+ per mille definition (William Brack), XInclude default values (William),
+ text copy bugs (William), bug related to xmlXPathContext size, reuse
+ libxml2 memory management for text nodes, dictionnary text bug, forbid
+ variables in match (needs libxml2-2.6.21)
+ - improvements: EXSLT dyn:map (Mark Vakoc),
+
+ - documentation: EXSLT date and time functions namespace in man (Jonathan
+ Wakely)
+
+
1.1.14: Apr 02 2005:
- bug fixes: text node on stylesheet document without a dictionary
(William Brack), more checking of XSLT syntax, calling xsltInit() multiple
Modified: packages/libxslt/trunk/configure
===================================================================
--- packages/libxslt/trunk/configure 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/configure 2005-09-05 17:45:46 UTC (rev 469)
@@ -463,7 +463,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os LIBXSLT_MAJOR_VERSION LIBXSLT_MINOR_VERSION LIBXSLT_MICRO_VERSION LIBXSLT_VERSION LIBXSLT_VERSION_INFO LIBXSLT_VERSION_NUMBER LIBXSLT_VERSION_EXTRA LIBXSLT_MAJOR_MINOR_VERSION LIBEXSLT_MAJOR_VERSION LIBEXSLT_MINOR_VERSION LIBEXSLT_MICRO_VERSION LIBEXSLT_VERSION LIBEXSLT_VERSION_INFO LIBEXSLT_VERSION_NUMBER LIBEXSLT_VERSION_EXTRA LIBXSLTBREAK_MAJOR_VERSION LIBXSLTBREAK_MINOR_VERSION LIBXSLTBREAK_MICRO_VERSION LIBXSLTBREAK_VERSION LIBXSLTBREAK_VERSION_INFO LIBXSLTBREAK_VERSION_NUMBER INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT HTML_DIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP RM MV TAR EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL WITH_TRIO PERL WITH_PERL_TRUE WITH_PERL_FALSE PYTHON WITH_PYTHON_TRUE WITH_PYTHON_FALSE pythondir PYTHON_SUBDIR LIBGCRYPT_CONFIG WITH_CRYPTO LIBGCRYPT_CFLAGS LIBGCRYPT_LIBS STATIC_BINARIES WITH_XSLT_DEBUG WITH_MEM_DEBUG WITH_DEBUGGER_TRUE WITH_DEBUGGER_FALSE WITH_DEBUGGER LIBXML_SRC LIBXML_REQUIRED_VERSION WITH_MODULES WITH_MODULES_TRUE WITH_MODULES_FALSE LIBXSLT_DEFAULT_PLUGINS_PATH WIN32_EXTRA_LIBADD WIN32_EXTRA_LDFLAGS XSLTPROCDV PYTHONSODV XML_CONFIG LIBXML_LIBS LIBXML_CFLAGS PYTHON_VERSION PYTHON_INCLUDES PYTHON_SITE_PACKAGES XSLT_LIBDIR XSLT_INCLUDEDIR XSLT_LIBS EXSLT_LIBDIR EXSLT_INCLUDEDIR EXSLT_LIBS EXTRA_LIBS M_LIBS RELDATE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os LIBXSLT_MAJOR_VERSION LIBXSLT_MINOR_VERSION LIBXSLT_MICRO_VERSION LIBXSLT_VERSION LIBXSLT_VERSION_INFO LIBXSLT_VERSION_NUMBER LIBXSLT_VERSION_EXTRA LIBXSLT_MAJOR_MINOR_VERSION LIBEXSLT_MAJOR_VERSION LIBEXSLT_MINOR_VERSION LIBEXSLT_MICRO_VERSION LIBEXSLT_VERSION LIBEXSLT_VERSION_INFO LIBEXSLT_VERSION_NUMBER LIBEXSLT_VERSION_EXTRA INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT HTML_DIR CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP RM MV TAR EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL WITH_TRIO PERL WITH_PERL_TRUE WITH_PERL_FALSE PYTHON WITH_PYTHON_TRUE WITH_PYTHON_FALSE pythondir PYTHON_SUBDIR LIBGCRYPT_CONFIG WITH_CRYPTO LIBGCRYPT_CFLAGS LIBGCRYPT_LIBS STATIC_BINARIES WITH_XSLT_DEBUG WITH_MEM_DEBUG WITH_DEBUGGER_TRUE WITH_DEBUGGER_FALSE WITH_DEBUGGER LIBXML_SRC LIBXML_REQUIRED_VERSION WITH_MODULES WITH_MODULES_TRUE WITH_MODULES_FALSE LIBXSLT_DEFAULT_PLUGINS_PATH WIN32_EXTRA_LIBADD WIN32_EXTRA_LDFLAGS XSLTPROCDV PYTHONSODV XML_CONFIG LIBXML_LIBS LIBXML_CFLAGS PYTHON_VERSION PYTHON_INCLUDES PYTHON_SITE_PACKAGES XSLT_LIBDIR XSLT_INCLUDEDIR XSLT_LIBS EXSLT_LIBDIR EXSLT_INCLUDEDIR EXSLT_LIBS EXTRA_LIBS M_LIBS RELDATE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1591,7 +1591,7 @@
LIBXSLT_MAJOR_VERSION=1
LIBXSLT_MINOR_VERSION=1
-LIBXSLT_MICRO_VERSION=14
+LIBXSLT_MICRO_VERSION=15
PACKAGE=libxslt
LIBEXSLT_MAJOR_VERSION=0
LIBEXSLT_MINOR_VERSION=8
@@ -1641,23 +1641,6 @@
-
-LIBXSLTBREAK_MAJOR_VERSION=1
-LIBXSLTBREAK_MINOR_VERSION=0
-LIBXSLTBREAK_MICRO_VERSION=8
-
-LIBXSLTBREAK_VERSION=$LIBXSLTBREAK_MAJOR_VERSION.$LIBXSLTBREAK_MINOR_VERSION.$LIBXSLTBREAK_MICRO_VERSION
-LIBXSLTBREAK_VERSION_INFO=`expr $LIBXSLTBREAK_MAJOR_VERSION + $LIBXSLTBREAK_MINOR_VERSION`:$LIBXSLTBREAK_MICRO_VERSION:$LIBXSLTBREAK_MINOR_VERSION
-
-LIBXSLTBREAK_VERSION_NUMBER=`expr $LIBXSLTBREAK_MAJOR_VERSION \* 10000 + $LIBXSLTBREAK_MINOR_VERSION \* 100 + $LIBXSLTBREAK_MICRO_VERSION`
-
-
-
-
-
-
-
-
VERSION=${LIBXSLT_VERSION}
am__api_version="1.8"
@@ -5301,7 +5284,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5304 "configure"' > conftest.$ac_ext
+ echo '#line 5287 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6465,7 +6448,7 @@
# Provide some information about the compiler.
-echo "$as_me:6468:" \
+echo "$as_me:6451:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -7497,11 +7480,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7500: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7483: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7504: \$? = $ac_status" >&5
+ echo "$as_me:7487: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -7730,11 +7713,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7733: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7716: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7737: \$? = $ac_status" >&5
+ echo "$as_me:7720: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -7790,11 +7773,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7793: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7776: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7797: \$? = $ac_status" >&5
+ echo "$as_me:7780: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9978,7 +9961,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9981 "configure"
+#line 9964 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10076,7 +10059,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10079 "configure"
+#line 10062 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12253,11 +12236,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12256: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12239: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12260: \$? = $ac_status" >&5
+ echo "$as_me:12243: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -12313,11 +12296,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12316: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12299: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12320: \$? = $ac_status" >&5
+ echo "$as_me:12303: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13682,7 +13665,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 13685 "configure"
+#line 13668 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13780,7 +13763,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 13783 "configure"
+#line 13766 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14607,11 +14590,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14610: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14593: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14614: \$? = $ac_status" >&5
+ echo "$as_me:14597: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -14667,11 +14650,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14670: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14653: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14674: \$? = $ac_status" >&5
+ echo "$as_me:14657: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16712,11 +16695,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16715: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16698: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16719: \$? = $ac_status" >&5
+ echo "$as_me:16702: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -16945,11 +16928,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16948: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16931: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16952: \$? = $ac_status" >&5
+ echo "$as_me:16935: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -17005,11 +16988,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17008: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16991: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17012: \$? = $ac_status" >&5
+ echo "$as_me:16995: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -19193,7 +19176,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 19196 "configure"
+#line 19179 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19291,7 +19274,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 19294 "configure"
+#line 19277 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -22609,7 +22592,7 @@
#ln -s Copyright COPYING
- ac_config_files="$ac_config_files Makefile libxslt.pc libexslt.pc libxslt/Makefile libxslt/xsltconfig.h libxslt/xsltwin32config.h breakpoint/Makefile libexslt/Makefile libexslt/exsltconfig.h xsltproc/Makefile python/Makefile python/tests/Makefile tests/Makefile tests/docs/Makefile tests/REC1/Makefile tests/REC2/Makefile tests/REC/Makefile tests/general/Makefile tests/reports/Makefile tests/extensions/Makefile tests/namespaces/Makefile tests/keys/Makefile tests/numbers/Makefile tests/documents/Makefile tests/xmlspec/Makefile tests/multiple/Makefile tests/xinclude/Makefile tests/XSLTMark/Makefile tests/docbook/Makefile tests/exslt/Makefile tests/exslt/common/Makefile tests/exslt/functions/Makefile tests/exslt/math/Makefile tests/exslt/sets/Makefile tests/exslt/strings/Makefile tests/exslt/date/Makefile tests/plugins/Makefile doc/Makefile xslt-config libxslt.spec"
+ ac_config_files="$ac_config_files Makefile libxslt.pc libexslt.pc libxslt/Makefile libxslt/xsltconfig.h libxslt/xsltwin32config.h libexslt/Makefile libexslt/exsltconfig.h xsltproc/Makefile python/Makefile python/tests/Makefile tests/Makefile tests/docs/Makefile tests/REC1/Makefile tests/REC2/Makefile tests/REC/Makefile tests/general/Makefile tests/reports/Makefile tests/extensions/Makefile tests/namespaces/Makefile tests/keys/Makefile tests/numbers/Makefile tests/documents/Makefile tests/xmlspec/Makefile tests/multiple/Makefile tests/xinclude/Makefile tests/XSLTMark/Makefile tests/docbook/Makefile tests/exslt/Makefile tests/exslt/common/Makefile tests/exslt/functions/Makefile tests/exslt/math/Makefile tests/exslt/sets/Makefile tests/exslt/strings/Makefile tests/exslt/date/Makefile tests/exslt/dynamic/Makefile tests/plugins/Makefile doc/Makefile xslt-config libxslt.spec"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -23214,7 +23197,6 @@
"libxslt/Makefile" ) CONFIG_FILES="$CONFIG_FILES libxslt/Makefile" ;;
"libxslt/xsltconfig.h" ) CONFIG_FILES="$CONFIG_FILES libxslt/xsltconfig.h" ;;
"libxslt/xsltwin32config.h" ) CONFIG_FILES="$CONFIG_FILES libxslt/xsltwin32config.h" ;;
- "breakpoint/Makefile" ) CONFIG_FILES="$CONFIG_FILES breakpoint/Makefile" ;;
"libexslt/Makefile" ) CONFIG_FILES="$CONFIG_FILES libexslt/Makefile" ;;
"libexslt/exsltconfig.h" ) CONFIG_FILES="$CONFIG_FILES libexslt/exsltconfig.h" ;;
"xsltproc/Makefile" ) CONFIG_FILES="$CONFIG_FILES xsltproc/Makefile" ;;
@@ -23244,6 +23226,7 @@
"tests/exslt/sets/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/exslt/sets/Makefile" ;;
"tests/exslt/strings/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/exslt/strings/Makefile" ;;
"tests/exslt/date/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/exslt/date/Makefile" ;;
+ "tests/exslt/dynamic/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/exslt/dynamic/Makefile" ;;
"tests/plugins/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/plugins/Makefile" ;;
"doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"xslt-config" ) CONFIG_FILES="$CONFIG_FILES xslt-config" ;;
@@ -23358,12 +23341,6 @@
s, at LIBEXSLT_VERSION_INFO@,$LIBEXSLT_VERSION_INFO,;t t
s, at LIBEXSLT_VERSION_NUMBER@,$LIBEXSLT_VERSION_NUMBER,;t t
s, at LIBEXSLT_VERSION_EXTRA@,$LIBEXSLT_VERSION_EXTRA,;t t
-s, at LIBXSLTBREAK_MAJOR_VERSION@,$LIBXSLTBREAK_MAJOR_VERSION,;t t
-s, at LIBXSLTBREAK_MINOR_VERSION@,$LIBXSLTBREAK_MINOR_VERSION,;t t
-s, at LIBXSLTBREAK_MICRO_VERSION@,$LIBXSLTBREAK_MICRO_VERSION,;t t
-s, at LIBXSLTBREAK_VERSION@,$LIBXSLTBREAK_VERSION,;t t
-s, at LIBXSLTBREAK_VERSION_INFO@,$LIBXSLTBREAK_VERSION_INFO,;t t
-s, at LIBXSLTBREAK_VERSION_NUMBER@,$LIBXSLTBREAK_VERSION_NUMBER,;t t
s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
s, at INSTALL_DATA@,$INSTALL_DATA,;t t
Modified: packages/libxslt/trunk/configure.in
===================================================================
--- packages/libxslt/trunk/configure.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/configure.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -10,7 +10,7 @@
dnl
LIBXSLT_MAJOR_VERSION=1
LIBXSLT_MINOR_VERSION=1
-LIBXSLT_MICRO_VERSION=14
+LIBXSLT_MICRO_VERSION=15
PACKAGE=libxslt
LIBEXSLT_MAJOR_VERSION=0
LIBEXSLT_MINOR_VERSION=8
@@ -63,28 +63,6 @@
AC_SUBST(LIBEXSLT_VERSION_NUMBER)
AC_SUBST(LIBEXSLT_VERSION_EXTRA)
-dnl
-dnl libxsltbreakpoint is a compatibility obsoleted library
-dnl it's blocked at 1.0.8 and should be removed in default build in the
-dnl future
-dnl
-
-LIBXSLTBREAK_MAJOR_VERSION=1
-LIBXSLTBREAK_MINOR_VERSION=0
-LIBXSLTBREAK_MICRO_VERSION=8
-
-LIBXSLTBREAK_VERSION=$LIBXSLTBREAK_MAJOR_VERSION.$LIBXSLTBREAK_MINOR_VERSION.$LIBXSLTBREAK_MICRO_VERSION
-LIBXSLTBREAK_VERSION_INFO=`expr $LIBXSLTBREAK_MAJOR_VERSION + $LIBXSLTBREAK_MINOR_VERSION`:$LIBXSLTBREAK_MICRO_VERSION:$LIBXSLTBREAK_MINOR_VERSION
-
-LIBXSLTBREAK_VERSION_NUMBER=`expr $LIBXSLTBREAK_MAJOR_VERSION \* 10000 + $LIBXSLTBREAK_MINOR_VERSION \* 100 + $LIBXSLTBREAK_MICRO_VERSION`
-
-AC_SUBST(LIBXSLTBREAK_MAJOR_VERSION)
-AC_SUBST(LIBXSLTBREAK_MINOR_VERSION)
-AC_SUBST(LIBXSLTBREAK_MICRO_VERSION)
-AC_SUBST(LIBXSLTBREAK_VERSION)
-AC_SUBST(LIBXSLTBREAK_VERSION_INFO)
-AC_SUBST(LIBXSLTBREAK_VERSION_NUMBER)
-
VERSION=${LIBXSLT_VERSION}
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
@@ -575,7 +553,6 @@
libxslt/Makefile
libxslt/xsltconfig.h
libxslt/xsltwin32config.h
-breakpoint/Makefile
libexslt/Makefile
libexslt/exsltconfig.h
xsltproc/Makefile
@@ -605,6 +582,7 @@
tests/exslt/sets/Makefile
tests/exslt/strings/Makefile
tests/exslt/date/Makefile
+tests/exslt/dynamic/Makefile
tests/plugins/Makefile
doc/Makefile
xslt-config
Modified: packages/libxslt/trunk/debian/changelog
===================================================================
--- packages/libxslt/trunk/debian/changelog 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/debian/changelog 2005-09-05 17:45:46 UTC (rev 469)
@@ -1,8 +1,12 @@
-libxslt (1.1.14-2) unstable; urgency=low
+libxslt (1.1.15-1) UNRELEASED; urgency=low
+ * (NOT RELEASED YET) New upstream release
* debian/control: Removed dummy package. Closes: #322053.
+ * configure.in, Makefile.am, debian/control, debian/rules: Removed support
+ for deprecated libxsltbreakpoint.
+ * breakpoint/, debian/libxslt1.install: Removed.
- -- Mike Hommey <glandium at debian.org> Tue, 9 Aug 2005 20:49:32 +0200
+ -- Mike Hommey <glandium at debian.org> Mon, 5 Sep 2005 19:44:54 +0200
libxslt (1.1.14-1) unstable; urgency=low
Modified: packages/libxslt/trunk/debian/control
===================================================================
--- packages/libxslt/trunk/debian/control 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/debian/control 2005-09-05 17:45:46 UTC (rev 469)
@@ -36,20 +36,6 @@
This package contains libxslt library used by applications for XSLT
transformations.
-Package: libxslt1
-Section: libs
-Priority: optional
-Architecture: any
-Depends: ${shlibs:Depends}, libxslt1.1 (= ${Source-Version})
-Description: XSLT processing library - runtime library
- XSLT is an XML language for defining transformations of XML files from
- XML to some other arbitrary format, such as XML, HTML, plain text, etc.
- using standard XSLT stylesheets. libxslt is a C library which
- implements XSLT.
- .
- This package contains the deprecated libxsltbreakpoint library, and
- exists only to transition to the new libxslt1.1 package.
-
Package: xsltproc
Section: text
Priority: optional
Modified: packages/libxslt/trunk/debian/rules
===================================================================
--- packages/libxslt/trunk/debian/rules 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/debian/rules 2005-09-05 17:45:46 UTC (rev 469)
@@ -166,8 +166,7 @@
dh_fixperms -a
dh_makeshlibs -a -V
dh_installdeb -a
- dh_shlibdeps -L libxslt1.1 -l $(PWD)/debian/libxslt1.1/usr/lib
- dh_shlibdeps -L libxslt1 -l $(PWD)/debian/libxslt1/usr/lib
+ dh_shlibdeps -a
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a
Modified: packages/libxslt/trunk/doc/Makefile.in
===================================================================
--- packages/libxslt/trunk/doc/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/doc/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -106,12 +106,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Modified: packages/libxslt/trunk/doc/libxslt.xsa
===================================================================
--- packages/libxslt/trunk/doc/libxslt.xsa 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/doc/libxslt.xsa 2005-09-05 17:45:46 UTC (rev 469)
@@ -8,25 +8,17 @@
</vendor>
<product id="libxslt">
<name>libxslt</name>
- <version>1.1.13</version>
- <last-release> Mar 13 2005</last-release>
+ <version>1.1.14</version>
+ <last-release> Apr 02 2005</last-release>
<info-url>http://xmlsoft.org/XSLT/</info-url>
- <changes> - build fixes: 64bits cleanup (William Brack), python 2.4 test (William),
- LIBXSLT_VERSION_EXTRA on Windows (William), Windows makefiles fixes
- (Joel Reed), libgcrypt-devel requires for RPM spec.
-
- - bug fixes: exslt day-of-week-in-month (Sal Paradise), xsl:call-template
- should not change the current template rule (William Brack), evaluation
- of global variables (William Brack), RVT's in XPath predicates (William),
- namespace URI on template names (Mark Vakoc), stat() for Windows patch
- (Aleksey Gurtovoy), pattern expression fixes (William Brack), out of
- memory detection misses (William), parserOptions propagation (William),
- exclude-result-prefixes fix (William), // patten fix (William).
-
- - extensions: module support (Joel Reed), dictionnary based speedups
- trying to get rid of xmlStrEqual as much as possible.
-
- - documentation: added Wiki (Joel Reed)
+ <changes> - bug fixes: text node on stylesheet document without a dictionary
+ (William Brack), more checking of XSLT syntax, calling xsltInit() multiple
+ times, mode values interning raised by Mark Vakoc, bug in pattern
+ matching with ancestors, bug in patterna matching with cascading select,
+ xinclude and document() problem, build outside of source tree (Mike
+ Castle)
+ - improvement: added a --nodict mode to xsltproc to check problems for
+ docuemtns without dictionnaries
</changes>
Modified: packages/libxslt/trunk/doc/news.html
===================================================================
--- packages/libxslt/trunk/doc/news.html 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/doc/news.html 2005-09-05 17:45:46 UTC (rev 469)
@@ -9,7 +9,17 @@
A:link, A:visited, A:active { text-decoration: underline }
</style><title>News</title></head><body bgcolor="#8b7765" text="#000000" link="#a06060" vlink="#000000"><table border="0" width="100%" cellpadding="5" cellspacing="0" align="center"><tr><td width="120"><a href="http://swpat.ffii.org/"><img src="epatents.png" alt="Action against software patents" /></a></td><td width="180"><a href="http://www.gnome.org/"><img src="gnome2.png" alt="Gnome2 Logo" /></a><a href="http://www.w3.org/Status"><img src="w3c.png" alt="W3C logo" /></a><a href="http://www.redhat.com"><img src="redhat.gif" alt="Red Hat Logo" /></a><div align="left"><a href="http://xmlsoft.org/XSLT/"><img src="Libxslt-Logo-180x168.gif" alt="Made with Libxslt Logo" /></a></div></td><td><table border="0" width="90%" cellpadding="2" cellspacing="0" align="center" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3" bgcolor="#fffacd"><tr><td align="center"><h1>The XSLT C library for Gnome</h1><h2>News</h2></td></tr></table></td></tr></table></td></tr></table><table border="0" cellpadding="4" cellspacing="0" width="100%" align="center"><tr><td bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="2" width="100%"><tr><td valign="top" width="200" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Main Menu</b></center></td></tr><tr><td bgcolor="#fffacd"><form action="search.php" enctype="application/x-www-form-urlencoded" method="get"><input name="query" type="text" size="20" value="" /><input name="submit" type="submit" value="Search ..." /></form><ul><li><a href="index.html">Home</a></li><li><a href="http://xmlsoft.org/wiki">Wiki</a></li><li><a href="intro.html">Introduction</a></li><li><a href="docs.html">Documentation</a></li><li><a href="bugs.html">Reporting bugs and getting help</a></li><li><a href="help.html">How to help</a></li><li><a href="downloads.html">Downloads</a></li><li><a href="FAQ.html">FAQ</a></li><li><a href="news.html">News</a></li><li><a href="xsltproc2.html">The xsltproc tool</a></li><li><a href="docbook.html">DocBook</a></li><li><a href="API.html">The programming API</a></li><li><a href="python.html">Python and bindings</a></li><li><a href="internals.html">Library internals</a></li><li><a href="extensions.html">Writing extensions</a></li><li><a href="contribs.html">Contributions</a></li><li><a href="EXSLT/index.html" style="font-weight:bold">libexslt</a></li><li><a href="xslt.html">flat page</a>, <a href="site.xsl">stylesheet</a></li><li><a href="html/index.html" style="font-weight:bold">API Menu</a></li><li><a href="ChangeLog.html">ChangeLog</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>Related links</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="tutorial/libxslttutorial.html">Tutorial</a>,
<a href="tutorial2/libxslt_pipes.html">Tutorial2</a></li><li><a href="xsltproc.html">Man page for xsltproc</a></li><li><a href="http://mail.gnome.org/archives/xslt/">Mail archive</a></li><li><a href="http://xmlsoft.org/">XML libxml2</a></li><li><a href="ftp://xmlsoft.org/">FTP</a></li><li><a href="http://www.zlatkovic.com/projects/libxml/">Windows binaries</a></li><li><a href="http://garypennington.net/libxml2/">Solaris binaries</a></li><li><a href="http://www.zveno.com/open_source/libxml2xslt.html">MacOsX binaries</a></li><li><a href="http://bugzilla.gnome.org/buglist.cgi?product=libxslt">Bug Tracker</a></li><li><a href="http://www.zend.com/php5/articles/php5-xmlphp.php#Heading17">XSLT with PHP</a></li><li><a href="http://www.mod-xslt2.com/">Apache module</a></li><li><a href="http://sourceforge.net/projects/libxml2-pas/">Pascal bindings</a></li><li><a href="http://xsldbg.sourceforge.net/">Xsldbg Debugger</a></li></ul></td></tr></table><table width="100%" border="0" cellspacing="1" cellpadding="3"><tr><td colspan="1" bgcolor="#eecfa1" align="center"><center><b>API Indexes</b></center></td></tr><tr><td bgcolor="#fffacd"><ul><li><a href="APIchunk0.html">Alphabetic</a></li><li><a href="APIconstructors.html">Constructors</a></li><li><a href="APIfunctions.html">Functions/Types</a></li><li><a href="APIfiles.html">Modules</a></li><li><a href="APIsymbols.html">Symbols</a></li></ul></td></tr></table></td></tr></table></td><td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd"><p>The <a href="ChangeLog.html">change log</a> describes the recents commits
-to the <a href="http://cvs.gnome.org/viewcvs/libxslt/">CVS</a> code base.</p><p>Those are the public releases made:</p><h3>1.1.14: Apr 02 2005</h3><ul><li>bug fixes: text node on stylesheet document without a dictionary
+to the <a href="http://cvs.gnome.org/viewcvs/libxslt/">CVS</a> code base.</p><p>Those are the public releases made:</p><h3>1.1.15: Sep 04 2005</h3><ul><li>build fixes: Windows build cleanups and updates (Igor Zlatkovic), remove
+ jhbuild warnings</li>
+ <li>bug fixes: negative number formatting (William Brack), number formatting
+ per mille definition (William Brack), XInclude default values (William),
+ text copy bugs (William), bug related to xmlXPathContext size, reuse
+ libxml2 memory management for text nodes, dictionnary text bug, forbid
+ variables in match (needs libxml2-2.6.21)</li>
+ <li>improvements: EXSLT dyn:map (Mark Vakoc),
+ </li><li>documentation: EXSLT date and time functions namespace in man (Jonathan
+ Wakely)</li>
+</ul><h3>1.1.14: Apr 02 2005</h3><ul><li>bug fixes: text node on stylesheet document without a dictionary
(William Brack), more checking of XSLT syntax, calling xsltInit() multiple
times, mode values interning raised by Mark Vakoc, bug in pattern
matching with ancestors, bug in patterna matching with cascading select,
Modified: packages/libxslt/trunk/doc/xslt.html
===================================================================
--- packages/libxslt/trunk/doc/xslt.html 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/doc/xslt.html 2005-09-05 17:45:46 UTC (rev 469)
@@ -297,6 +297,19 @@
<p>Those are the public releases made:</p>
+<h3>1.1.15: Sep 04 2005</h3>
+<ul>
+ <li>build fixes: Windows build cleanups and updates (Igor Zlatkovic), remove
+ jhbuild warnings</li>
+ <li>bug fixes: negative number formatting (William Brack), number formatting
+ per mille definition (William Brack), XInclude default values (William),
+ text copy bugs (William), bug related to xmlXPathContext size, reuse
+ libxml2 memory management for text nodes, dictionnary text bug, forbid
+ variables in match (needs libxml2-2.6.21)</li>
+ <li>improvements: EXSLT dyn:map (Mark Vakoc),
+ <li>documentation: EXSLT date and time functions namespace in man (Jonathan
+ Wakely)</li>
+</ul>
<h3>1.1.14: Apr 02 2005</h3>
<ul>
<li>bug fixes: text node on stylesheet document without a dictionary
Modified: packages/libxslt/trunk/libexslt/Makefile.in
===================================================================
--- packages/libxslt/trunk/libexslt/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/libexslt/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -139,12 +139,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Modified: packages/libxslt/trunk/libexslt/dynamic.c
===================================================================
--- packages/libxslt/trunk/libexslt/dynamic.c 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/libexslt/dynamic.c 2005-09-05 17:45:46 UTC (rev 469)
@@ -84,6 +84,179 @@
}
/**
+ * exsltDynMapFunction:
+ * @ctxt: an XPath parser context
+ * @nargs: the number of arguments
+ *
+ * Evaluates the string as an XPath expression and returns the result
+ * value, which may be a boolean, number, string, node set, result tree
+ * fragment or external object.
+ */
+
+static void
+exsltDynMapFunction(xmlXPathParserContextPtr ctxt, int nargs)
+{
+ xmlChar *str = NULL;
+ xmlNodeSetPtr nodeset = NULL;
+ xmlXPathCompExprPtr comp = NULL;
+ xmlXPathObjectPtr ret = NULL;
+ xmlDocPtr oldDoc, container;
+ xmlNodePtr oldNode;
+ int oldContextSize;
+ int oldProximityPosition;
+ int i, j;
+
+
+ if (nargs != 2) {
+ xmlXPathSetArityError(ctxt);
+ return;
+ }
+ str = xmlXPathPopString(ctxt);
+ if (xmlXPathCheckError(ctxt)) {
+ xmlXPathSetTypeError(ctxt);
+ return;
+ }
+
+ nodeset = xmlXPathPopNodeSet(ctxt);
+ if (xmlXPathCheckError(ctxt)) {
+ xmlXPathSetTypeError(ctxt);
+ return;
+ }
+ if (str == NULL || !xmlStrlen(str) || !(comp = xmlXPathCompile(str))) {
+ if (nodeset != NULL)
+ xmlXPathFreeNodeSet(nodeset);
+ if (str != NULL)
+ xmlFree(str);
+ valuePush(ctxt, xmlXPathNewNodeSet(NULL));
+ return;
+ }
+
+ ret = xmlXPathNewNodeSet(NULL);
+ if (ret == NULL) {
+ xsltGenericError(xsltGenericErrorContext,
+ "exsltDynMapFunctoin: ret == NULL\n");
+ goto cleanup;
+ }
+
+ oldDoc = ctxt->context->doc;
+ oldNode = ctxt->context->node;
+ oldContextSize = ctxt->context->contextSize;
+ oldProximityPosition = ctxt->context->proximityPosition;
+
+ /**
+ * since we really don't know we're going to be adding node(s)
+ * down the road we create the RVT regardless
+ */
+ container = xsltCreateRVT(xsltXPathGetTransformContext(ctxt));
+ if (container != NULL)
+ xsltRegisterTmpRVT(xsltXPathGetTransformContext(ctxt), container);
+
+ if (nodeset && nodeset->nodeNr > 0) {
+ xmlXPathNodeSetSort(nodeset);
+ ctxt->context->contextSize = nodeset->nodeNr;
+ ctxt->context->proximityPosition = 0;
+ for (i = 0; i < nodeset->nodeNr; i++) {
+ xmlXPathObjectPtr subResult = NULL;
+
+ ctxt->context->proximityPosition++;
+ ctxt->context->node = nodeset->nodeTab[i];
+ ctxt->context->doc = nodeset->nodeTab[i]->doc;
+
+ subResult = xmlXPathCompiledEval(comp, ctxt->context);
+ if (subResult != NULL) {
+ switch (subResult->type) {
+ case XPATH_NODESET:
+ if (subResult->nodesetval != NULL)
+ for (j = 0; j < subResult->nodesetval->nodeNr;
+ j++)
+ xmlXPathNodeSetAdd(ret->nodesetval,
+ subResult->nodesetval->
+ nodeTab[j]);
+ break;
+ case XPATH_BOOLEAN:
+ if (container != NULL) {
+ xmlNodePtr cur =
+ xmlNewChild((xmlNodePtr) container, NULL,
+ BAD_CAST "boolean",
+ BAD_CAST (subResult->
+ boolval ? "true" : ""));
+ if (cur != NULL) {
+ cur->ns =
+ xmlNewNs(cur,
+ BAD_CAST
+ "http://exslt.org/common",
+ BAD_CAST "exsl");
+ xmlXPathNodeSetAddUnique(ret->nodesetval,
+ cur);
+ }
+ }
+ break;
+ case XPATH_NUMBER:
+ if (container != NULL) {
+ xmlChar *val =
+ xmlXPathCastNumberToString(subResult->
+ floatval);
+ xmlNodePtr cur =
+ xmlNewChild((xmlNodePtr) container, NULL,
+ BAD_CAST "number", val);
+ if (val != NULL)
+ xmlFree(val);
+
+ if (cur != NULL) {
+ cur->ns =
+ xmlNewNs(cur,
+ BAD_CAST
+ "http://exslt.org/common",
+ BAD_CAST "exsl");
+ xmlXPathNodeSetAddUnique(ret->nodesetval,
+ cur);
+ }
+ }
+ break;
+ case XPATH_STRING:
+ if (container != NULL) {
+ xmlNodePtr cur =
+ xmlNewChild((xmlNodePtr) container, NULL,
+ BAD_CAST "string",
+ subResult->stringval);
+ if (cur != NULL) {
+ cur->ns =
+ xmlNewNs(cur,
+ BAD_CAST
+ "http://exslt.org/common",
+ BAD_CAST "exsl");
+ xmlXPathNodeSetAddUnique(ret->nodesetval,
+ cur);
+ }
+ }
+ break;
+ default:
+ break;
+ }
+ xmlXPathFreeObject(subResult);
+ }
+ }
+ }
+ ctxt->context->doc = oldDoc;
+ ctxt->context->node = oldNode;
+ ctxt->context->contextSize = oldContextSize;
+ ctxt->context->proximityPosition = oldProximityPosition;
+
+
+ cleanup:
+ /* restore the xpath context */
+ if (comp != NULL)
+ xmlXPathFreeCompExpr(comp);
+ if (nodeset != NULL)
+ xmlXPathFreeNodeSet(nodeset);
+ if (str != NULL)
+ xmlFree(str);
+ valuePush(ctxt, ret);
+ return;
+}
+
+
+/**
* exsltDynRegister:
*
* Registers the EXSLT - Dynamic module
@@ -94,4 +267,8 @@
xsltRegisterExtModuleFunction ((const xmlChar *) "evaluate",
EXSLT_DYNAMIC_NAMESPACE,
exsltDynEvaluateFunction);
+ xsltRegisterExtModuleFunction ((const xmlChar *) "map",
+ EXSLT_DYNAMIC_NAMESPACE,
+ exsltDynMapFunction);
+
}
Modified: packages/libxslt/trunk/libexslt/exslt.c
===================================================================
--- packages/libxslt/trunk/libexslt/exslt.c 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/libexslt/exslt.c 2005-09-05 17:45:46 UTC (rev 469)
@@ -3,17 +3,9 @@
#include <libxml/xmlversion.h>
-#if defined(WIN32) && !defined (__CYGWIN__) && (!__MINGW32__)
-#include <win32config.h>
-#else
#include "config.h"
-#endif
-#if defined(WIN32) && defined(_MSC_VER)
-#include <libxslt/xsltwin32config.h>
-#else
#include <libxslt/xsltconfig.h>
-#endif
#include <libxslt/extensions.h>
#include "exsltconfig.h"
Modified: packages/libxslt/trunk/libexslt/exsltconfig.h
===================================================================
--- packages/libxslt/trunk/libexslt/exsltconfig.h 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/libexslt/exsltconfig.h 2005-09-05 17:45:46 UTC (rev 469)
@@ -18,7 +18,7 @@
*
* the version string like "1.2.3"
*/
-#define LIBEXSLT_DOTTED_VERSION "1.1.14"
+#define LIBEXSLT_DOTTED_VERSION "1.1.15"
/**
* LIBEXSLT_VERSION:
@@ -39,7 +39,7 @@
*
* extra version information, used to show a CVS compilation
*/
-#define LIBEXSLT_VERSION_EXTRA "-CVS1011"
+#define LIBEXSLT_VERSION_EXTRA "-CVS1027"
/**
* WITH_CRYPTO:
Modified: packages/libxslt/trunk/libexslt/libexslt.3
===================================================================
--- packages/libxslt/trunk/libexslt/libexslt.3 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/libexslt/libexslt.3 2005-09-05 17:45:46 UTC (rev 469)
@@ -145,7 +145,7 @@
.SS "DATES and TIMES"
.TP 2.2i
-Namespace: http://exslt.org/date-and-times
+Namespace: http://exslt.org/dates-and-times
.TP 2.2i
See http://www.exslt.org/date/date.html for a description.
.TP 2.2i
Modified: packages/libxslt/trunk/libexslt/libexslt.h
===================================================================
--- packages/libxslt/trunk/libexslt/libexslt.h 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/libexslt/libexslt.h 2005-09-05 17:45:46 UTC (rev 469)
@@ -15,12 +15,8 @@
#include "config.h"
#endif
-#if defined(WIN32) && !defined(__CYGWIN__) && !defined (__MINGW32__)
-#include "xsltwin32config.h"
-#else
#include "xsltconfig.h"
#include <libxml/xmlversion.h>
-#endif
#if !defined LIBEXSLT_PUBLIC
#if (defined (__CYGWIN__) || defined _MSC_VER) && !defined IN_LIBEXSLT && !defined LIBEXSLT_STATIC
Modified: packages/libxslt/trunk/libxslt/Makefile.in
===================================================================
--- packages/libxslt/trunk/libxslt/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/libxslt/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -147,12 +147,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Modified: packages/libxslt/trunk/libxslt/libxslt.h
===================================================================
--- packages/libxslt/trunk/libxslt/libxslt.h 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/libxslt/libxslt.h 2005-09-05 17:45:46 UTC (rev 469)
@@ -16,12 +16,8 @@
#include "config.h"
#endif
-#if defined(WIN32) && !defined(__CYGWIN__) && !defined (__MINGW32__)
-#include "xsltwin32config.h"
-#else
#include "xsltconfig.h"
#include <libxml/xmlversion.h>
-#endif
#if !defined LIBXSLT_PUBLIC
#if (defined (__CYGWIN__) || defined _MSC_VER) && !defined IN_LIBXSLT && !defined LIBXSLT_STATIC
Modified: packages/libxslt/trunk/libxslt/numbers.c
===================================================================
--- packages/libxslt/trunk/libxslt/numbers.c 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/libxslt/numbers.c 2005-09-05 17:45:46 UTC (rev 469)
@@ -865,11 +865,6 @@
if (**format == SYMBOL_QUOTE) {
if (*++(*format) == 0)
return -1;
- if ((len=xsltUTF8Size(*format))<=0)
- return -1;
- *format += len;
- if (**format != SYMBOL_QUOTE)
- return -1;
}
else if (IS_SPECIAL(self, *format))
return count;
@@ -877,7 +872,7 @@
* else treat percent/per-mille as special cases,
* depending on whether +ve or -ve
*/
- else if (!info->is_negative_pattern) {
+ else {
/*
* for +ve prefix/suffix, allow only a
* single occurence of either
@@ -893,24 +888,6 @@
info->multiplier = 1000;
info->is_multiplier_set = TRUE;
}
- } else {
- /*
- * for -ve prefix/suffix, allow only single occurence
- * & insist it's previously defined
- */
- if (xsltUTF8Charcmp(*format, self->percent) == 0) {
- if (info->is_multiplier_set)
- return -1;
- if (info->multiplier != 100)
- return -1;
- info->is_multiplier_set = TRUE;
- } else if (xsltUTF8Charcmp(*format, self->permille) == 0) {
- if (info->is_multiplier_set)
- return -1;
- if (info->multiplier != 1000)
- return -1;
- info->is_multiplier_set = TRUE;
- }
}
if ((len=xsltUTF8Size(*format)) < 1)
@@ -988,6 +965,11 @@
/* flag to show error found, should use default format */
char found_error = 0;
+ if (xmlStrlen(format) <= 0) {
+ xsltTransformError(NULL, NULL, NULL,
+ "xsltFormatNumberConversion : "
+ "Invalid format (0-length)\n");
+ }
*result = NULL;
switch (xmlXPathIsInf(number)) {
case -1:
@@ -1204,8 +1186,6 @@
goto OUTPUT_NUMBER;
}
- /* Next skip over the -ve number info */
- the_format += prefix_length;
while (*the_format != 0) {
if ( (xsltUTF8Charcmp(the_format, (self)->percent) == 0) ||
(xsltUTF8Charcmp(the_format, (self)->permille)== 0) ) {
@@ -1261,9 +1241,10 @@
prefix_length = nprefix_length;
suffix = nsuffix;
suffix_length = nsuffix_length;
- } else {
+ } /* else {
default_sign = 1;
}
+ */
}
}
@@ -1271,7 +1252,7 @@
if (found_error != 0) {
xsltTransformError(NULL, NULL, NULL,
"xsltFormatNumberConversion : "
- "error in format string, using default\n");
+ "error in format string '%s', using default\n", format);
default_sign = (number < 0.0) ? 1 : 0;
prefix_length = suffix_length = 0;
format_info.integer_hash = 0;
@@ -1292,8 +1273,8 @@
if ((pchar = *prefix++) == SYMBOL_QUOTE) {
len = xsltUTF8Size(prefix);
xmlBufferAdd(buffer, prefix, len);
- prefix += len + 1; /* skip the ending quote */
- j += len - 1; /* 'for' will increment by 1 */
+ prefix += len;
+ j += len - 1; /* length of symbol less length of quote */
} else
xmlBufferAdd(buffer, &pchar, 1);
}
@@ -1357,8 +1338,8 @@
if ((pchar = *suffix++) == SYMBOL_QUOTE) {
len = xsltUTF8Size(suffix);
xmlBufferAdd(buffer, suffix, len);
- suffix += len + 1; /* skip the ending quote */
- j += len - 1; /* 'for' will increment by 1 */
+ suffix += len;
+ j += len - 1; /* length of symbol less length of escape */
} else
xmlBufferAdd(buffer, &pchar, 1);
}
Modified: packages/libxslt/trunk/libxslt/pattern.c
===================================================================
--- packages/libxslt/trunk/libxslt/pattern.c 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/libxslt/pattern.c 2005-09-05 17:45:46 UTC (rev 469)
@@ -301,7 +301,24 @@
xsltAllocateExtra(ctxt->style);
}
if (op == XSLT_OP_PREDICATE) {
- comp->steps[comp->nbStep].comp = xsltXPathCompile(ctxt->style, value);
+ xmlXPathContextPtr xctxt;
+
+ if (ctxt->style != NULL)
+ xctxt = xmlXPathNewContext(ctxt->style->doc);
+ else
+ xctxt = xmlXPathNewContext(NULL);
+#ifdef XML_XPATH_NOVAR
+ xctxt->flags = XML_XPATH_NOVAR;
+#endif
+ if (ctxt->style != NULL)
+ xctxt->dict = ctxt->style->dict;
+ comp->steps[comp->nbStep].comp = xmlXPathCtxtCompile(xctxt, value);
+ xmlXPathFreeContext(xctxt);
+ if (comp->steps[comp->nbStep].comp == NULL) {
+ xsltTransformError(NULL, ctxt->style, ctxt->elem,
+ "Failed to compile predicate\n");
+ ctxt->style->errors++;
+ }
}
comp->nbStep++;
return (0);
Modified: packages/libxslt/trunk/libxslt/transform.c
===================================================================
--- packages/libxslt/trunk/libxslt/transform.c 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/libxslt/transform.c 2005-09-05 17:45:46 UTC (rev 469)
@@ -474,6 +474,7 @@
cur->sec = xsltGetDefaultSecurityPrefs();
cur->debugStatus = xslDebugStatus;
cur->traceCode = (unsigned long*) &xsltDefaultTrace;
+ cur->xinclude = xsltGetXIncludeDefault();
return(cur);
}
@@ -729,7 +730,16 @@
return NULL;
if (cur->name == xmlStringTextNoenc)
copy->name = xmlStringTextNoenc;
- copy->content = cur->content;
+ /*
+ * Must confirm that content is in dict
+ * (bug 302821)
+ */
+ if (xmlDictOwns(ctxt->dict, cur->content))
+ copy->content = cur->content;
+ else {
+ if ((copy->content = xmlStrdup(cur->content)) == NULL)
+ return NULL;
+ }
} else {
/*
* normal processing. keep counters to extend the text node
@@ -748,6 +758,7 @@
ctxt->lasttuse = len;
}
if (copy != NULL) {
+ copy->doc = target->doc;
if (target != NULL)
xmlAddChild(target, copy);
} else {
Modified: packages/libxslt/trunk/libxslt/win32config.h
===================================================================
--- packages/libxslt/trunk/libxslt/win32config.h 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/libxslt/win32config.h 2005-09-05 17:45:46 UTC (rev 469)
@@ -11,6 +11,7 @@
#define HAVE_CTYPE_H 1
#define HAVE_STDLIB_H 1
+#define HAVE_STDARG_H 1
#define HAVE_MALLOC_H 1
#define HAVE_TIME_H 1
#define HAVE_LOCALTIME 1
Modified: packages/libxslt/trunk/libxslt/xslt.c
===================================================================
--- packages/libxslt/trunk/libxslt/xslt.c 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/libxslt/xslt.c 2005-09-05 17:45:46 UTC (rev 469)
@@ -181,6 +181,8 @@
xsltNewDecimalFormat(xmlChar *name)
{
xsltDecimalFormatPtr self;
+ /* UTF-8 for 0x2030 */
+ static const xmlChar permille[4] = {0xe2, 0x80, 0xb0, 0};
self = xmlMalloc(sizeof(xsltDecimalFormat));
if (self != NULL) {
@@ -193,7 +195,7 @@
self->decimalPoint = xmlStrdup(BAD_CAST("."));
self->grouping = xmlStrdup(BAD_CAST(","));
self->percent = xmlStrdup(BAD_CAST("%"));
- self->permille = xmlStrdup(BAD_CAST("?"));
+ self->permille = xmlStrdup(BAD_CAST(permille));
self->zeroDigit = xmlStrdup(BAD_CAST("0"));
self->minusSign = xmlStrdup(BAD_CAST("-"));
self->infinity = xmlStrdup(BAD_CAST("Infinity"));
@@ -1216,17 +1218,19 @@
if ((txt != NULL) && (txt->type == XML_TEXT_NODE) &&
(txt->content != NULL) &&
(!xmlDictOwns(style->dict, txt->content))) {
- xmlChar *old = (xmlChar *) txt->content;
+ xmlChar *tmp;
/*
* internalize the text string, goal is to speed
* up operations and minimize used space by compiled
* stylesheets.
*/
- txt->content = (xmlChar *)
- xmlDictLookup(style->dict, old, -1);
- if (old != txt->content)
- xmlFree(old);
+ tmp = (xmlChar *) xmlDictLookup(style->dict,
+ txt->content, -1);
+ if (tmp != txt->content) {
+ xmlNodeSetContent(txt, NULL);
+ txt->content = tmp;
+ }
}
prop = prop->next;
}
@@ -1300,15 +1304,16 @@
}
} else if ((cur->content != NULL) && (internalize) &&
(!xmlDictOwns(style->dict, cur->content))) {
- xmlChar *old = (xmlChar *) cur->content;
+ xmlChar *tmp;
/*
* internalize the text string, goal is to speed
* up operations and minimize used space by compiled
* stylesheets.
*/
- cur->content = (xmlChar *) xmlDictLookup(style->dict, old, -1);
- xmlFree(old);
+ tmp = (xmlChar *) xmlDictLookup(style->dict, cur->content, -1);
+ xmlNodeSetContent(cur, NULL);
+ cur->content = tmp;
}
} else if ((cur->type != XML_ELEMENT_NODE) &&
(cur->type != XML_CDATA_SECTION_NODE)) {
@@ -1535,11 +1540,14 @@
* internalize the text string
*/
if (text->doc->dict != NULL) {
- xmlChar *old = (xmlChar *) text->content;
- text->content =
- (xmlChar *) xmlDictLookup(
- text->doc->dict, old, -1);
- xmlFree(old);
+ const xmlChar *tmp;
+
+ tmp = xmlDictLookup(text->doc->dict,
+ text->content, -1);
+ if (tmp != text->content) {
+ xmlNodeSetContent(text, NULL);
+ text->content = (xmlChar *) tmp;
+ }
}
}
Modified: packages/libxslt/trunk/libxslt/xsltconfig.h
===================================================================
--- packages/libxslt/trunk/libxslt/xsltconfig.h 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/libxslt/xsltconfig.h 2005-09-05 17:45:46 UTC (rev 469)
@@ -20,28 +20,28 @@
*
* the version string like "1.2.3"
*/
-#define LIBXSLT_DOTTED_VERSION "1.1.14"
+#define LIBXSLT_DOTTED_VERSION "1.1.15"
/**
* LIBXSLT_VERSION:
*
* the version number: 1.2.3 value is 1002003
*/
-#define LIBXSLT_VERSION 10114
+#define LIBXSLT_VERSION 10115
/**
* LIBXSLT_VERSION_STRING:
*
* the version number string, 1.2.3 value is "1002003"
*/
-#define LIBXSLT_VERSION_STRING "10114"
+#define LIBXSLT_VERSION_STRING "10115"
/**
* LIBXSLT_VERSION_EXTRA:
*
* extra version information, used to show a CVS compilation
*/
-#define LIBXSLT_VERSION_EXTRA "-CVS1011"
+#define LIBXSLT_VERSION_EXTRA "-CVS1027"
/**
* WITH_XSLT_DEBUG:
Modified: packages/libxslt/trunk/libxslt/xsltutils.c
===================================================================
--- packages/libxslt/trunk/libxslt/xsltutils.c 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/libxslt/xsltutils.c 2005-09-05 17:45:46 UTC (rev 469)
@@ -1921,13 +1921,17 @@
*/
xmlXPathCompExprPtr
xsltXPathCompile(xsltStylesheetPtr style, const xmlChar *str) {
- xmlXPathContext xctxt;
+ xmlXPathContextPtr xctxt;
xmlXPathCompExprPtr ret;
- memset(&xctxt, 0, sizeof(xctxt));
if (style != NULL)
- xctxt.dict = style->dict;
- ret = xmlXPathCtxtCompile(&xctxt, str);
+ xctxt = xmlXPathNewContext(style->doc);
+ else
+ xctxt = xmlXPathNewContext(NULL);
+ if (style != NULL)
+ xctxt->dict = style->dict;
+ ret = xmlXPathCtxtCompile(xctxt, str);
+ xmlXPathFreeContext(xctxt);
/*
* TODO: there is a lot of optimizations which should be possible
* like variable slot precomputations, function precomputations, etc.
@@ -1935,6 +1939,7 @@
return(ret);
}
+
/************************************************************************
* *
* Hooks for the debugger *
Modified: packages/libxslt/trunk/libxslt/xsltutils.h
===================================================================
--- packages/libxslt/trunk/libxslt/xsltutils.h 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/libxslt/xsltutils.h 2005-09-05 17:45:46 UTC (rev 469)
@@ -12,11 +12,7 @@
#ifndef __XML_XSLTUTILS_H__
#define __XML_XSLTUTILS_H__
-#if defined(WIN32) && defined(_MSC_VER)
-#include <libxslt/xsltwin32config.h>
-#else
#include <libxslt/xsltconfig.h>
-#endif
#ifdef HAVE_STDARG_H
#include <stdarg.h>
#endif
Modified: packages/libxslt/trunk/libxslt/xsltwin32config.h
===================================================================
--- packages/libxslt/trunk/libxslt/xsltwin32config.h 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/libxslt/xsltwin32config.h 2005-09-05 17:45:46 UTC (rev 469)
@@ -23,28 +23,28 @@
*
* the version string like "1.2.3"
*/
-#define LIBXSLT_DOTTED_VERSION "1.1.14"
+#define LIBXSLT_DOTTED_VERSION "1.1.15"
/**
* LIBXSLT_VERSION:
*
* the version number: 1.2.3 value is 1002003
*/
-#define LIBXSLT_VERSION 10114
+#define LIBXSLT_VERSION 10115
/**
* LIBXSLT_VERSION_STRING:
*
* the version number string, 1.2.3 value is "1002003"
*/
-#define LIBXSLT_VERSION_STRING "10114"
+#define LIBXSLT_VERSION_STRING "10115"
/**
* LIBXSLT_VERSION_EXTRA:
*
* extra version information, used to show a CVS compilation
*/
-#define LIBXSLT_VERSION_EXTRA "-CVS1011"
+#define LIBXSLT_VERSION_EXTRA "-win32"
/**
* WITH_XSLT_DEBUG:
Modified: packages/libxslt/trunk/libxslt/xsltwin32config.h.in
===================================================================
--- packages/libxslt/trunk/libxslt/xsltwin32config.h.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/libxslt/xsltwin32config.h.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -44,7 +44,7 @@
*
* extra version information, used to show a CVS compilation
*/
-#define LIBXSLT_VERSION_EXTRA "@LIBXSLT_VERSION_EXTRA@"
+#define LIBXSLT_VERSION_EXTRA "-win32"
/**
* WITH_XSLT_DEBUG:
Modified: packages/libxslt/trunk/libxslt.spec
===================================================================
--- packages/libxslt/trunk/libxslt.spec 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/libxslt.spec 2005-09-05 17:45:46 UTC (rev 469)
@@ -1,6 +1,6 @@
Summary: Library providing the Gnome XSLT engine
Name: libxslt
-Version: 1.1.14
+Version: 1.1.15
Release: 1
License: MIT
Group: Development/Libraries
@@ -65,6 +65,9 @@
%makeinstall
+rm -fr $RPM_BUILD_ROOT%{_libdir}/*.la \
+ $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/libxsltmod*a
+
%clean
rm -fr %{buildroot}
@@ -107,7 +110,7 @@
%defattr(-, root, root)
%doc AUTHORS ChangeLog.gz NEWS README Copyright FEATURES
-%{_libdir}/python*/site-packages/libxslt.py
+%{_libdir}/python*/site-packages/libxslt.py*
%{_libdir}/python*/site-packages/libxsltmod*
%doc python/TODO
%doc python/libxsltclass.txt
@@ -116,8 +119,8 @@
%doc python/tests/*.xsl
%changelog
-* Sat Apr 2 2005 Daniel Veillard <veillard at redhat.com>
-- upstream release 1.1.14 see http://xmlsoft.org/XSLT/news.html
+* Mon Sep 5 2005 Daniel Veillard <veillard at redhat.com>
+- upstream release 1.1.15 see http://xmlsoft.org/XSLT/news.html
* Sun Nov 2 2003 Daniel Veillard <veillard at redhat.com>
- cleanup, removal of the deprecated breakpoint library and
Modified: packages/libxslt/trunk/libxslt.spec.in
===================================================================
--- packages/libxslt/trunk/libxslt.spec.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/libxslt.spec.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -65,6 +65,9 @@
%makeinstall
+rm -fr $RPM_BUILD_ROOT%{_libdir}/*.la \
+ $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/libxsltmod*a
+
%clean
rm -fr %{buildroot}
@@ -107,7 +110,7 @@
%defattr(-, root, root)
%doc AUTHORS ChangeLog.gz NEWS README Copyright FEATURES
-%{_libdir}/python*/site-packages/libxslt.py
+%{_libdir}/python*/site-packages/libxslt.py*
%{_libdir}/python*/site-packages/libxsltmod*
%doc python/TODO
%doc python/libxsltclass.txt
Modified: packages/libxslt/trunk/python/Makefile.in
===================================================================
--- packages/libxslt/trunk/python/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/python/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -138,12 +138,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Modified: packages/libxslt/trunk/python/tests/Makefile.in
===================================================================
--- packages/libxslt/trunk/python/tests/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/python/tests/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -102,12 +102,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Modified: packages/libxslt/trunk/tests/Makefile.in
===================================================================
--- packages/libxslt/trunk/tests/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -111,12 +111,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Modified: packages/libxslt/trunk/tests/REC/Makefile.in
===================================================================
--- packages/libxslt/trunk/tests/REC/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/REC/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -102,12 +102,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Modified: packages/libxslt/trunk/tests/REC1/Makefile.in
===================================================================
--- packages/libxslt/trunk/tests/REC1/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/REC1/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -102,12 +102,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Modified: packages/libxslt/trunk/tests/REC2/Makefile.in
===================================================================
--- packages/libxslt/trunk/tests/REC2/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/REC2/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -102,12 +102,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Modified: packages/libxslt/trunk/tests/XSLTMark/Makefile.in
===================================================================
--- packages/libxslt/trunk/tests/XSLTMark/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/XSLTMark/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -102,12 +102,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Modified: packages/libxslt/trunk/tests/docbook/Makefile.in
===================================================================
--- packages/libxslt/trunk/tests/docbook/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/docbook/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -103,12 +103,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Modified: packages/libxslt/trunk/tests/docs/Makefile.am
===================================================================
--- packages/libxslt/trunk/tests/docs/Makefile.am 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/docs/Makefile.am 2005-09-05 17:45:46 UTC (rev 469)
@@ -161,6 +161,7 @@
bug-159.xml \
bug-160.xml \
bug-161.xml \
+ bug-163.xml \
character.xml \
array.xml \
items.xml
Modified: packages/libxslt/trunk/tests/docs/Makefile.in
===================================================================
--- packages/libxslt/trunk/tests/docs/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/docs/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -106,12 +106,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
@@ -373,6 +367,7 @@
bug-159.xml \
bug-160.xml \
bug-161.xml \
+ bug-163.xml \
character.xml \
array.xml \
items.xml
Copied: packages/libxslt/trunk/tests/docs/bug-163.xml (from rev 468, packages/libxslt/branches/upstream/current/tests/docs/bug-163.xml)
Modified: packages/libxslt/trunk/tests/documents/Makefile.in
===================================================================
--- packages/libxslt/trunk/tests/documents/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/documents/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -102,12 +102,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Modified: packages/libxslt/trunk/tests/exslt/Makefile.am
===================================================================
--- packages/libxslt/trunk/tests/exslt/Makefile.am 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/exslt/Makefile.am 2005-09-05 17:45:46 UTC (rev 469)
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS=common functions math sets strings date
+SUBDIRS=common functions math sets strings dynamic date
all:
Modified: packages/libxslt/trunk/tests/exslt/Makefile.in
===================================================================
--- packages/libxslt/trunk/tests/exslt/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/exslt/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -111,12 +111,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
@@ -221,7 +215,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS = common functions math sets strings date
+SUBDIRS = common functions math sets strings dynamic date
all: all-recursive
.SUFFIXES:
Modified: packages/libxslt/trunk/tests/exslt/common/Makefile.in
===================================================================
--- packages/libxslt/trunk/tests/exslt/common/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/exslt/common/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -102,12 +102,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Modified: packages/libxslt/trunk/tests/exslt/date/Makefile.in
===================================================================
--- packages/libxslt/trunk/tests/exslt/date/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/exslt/date/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -102,12 +102,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Copied: packages/libxslt/trunk/tests/exslt/dynamic (from rev 468, packages/libxslt/branches/upstream/current/tests/exslt/dynamic)
Modified: packages/libxslt/trunk/tests/exslt/functions/Makefile.in
===================================================================
--- packages/libxslt/trunk/tests/exslt/functions/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/exslt/functions/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -102,12 +102,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Modified: packages/libxslt/trunk/tests/exslt/math/Makefile.in
===================================================================
--- packages/libxslt/trunk/tests/exslt/math/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/exslt/math/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -102,12 +102,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Modified: packages/libxslt/trunk/tests/exslt/sets/Makefile.in
===================================================================
--- packages/libxslt/trunk/tests/exslt/sets/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/exslt/sets/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -102,12 +102,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Modified: packages/libxslt/trunk/tests/exslt/strings/Makefile.in
===================================================================
--- packages/libxslt/trunk/tests/exslt/strings/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/exslt/strings/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -102,12 +102,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Modified: packages/libxslt/trunk/tests/extensions/Makefile.in
===================================================================
--- packages/libxslt/trunk/tests/extensions/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/extensions/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -102,12 +102,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Modified: packages/libxslt/trunk/tests/general/Makefile.am
===================================================================
--- packages/libxslt/trunk/tests/general/Makefile.am 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/general/Makefile.am 2005-09-05 17:45:46 UTC (rev 469)
@@ -170,6 +170,7 @@
bug-159.out bug-159.xsl \
bug-160.out bug-160.xsl \
bug-161.out bug-161.xsl \
+ bug-163.out bug-163.xsl \
character.out character.xsl \
character2.out character2.xsl \
itemschoose.out itemschoose.xsl \
Modified: packages/libxslt/trunk/tests/general/Makefile.in
===================================================================
--- packages/libxslt/trunk/tests/general/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/general/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -102,12 +102,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
@@ -379,6 +373,7 @@
bug-159.out bug-159.xsl \
bug-160.out bug-160.xsl \
bug-161.out bug-161.xsl \
+ bug-163.out bug-163.xsl \
character.out character.xsl \
character2.out character2.xsl \
itemschoose.out itemschoose.xsl \
Modified: packages/libxslt/trunk/tests/general/bug-142.out
===================================================================
--- packages/libxslt/trunk/tests/general/bug-142.out 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/general/bug-142.out 2005-09-05 17:45:46 UTC (rev 469)
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr"><body><div id="post6" xml:lang="ja"><h3><a href="2004/01/26/6">ä»–ã®æ—¥æœ¬èªžã®ä¼è¨€</a></h3>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr"><body><div id="post6"><h3><a href="2004/01/26/6">ä»–ã®æ—¥æœ¬èªžã®ä¼è¨€</a></h3>
<p>ã“ã®ä¼è¨€ã¯æ—¥æœ¬èªžã§æ›¸ã„ã¦ã€ç¿»è¨³ãŒã‚る。<span xml:lang="fr">couhin ?</span></p>
<p>Et on a une petite phrase en français.</p>
</div>
Test
- <div id="post4" xml:lang="ja"><h3><a href="2004/01/25/4">日本語ã®ä¼è¨€</a></h3>
+ <div id="post4"><h3><a href="2004/01/25/4">日本語ã®ä¼è¨€</a></h3>
<p>ã“ã®ä¼è¨€ã¯æ—¥æœ¬èªžã§æ›¸ã„ã¦ã€ç¿»è¨³ãŒãªã„。実ã¯å°‘ã—ã ã‘。</p>
<p>ã‚ã„ã†ãˆãŠã‹ããã‘ã“ã•ã—ã™ã›ã…</p>
- </div><div id="post3" xml:lang="ja"><h3><a href="2005/08/12/3"/></h3></div><div id="post2" xml:lang="ja"><h3><a href="2004/01/25/2">é–“é•ã„</a></h3>
+ </div><div id="post3"><h3><a href="2005/08/12/3"/></h3></div><div id="post2"><h3><a href="2004/01/25/2">é–“é•ã„</a></h3>
<p>Quelques tests d'erreurs :</p>
<ul>
Un paragraphe dans la liste
@@ -18,7 +18,7 @@
<li>une <span xml:lang="fr">翻訳</span> sans xml:lang="ja"</li>
<li>20040125</li>
</ul>
- </div><div id="post1" xml:lang="ja"><h3><a href="2004/01/25/1">サンプル</a></h3>
+ </div><div id="post1"><h3><a href="2004/01/25/1">サンプル</a></h3>
<p>Ceci est un <span xml:lang="ja">テスト</span>.</p>
<ul>
<li>Voici une liste,</li>
Modified: packages/libxslt/trunk/tests/general/bug-152.out
===================================================================
--- packages/libxslt/trunk/tests/general/bug-152.out 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/general/bug-152.out 2005-09-05 17:45:46 UTC (rev 469)
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="US-ASCII"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII" />
+ <head><meta http-equiv="Content-Type" content="text/html; charset=US-ASCII" />
<style type="text/css" media="all">@import
"pretty_xhtml.css";</style>
</head>
Copied: packages/libxslt/trunk/tests/general/bug-163.out (from rev 468, packages/libxslt/branches/upstream/current/tests/general/bug-163.out)
Copied: packages/libxslt/trunk/tests/general/bug-163.xsl (from rev 468, packages/libxslt/branches/upstream/current/tests/general/bug-163.xsl)
Modified: packages/libxslt/trunk/tests/general/bug-89.xsl
===================================================================
--- packages/libxslt/trunk/tests/general/bug-89.xsl 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/general/bug-89.xsl 2005-09-05 17:45:46 UTC (rev 469)
@@ -30,7 +30,7 @@
<!-- effacer ! -->
</xsl:template>
-<xsl:template match="*[attribute::id and @id=$targetId]">
+<xsl:template match="*[attribute::id and @id='']">
<!-- attribute::type pour éviter de confondre l'absence d'attibute et
la valeur nulle -->
<xsl:choose>
Modified: packages/libxslt/trunk/tests/keys/Makefile.in
===================================================================
--- packages/libxslt/trunk/tests/keys/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/keys/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -102,12 +102,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Modified: packages/libxslt/trunk/tests/multiple/Makefile.in
===================================================================
--- packages/libxslt/trunk/tests/multiple/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/multiple/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -102,12 +102,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Modified: packages/libxslt/trunk/tests/namespaces/Makefile.in
===================================================================
--- packages/libxslt/trunk/tests/namespaces/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/namespaces/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -102,12 +102,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Modified: packages/libxslt/trunk/tests/namespaces/tst7.out
===================================================================
--- packages/libxslt/trunk/tests/namespaces/tst7.out 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/namespaces/tst7.out 2005-09-05 17:45:46 UTC (rev 469)
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>
A title
</title>
Modified: packages/libxslt/trunk/tests/numbers/Makefile.in
===================================================================
--- packages/libxslt/trunk/tests/numbers/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/numbers/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -102,12 +102,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Modified: packages/libxslt/trunk/tests/plugins/Makefile.am
===================================================================
--- packages/libxslt/trunk/tests/plugins/Makefile.am 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/plugins/Makefile.am 2005-09-05 17:45:46 UTC (rev 469)
@@ -9,7 +9,7 @@
EXTRA_DIST = plugin.out plugin.xml plugin.xsl
-INCLUDES = -I$(top_srcdir) -I../../libxslt
+INCLUDES = -I$(top_srcdir) -I../../libxslt $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
noinst_LTLIBRARIES = xmlsoft_org_xslt_testplugin.la
Modified: packages/libxslt/trunk/tests/plugins/Makefile.in
===================================================================
--- packages/libxslt/trunk/tests/plugins/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/plugins/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -130,12 +130,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
@@ -241,7 +235,7 @@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
EXTRA_DIST = plugin.out plugin.xml plugin.xsl
-INCLUDES = -I$(top_srcdir) -I../../libxslt
+INCLUDES = -I$(top_srcdir) -I../../libxslt $(LIBXML_CFLAGS) $(LIBXSLT_CFLAGS)
noinst_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
Modified: packages/libxslt/trunk/tests/reports/Makefile.in
===================================================================
--- packages/libxslt/trunk/tests/reports/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/reports/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -102,12 +102,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Modified: packages/libxslt/trunk/tests/xinclude/Makefile.in
===================================================================
--- packages/libxslt/trunk/tests/xinclude/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/xinclude/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -102,12 +102,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Modified: packages/libxslt/trunk/tests/xmlspec/Makefile.in
===================================================================
--- packages/libxslt/trunk/tests/xmlspec/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/tests/xmlspec/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -102,12 +102,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Modified: packages/libxslt/trunk/win32/.cvsignore
===================================================================
--- packages/libxslt/trunk/win32/.cvsignore 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/win32/.cvsignore 2005-09-05 17:45:46 UTC (rev 469)
@@ -3,4 +3,5 @@
depends.*
int.*
bin.*
-
+*.win32
+*.win32.zip
Modified: packages/libxslt/trunk/win32/Makefile.mingw
===================================================================
--- packages/libxslt/trunk/win32/Makefile.mingw 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/win32/Makefile.mingw 2005-09-05 17:45:46 UTC (rev 469)
@@ -166,7 +166,7 @@
cmd.exe /C if exist depends.* del depends.*
cmd.exe /C if exist Makefile del Makefile
-install : all
+install-libs : all
cmd.exe /C if not exist $(INCPREFIX)\$(XSLT_BASENAME) mkdir $(INCPREFIX)\$(XSLT_BASENAME)
cmd.exe /C if not exist $(INCPREFIX)\$(EXSLT_BASENAME) mkdir $(INCPREFIX)\$(EXSLT_BASENAME)
cmd.exe /C if not exist $(BINPREFIX) mkdir $(BINPREFIX)
@@ -179,14 +179,18 @@
cmd.exe /C copy $(BINDIR)\$(EXSLT_SO) $(SOPREFIX)
cmd.exe /C copy $(BINDIR)\$(EXSLT_A) $(LIBPREFIX)
cmd.exe /C copy $(BINDIR)\$(EXSLT_IMP) $(LIBPREFIX)
+
+install : install-libs
cmd.exe /C copy $(BINDIR)\*.exe $(BINPREFIX)
+install-dist : install
+
# This is a target for me, to make a binary distribution. Not for the public use,
# keep your hands off :-)
BDVERSION = $(LIBXSLT_MAJOR_VERSION).$(LIBXSLT_MINOR_VERSION).$(LIBXSLT_MICRO_VERSION)
BDPREFIX = $(XSLT_BASENAME)-$(BDVERSION).win32
bindist : all
- $(MAKE) PREFIX=$(BDPREFIX) SOPREFIX=$(BDPREFIX)/bin install
+ $(MAKE) PREFIX=$(BDPREFIX) SOPREFIX=$(BDPREFIX)/bin install-dist
cscript //NoLogo configure.js genreadme $(XSLT_BASENAME) $(BDVERSION) $(BDPREFIX)\readme.txt
Modified: packages/libxslt/trunk/win32/Makefile.msvc
===================================================================
--- packages/libxslt/trunk/win32/Makefile.msvc 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/win32/Makefile.msvc 2005-09-05 17:45:46 UTC (rev 469)
@@ -167,7 +167,7 @@
if exist config.* del config.*
if exist Makefile del Makefile
-install : all
+install-libs : all
if not exist $(INCPREFIX)\$(XSLT_BASENAME) mkdir $(INCPREFIX)\$(XSLT_BASENAME)
if not exist $(INCPREFIX)\$(EXSLT_BASENAME) mkdir $(INCPREFIX)\$(EXSLT_BASENAME)
if not exist $(BINPREFIX) mkdir $(BINPREFIX)
@@ -180,30 +180,19 @@
copy $(BINDIR)\$(EXSLT_SO) $(SOPREFIX)
copy $(BINDIR)\$(EXSLT_A) $(LIBPREFIX)
copy $(BINDIR)\$(EXSLT_IMP) $(LIBPREFIX)
+
+install : install-libs
copy $(BINDIR)\*.exe $(BINPREFIX)
-copy $(BINDIR)\*.pdb $(BINPREFIX)
-install-bindist : all
- if not exist $(INCPREFIX)\$(XSLT_BASENAME) mkdir $(INCPREFIX)\$(XSLT_BASENAME)
- if not exist $(INCPREFIX)\$(EXSLT_BASENAME) mkdir $(INCPREFIX)\$(EXSLT_BASENAME)
- if not exist $(BINPREFIX) mkdir $(BINPREFIX)
- if not exist $(LIBPREFIX) mkdir $(LIBPREFIX)
- copy $(XSLT_SRCDIR)\*.h $(INCPREFIX)\$(XSLT_BASENAME)
- copy $(EXSLT_SRCDIR)\*.h $(INCPREFIX)\$(EXSLT_BASENAME)
- copy $(BINDIR)\$(XSLT_SO) $(SOPREFIX)
- copy $(BINDIR)\$(XSLT_A) $(LIBPREFIX)
- copy $(BINDIR)\$(XSLT_IMP) $(LIBPREFIX)
- copy $(BINDIR)\$(EXSLT_SO) $(SOPREFIX)
- copy $(BINDIR)\$(EXSLT_A) $(LIBPREFIX)
- copy $(BINDIR)\$(EXSLT_IMP) $(LIBPREFIX)
- copy $(BINDIR)\*.exe $(BINPREFIX)
+install-dist : install
# This is a target for me, to make a binary distribution. Not for the public use,
# keep your hands off :-)
BDVERSION = $(LIBXSLT_MAJOR_VERSION).$(LIBXSLT_MINOR_VERSION).$(LIBXSLT_MICRO_VERSION)
BDPREFIX = $(XSLT_BASENAME)-$(BDVERSION).win32
bindist : all
- $(MAKE) /nologo PREFIX=$(BDPREFIX) SOPREFIX=$(BDPREFIX)\bin install-bindist
+ $(MAKE) /nologo PREFIX=$(BDPREFIX) SOPREFIX=$(BDPREFIX)\bin install-dist
cscript //NoLogo configure.js genreadme $(XSLT_BASENAME) $(BDVERSION) $(BDPREFIX)\readme.txt
# Makes the compiler output directory.
Modified: packages/libxslt/trunk/win32/configure.js
===================================================================
--- packages/libxslt/trunk/win32/configure.js 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/win32/configure.js 2005-09-05 17:45:46 UTC (rev 469)
@@ -26,10 +26,8 @@
is identical to the first. */
var optsFileInXslt = srcDirXslt + "\\xsltconfig.h.in";
var optsFileXslt = srcDirXslt + "\\xsltconfig.h";
-var optsFileXslt2 = srcDirXslt + "\\xsltwin32config.h";
var optsFileInExslt = srcDirExslt + "\\exsltconfig.h.in";
var optsFileExslt = srcDirExslt + "\\exsltconfig.h";
-var optsFileExslt2 = srcDirExslt + "\\exsltwin32config.h";
/* Version strings for the binary distribution. Will be filled later
in the code. */
var verMajorXslt;
@@ -246,7 +244,6 @@
}
ofi.Close();
of.Close();
- fso.CopyFile(optsFileXslt, optsFileXslt2, true);
}
/* Configures libexslt. This one will generate exsltconfig.h from exsltconfig.h.in
@@ -277,7 +274,6 @@
}
ofi.Close();
of.Close();
- fso.CopyFile(optsFileExslt, optsFileExslt2, true);
}
/* Creates the readme file for the binary distribution of 'bname', for the
Modified: packages/libxslt/trunk/xsltproc/Makefile.in
===================================================================
--- packages/libxslt/trunk/xsltproc/Makefile.in 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/xsltproc/Makefile.in 2005-09-05 17:45:46 UTC (rev 469)
@@ -130,12 +130,6 @@
LIBXML_LIBS = @LIBXML_LIBS@
LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
LIBXML_SRC = @LIBXML_SRC@
-LIBXSLTBREAK_MAJOR_VERSION = @LIBXSLTBREAK_MAJOR_VERSION@
-LIBXSLTBREAK_MICRO_VERSION = @LIBXSLTBREAK_MICRO_VERSION@
-LIBXSLTBREAK_MINOR_VERSION = @LIBXSLTBREAK_MINOR_VERSION@
-LIBXSLTBREAK_VERSION = @LIBXSLTBREAK_VERSION@
-LIBXSLTBREAK_VERSION_INFO = @LIBXSLTBREAK_VERSION_INFO@
-LIBXSLTBREAK_VERSION_NUMBER = @LIBXSLTBREAK_VERSION_NUMBER@
LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
Modified: packages/libxslt/trunk/xsltproc/xsltproc.c
===================================================================
--- packages/libxslt/trunk/xsltproc/xsltproc.c 2005-09-05 17:43:56 UTC (rev 468)
+++ packages/libxslt/trunk/xsltproc/xsltproc.c 2005-09-05 17:45:46 UTC (rev 469)
@@ -57,10 +57,6 @@
#if defined(_MSC_VER) || defined(__MINGW32__)
#include <winsock2.h>
#define gettimeofday(p1,p2)
-#define HAVE_TIME_H
-#include <time.h>
-#define HAVE_STDARG_H
-#include <stdarg.h>
#define snprintf _snprintf
#endif /* _MS_VER */
#else /* WIN32 */
More information about the debian-xml-sgml-commit
mailing list