[xml/sgml-commit] r467 - in
packages/libxslt/branches/upstream/current: . doc libexslt
libxslt tests/docs tests/exslt tests/exslt/dynamic
tests/general tests/namespaces tests/plugins win32 xsltproc
Mike Hommey
glandium at costa.debian.org
Mon Sep 5 17:43:46 UTC 2005
Author: glandium
Date: 2005-09-05 17:43:40 +0000 (Mon, 05 Sep 2005)
New Revision: 467
Added:
packages/libxslt/branches/upstream/current/tests/docs/bug-163.xml
packages/libxslt/branches/upstream/current/tests/exslt/dynamic/
packages/libxslt/branches/upstream/current/tests/exslt/dynamic/Makefile.am
packages/libxslt/branches/upstream/current/tests/exslt/dynamic/Makefile.in
packages/libxslt/branches/upstream/current/tests/exslt/dynamic/dynmap.out
packages/libxslt/branches/upstream/current/tests/exslt/dynamic/dynmap.xml
packages/libxslt/branches/upstream/current/tests/exslt/dynamic/dynmap.xsl
packages/libxslt/branches/upstream/current/tests/general/bug-163.out
packages/libxslt/branches/upstream/current/tests/general/bug-163.xsl
Modified:
packages/libxslt/branches/upstream/current/ChangeLog
packages/libxslt/branches/upstream/current/NEWS
packages/libxslt/branches/upstream/current/configure
packages/libxslt/branches/upstream/current/configure.in
packages/libxslt/branches/upstream/current/doc/libxslt.xsa
packages/libxslt/branches/upstream/current/doc/news.html
packages/libxslt/branches/upstream/current/doc/xslt.html
packages/libxslt/branches/upstream/current/libexslt/dynamic.c
packages/libxslt/branches/upstream/current/libexslt/exslt.c
packages/libxslt/branches/upstream/current/libexslt/exsltconfig.h
packages/libxslt/branches/upstream/current/libexslt/libexslt.3
packages/libxslt/branches/upstream/current/libexslt/libexslt.h
packages/libxslt/branches/upstream/current/libxslt.spec
packages/libxslt/branches/upstream/current/libxslt.spec.in
packages/libxslt/branches/upstream/current/libxslt/libxslt.h
packages/libxslt/branches/upstream/current/libxslt/numbers.c
packages/libxslt/branches/upstream/current/libxslt/pattern.c
packages/libxslt/branches/upstream/current/libxslt/transform.c
packages/libxslt/branches/upstream/current/libxslt/win32config.h
packages/libxslt/branches/upstream/current/libxslt/xslt.c
packages/libxslt/branches/upstream/current/libxslt/xsltconfig.h
packages/libxslt/branches/upstream/current/libxslt/xsltutils.c
packages/libxslt/branches/upstream/current/libxslt/xsltutils.h
packages/libxslt/branches/upstream/current/libxslt/xsltwin32config.h
packages/libxslt/branches/upstream/current/libxslt/xsltwin32config.h.in
packages/libxslt/branches/upstream/current/tests/docs/Makefile.am
packages/libxslt/branches/upstream/current/tests/docs/Makefile.in
packages/libxslt/branches/upstream/current/tests/exslt/Makefile.am
packages/libxslt/branches/upstream/current/tests/exslt/Makefile.in
packages/libxslt/branches/upstream/current/tests/general/Makefile.am
packages/libxslt/branches/upstream/current/tests/general/Makefile.in
packages/libxslt/branches/upstream/current/tests/general/bug-142.out
packages/libxslt/branches/upstream/current/tests/general/bug-152.out
packages/libxslt/branches/upstream/current/tests/general/bug-89.xsl
packages/libxslt/branches/upstream/current/tests/namespaces/tst7.out
packages/libxslt/branches/upstream/current/tests/plugins/Makefile.am
packages/libxslt/branches/upstream/current/tests/plugins/Makefile.in
packages/libxslt/branches/upstream/current/win32/.cvsignore
packages/libxslt/branches/upstream/current/win32/Makefile.mingw
packages/libxslt/branches/upstream/current/win32/Makefile.msvc
packages/libxslt/branches/upstream/current/win32/configure.js
packages/libxslt/branches/upstream/current/xsltproc/xsltproc.c
Log:
Load /usr/tmp/tmp.B8kfTW/libxslt-1.1.15 into
packages/libxslt/branches/upstream/current.
Modified: packages/libxslt/branches/upstream/current/ChangeLog
===================================================================
--- packages/libxslt/branches/upstream/current/ChangeLog 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/ChangeLog 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/NEWS
===================================================================
--- packages/libxslt/branches/upstream/current/NEWS 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/NEWS 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/configure
===================================================================
--- packages/libxslt/branches/upstream/current/configure 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/configure 2005-09-05 17:43:40 UTC (rev 467)
@@ -1589,7 +1589,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
@@ -22680,7 +22680,7 @@
)
- 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/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
@@ -23300,6 +23300,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" ;;
Modified: packages/libxslt/branches/upstream/current/configure.in
===================================================================
--- packages/libxslt/branches/upstream/current/configure.in 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/configure.in 2005-09-05 17:43:40 UTC (rev 467)
@@ -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
@@ -583,6 +583,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/branches/upstream/current/doc/libxslt.xsa
===================================================================
--- packages/libxslt/branches/upstream/current/doc/libxslt.xsa 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/doc/libxslt.xsa 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/doc/news.html
===================================================================
--- packages/libxslt/branches/upstream/current/doc/news.html 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/doc/news.html 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/doc/xslt.html
===================================================================
--- packages/libxslt/branches/upstream/current/doc/xslt.html 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/doc/xslt.html 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/libexslt/dynamic.c
===================================================================
--- packages/libxslt/branches/upstream/current/libexslt/dynamic.c 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/libexslt/dynamic.c 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/libexslt/exslt.c
===================================================================
--- packages/libxslt/branches/upstream/current/libexslt/exslt.c 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/libexslt/exslt.c 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/libexslt/exsltconfig.h
===================================================================
--- packages/libxslt/branches/upstream/current/libexslt/exsltconfig.h 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/libexslt/exsltconfig.h 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/libexslt/libexslt.3
===================================================================
--- packages/libxslt/branches/upstream/current/libexslt/libexslt.3 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/libexslt/libexslt.3 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/libexslt/libexslt.h
===================================================================
--- packages/libxslt/branches/upstream/current/libexslt/libexslt.h 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/libexslt/libexslt.h 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/libxslt/libxslt.h
===================================================================
--- packages/libxslt/branches/upstream/current/libxslt/libxslt.h 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/libxslt/libxslt.h 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/libxslt/numbers.c
===================================================================
--- packages/libxslt/branches/upstream/current/libxslt/numbers.c 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/libxslt/numbers.c 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/libxslt/pattern.c
===================================================================
--- packages/libxslt/branches/upstream/current/libxslt/pattern.c 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/libxslt/pattern.c 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/libxslt/transform.c
===================================================================
--- packages/libxslt/branches/upstream/current/libxslt/transform.c 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/libxslt/transform.c 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/libxslt/win32config.h
===================================================================
--- packages/libxslt/branches/upstream/current/libxslt/win32config.h 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/libxslt/win32config.h 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/libxslt/xslt.c
===================================================================
--- packages/libxslt/branches/upstream/current/libxslt/xslt.c 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/libxslt/xslt.c 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/libxslt/xsltconfig.h
===================================================================
--- packages/libxslt/branches/upstream/current/libxslt/xsltconfig.h 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/libxslt/xsltconfig.h 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/libxslt/xsltutils.c
===================================================================
--- packages/libxslt/branches/upstream/current/libxslt/xsltutils.c 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/libxslt/xsltutils.c 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/libxslt/xsltutils.h
===================================================================
--- packages/libxslt/branches/upstream/current/libxslt/xsltutils.h 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/libxslt/xsltutils.h 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/libxslt/xsltwin32config.h
===================================================================
--- packages/libxslt/branches/upstream/current/libxslt/xsltwin32config.h 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/libxslt/xsltwin32config.h 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/libxslt/xsltwin32config.h.in
===================================================================
--- packages/libxslt/branches/upstream/current/libxslt/xsltwin32config.h.in 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/libxslt/xsltwin32config.h.in 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/libxslt.spec
===================================================================
--- packages/libxslt/branches/upstream/current/libxslt.spec 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/libxslt.spec 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/libxslt.spec.in
===================================================================
--- packages/libxslt/branches/upstream/current/libxslt.spec.in 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/libxslt.spec.in 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/tests/docs/Makefile.am
===================================================================
--- packages/libxslt/branches/upstream/current/tests/docs/Makefile.am 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/tests/docs/Makefile.am 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/tests/docs/Makefile.in
===================================================================
--- packages/libxslt/branches/upstream/current/tests/docs/Makefile.in 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/tests/docs/Makefile.in 2005-09-05 17:43:40 UTC (rev 467)
@@ -365,6 +365,7 @@
bug-159.xml \
bug-160.xml \
bug-161.xml \
+ bug-163.xml \
character.xml \
array.xml \
items.xml
Added: packages/libxslt/branches/upstream/current/tests/docs/bug-163.xml
===================================================================
--- packages/libxslt/branches/upstream/current/tests/docs/bug-163.xml 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/tests/docs/bug-163.xml 2005-09-05 17:43:40 UTC (rev 467)
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<!DOCTYPE my-root [
+ <!ATTLIST my-root myns:id ID #IMPLIED>
+]>
+<my-root xmlns:myns="uri" myns:id="indexme" some-attr="findme"/>
Modified: packages/libxslt/branches/upstream/current/tests/exslt/Makefile.am
===================================================================
--- packages/libxslt/branches/upstream/current/tests/exslt/Makefile.am 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/tests/exslt/Makefile.am 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/tests/exslt/Makefile.in
===================================================================
--- packages/libxslt/branches/upstream/current/tests/exslt/Makefile.in 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/tests/exslt/Makefile.in 2005-09-05 17:43:40 UTC (rev 467)
@@ -213,7 +213,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:
Added: packages/libxslt/branches/upstream/current/tests/exslt/dynamic/Makefile.am
===================================================================
--- packages/libxslt/branches/upstream/current/tests/exslt/dynamic/Makefile.am 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/tests/exslt/dynamic/Makefile.am 2005-09-05 17:43:40 UTC (rev 467)
@@ -0,0 +1,46 @@
+## Process this file with automake to produce Makefile.in
+
+$(top_builddir)/xsltproc/xsltproc:
+ @(cd ../../../xsltproc ; $(MAKE) xsltproc)
+
+EXTRA_DIST = \
+ dynmap.out dynmap.xml dynmap.xsl
+
+all:
+
+valgrind:
+ @echo '## Running the regression tests under Valgrind'
+ $(MAKE) CHECKER='valgrind -q' tests
+
+test tests: $(top_builddir)/xsltproc/xsltproc
+ @echo '## Running exslt sets tests'
+ @(echo > .memdump)
+ @(for i in $(srcdir)/*.xsl ; do \
+ name=`basename $$i .xsl` ; \
+ if [ ! -f $(srcdir)/$$name.xml ] ; then continue ; fi ; \
+ log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+ $(srcdir)/$$name.xsl $(srcdir)/$$name.xml > $$name.res 2>$$name.bad;\
+ if [ ! -f $(srcdir)/$$name.out ] ; then \
+ cp $$name.res $(srcdir)/$$name.out ; \
+ if [ -s $$name.bad ] ; then \
+ mv $$name.bad $(srcdir)/$$name.err ; \
+ fi ; \
+ else \
+ if [ ! -s $$name.res ] ; then \
+ echo "Fatal error, no $$name.res\n" ; \
+ else \
+ diff $(srcdir)/$$name.out $$name.res ; \
+ if [ -s $(srcdir)/$$name.err ] ; then \
+ diff $(srcdir)/$$name.err $$name.bad; \
+ else \
+ diff /dev/null $$name.bad; \
+ fi ; \
+ fi ; \
+ fi; \
+ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true`;\
+ if [ -n "$$log" ] ; then \
+ echo $$name result ; \
+ echo $$log ; \
+ fi ; \
+ rm -f $$name.res $$name.bad ; \
+ done)
Added: packages/libxslt/branches/upstream/current/tests/exslt/dynamic/Makefile.in
===================================================================
--- packages/libxslt/branches/upstream/current/tests/exslt/dynamic/Makefile.in 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/tests/exslt/dynamic/Makefile.in 2005-09-05 17:43:40 UTC (rev 467)
@@ -0,0 +1,414 @@
+# Makefile.in generated by automake 1.9.2 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+ at SET_MAKE@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = tests/exslt/dynamic
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXSLT_INCLUDEDIR = @EXSLT_INCLUDEDIR@
+EXSLT_LIBDIR = @EXSLT_LIBDIR@
+EXSLT_LIBS = @EXSLT_LIBS@
+EXTRA_LIBS = @EXTRA_LIBS@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+HTML_DIR = @HTML_DIR@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBEXSLT_MAJOR_VERSION = @LIBEXSLT_MAJOR_VERSION@
+LIBEXSLT_MICRO_VERSION = @LIBEXSLT_MICRO_VERSION@
+LIBEXSLT_MINOR_VERSION = @LIBEXSLT_MINOR_VERSION@
+LIBEXSLT_VERSION = @LIBEXSLT_VERSION@
+LIBEXSLT_VERSION_EXTRA = @LIBEXSLT_VERSION_EXTRA@
+LIBEXSLT_VERSION_INFO = @LIBEXSLT_VERSION_INFO@
+LIBEXSLT_VERSION_NUMBER = @LIBEXSLT_VERSION_NUMBER@
+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
+LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIBXML_CFLAGS = @LIBXML_CFLAGS@
+LIBXML_LIBS = @LIBXML_LIBS@
+LIBXML_REQUIRED_VERSION = @LIBXML_REQUIRED_VERSION@
+LIBXML_SRC = @LIBXML_SRC@
+LIBXSLT_DEFAULT_PLUGINS_PATH = @LIBXSLT_DEFAULT_PLUGINS_PATH@
+LIBXSLT_MAJOR_MINOR_VERSION = @LIBXSLT_MAJOR_MINOR_VERSION@
+LIBXSLT_MAJOR_VERSION = @LIBXSLT_MAJOR_VERSION@
+LIBXSLT_MICRO_VERSION = @LIBXSLT_MICRO_VERSION@
+LIBXSLT_MINOR_VERSION = @LIBXSLT_MINOR_VERSION@
+LIBXSLT_VERSION = @LIBXSLT_VERSION@
+LIBXSLT_VERSION_EXTRA = @LIBXSLT_VERSION_EXTRA@
+LIBXSLT_VERSION_INFO = @LIBXSLT_VERSION_INFO@
+LIBXSLT_VERSION_NUMBER = @LIBXSLT_VERSION_NUMBER@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MV = @MV@
+M_LIBS = @M_LIBS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+PYTHON = @PYTHON@
+PYTHONSODV = @PYTHONSODV@
+PYTHON_INCLUDES = @PYTHON_INCLUDES@
+PYTHON_SITE_PACKAGES = @PYTHON_SITE_PACKAGES@
+PYTHON_SUBDIR = @PYTHON_SUBDIR@
+PYTHON_VERSION = @PYTHON_VERSION@
+RANLIB = @RANLIB@
+RELDATE = @RELDATE@
+RM = @RM@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STATIC_BINARIES = @STATIC_BINARIES@
+STRIP = @STRIP@
+TAR = @TAR@
+VERSION = @VERSION@
+WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@
+WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@
+WITH_CRYPTO = @WITH_CRYPTO@
+WITH_DEBUGGER = @WITH_DEBUGGER@
+WITH_MEM_DEBUG = @WITH_MEM_DEBUG@
+WITH_MODULES = @WITH_MODULES@
+WITH_MODULES_FALSE = @WITH_MODULES_FALSE@
+WITH_MODULES_TRUE = @WITH_MODULES_TRUE@
+WITH_PERL_FALSE = @WITH_PERL_FALSE@
+WITH_PERL_TRUE = @WITH_PERL_TRUE@
+WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
+WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
+WITH_TRIO = @WITH_TRIO@
+WITH_XSLT_DEBUG = @WITH_XSLT_DEBUG@
+XML_CONFIG = @XML_CONFIG@
+XSLTPROCDV = @XSLTPROCDV@
+XSLT_INCLUDEDIR = @XSLT_INCLUDEDIR@
+XSLT_LIBDIR = @XSLT_LIBDIR@
+XSLT_LIBS = @XSLT_LIBS@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+pythondir = @pythondir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+EXTRA_DIST = \
+ dynmap.out dynmap.xml dynmap.xsl
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/exslt/dynamic/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu tests/exslt/dynamic/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
+ if test -d $$d/$$file; then \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ else \
+ test -f $(distdir)/$$file \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-exec install-exec-am \
+ install-info install-info-am install-man install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-info-am
+
+
+$(top_builddir)/xsltproc/xsltproc:
+ @(cd ../../../xsltproc ; $(MAKE) xsltproc)
+
+all:
+
+valgrind:
+ @echo '## Running the regression tests under Valgrind'
+ $(MAKE) CHECKER='valgrind -q' tests
+
+test tests: $(top_builddir)/xsltproc/xsltproc
+ @echo '## Running exslt sets tests'
+ @(echo > .memdump)
+ @(for i in $(srcdir)/*.xsl ; do \
+ name=`basename $$i .xsl` ; \
+ if [ ! -f $(srcdir)/$$name.xml ] ; then continue ; fi ; \
+ log=`$(CHECKER) $(top_builddir)/xsltproc/xsltproc \
+ $(srcdir)/$$name.xsl $(srcdir)/$$name.xml > $$name.res 2>$$name.bad;\
+ if [ ! -f $(srcdir)/$$name.out ] ; then \
+ cp $$name.res $(srcdir)/$$name.out ; \
+ if [ -s $$name.bad ] ; then \
+ mv $$name.bad $(srcdir)/$$name.err ; \
+ fi ; \
+ else \
+ if [ ! -s $$name.res ] ; then \
+ echo "Fatal error, no $$name.res\n" ; \
+ else \
+ diff $(srcdir)/$$name.out $$name.res ; \
+ if [ -s $(srcdir)/$$name.err ] ; then \
+ diff $(srcdir)/$$name.err $$name.bad; \
+ else \
+ diff /dev/null $$name.bad; \
+ fi ; \
+ fi ; \
+ fi; \
+ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true`;\
+ if [ -n "$$log" ] ; then \
+ echo $$name result ; \
+ echo $$log ; \
+ fi ; \
+ rm -f $$name.res $$name.bad ; \
+ done)
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Added: packages/libxslt/branches/upstream/current/tests/exslt/dynamic/dynmap.out
===================================================================
--- packages/libxslt/branches/upstream/current/tests/exslt/dynamic/dynmap.out 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/tests/exslt/dynamic/dynmap.out 2005-09-05 17:43:40 UTC (rev 467)
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<result>
+ <node-set>
+ <childNode2>bbbb</childNode2>
+ <childNode4>dddd</childNode4>
+ <childNode6>ffff</childNode6>
+ <childNode8>hhhh</childNode8>
+ <childNode1>jjjj</childNode1>
+ <childNode3>llll</childNode3>
+ <childNode5>nnnn</childNode5>
+ <childNode7>pppp</childNode7>
+ <childNode9>rrrr</childNode9>
+ </node-set>
+ <boolean>
+ <exsl:boolean xmlns:exsl="http://exslt.org/common">true</exsl:boolean>
+ <exsl:boolean xmlns:exsl="http://exslt.org/common">true</exsl:boolean>
+ <exsl:boolean xmlns:exsl="http://exslt.org/common">true</exsl:boolean>
+ <exsl:boolean xmlns:exsl="http://exslt.org/common">true</exsl:boolean>
+ <exsl:boolean xmlns:exsl="http://exslt.org/common">true</exsl:boolean>
+ <exsl:boolean xmlns:exsl="http://exslt.org/common">true</exsl:boolean>
+ <exsl:boolean xmlns:exsl="http://exslt.org/common">true</exsl:boolean>
+ </boolean>
+ <number>
+ <exsl:number xmlns:exsl="http://exslt.org/common">9</exsl:number>
+ <exsl:number xmlns:exsl="http://exslt.org/common">0</exsl:number>
+ <exsl:number xmlns:exsl="http://exslt.org/common">0</exsl:number>
+ <exsl:number xmlns:exsl="http://exslt.org/common">0</exsl:number>
+ <exsl:number xmlns:exsl="http://exslt.org/common">0</exsl:number>
+ <exsl:number xmlns:exsl="http://exslt.org/common">0</exsl:number>
+ <exsl:number xmlns:exsl="http://exslt.org/common">9</exsl:number>
+ </number>
+ <string>
+ <exsl:string xmlns:exsl="http://exslt.org/common">with-child</exsl:string>
+ <exsl:string xmlns:exsl="http://exslt.org/common">without-child</exsl:string>
+ <exsl:string xmlns:exsl="http://exslt.org/common">without-child</exsl:string>
+ <exsl:string xmlns:exsl="http://exslt.org/common">without-child</exsl:string>
+ <exsl:string xmlns:exsl="http://exslt.org/common">without-child</exsl:string>
+ <exsl:string xmlns:exsl="http://exslt.org/common">without-child</exsl:string>
+ <exsl:string xmlns:exsl="http://exslt.org/common">with-child</exsl:string>
+ </string>
+</result>
Added: packages/libxslt/branches/upstream/current/tests/exslt/dynamic/dynmap.xml
===================================================================
--- packages/libxslt/branches/upstream/current/tests/exslt/dynamic/dynmap.xml 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/tests/exslt/dynamic/dynmap.xml 2005-09-05 17:43:40 UTC (rev 467)
@@ -0,0 +1,29 @@
+<dynmap>
+ <with-child>
+ <childNode1>aaa</childNode1>
+ <childNode2>bbbb</childNode2>
+ <childNode3>ccc</childNode3>
+ <childNode4>dddd</childNode4>
+ <childNode5>eee</childNode5>
+ <childNode6>ffff</childNode6>
+ <childNode7>ggg</childNode7>
+ <childNode8>hhhh</childNode8>
+ <childNode9>iii</childNode9>
+ </with-child>
+ <without-child>some text</without-child>
+ <without-child>some text</without-child>
+ <without-child>some text</without-child>
+ <without-child>some text</without-child>
+ <without-child>some text</without-child>
+ <with-child>
+ <childNode1>jjjj</childNode1>
+ <childNode2>kkk</childNode2>
+ <childNode3>llll</childNode3>
+ <childNode4>mmm</childNode4>
+ <childNode5>nnnn</childNode5>
+ <childNode6>ooo</childNode6>
+ <childNode7>pppp</childNode7>
+ <childNode8>qqq</childNode8>
+ <childNode9>rrrr</childNode9>
+ </with-child>
+</dynmap>
Added: packages/libxslt/branches/upstream/current/tests/exslt/dynamic/dynmap.xsl
===================================================================
--- packages/libxslt/branches/upstream/current/tests/exslt/dynamic/dynmap.xsl 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/tests/exslt/dynamic/dynmap.xsl 2005-09-05 17:43:40 UTC (rev 467)
@@ -0,0 +1,24 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+ xmlns:dyn="http://exslt.org/dynamic"
+ exclude-result-prefixes="dyn"
+>
+<xsl:output indent="yes"/>
+
+<xsl:template match="/dynmap">
+<result>
+ <node-set>
+ <xsl:copy-of select="dyn:map(*, 'child::*[string-length(.) > 3]')"/>
+ </node-set>
+ <boolean>
+ <xsl:copy-of select="dyn:map(*, 'string-length(name()) > 3')"/>
+ </boolean>
+ <number>
+ <xsl:copy-of select="dyn:map(*, 'count(*)')"/>
+ </number>
+ <string>
+ <xsl:copy-of select="dyn:map(*, 'name()')"/>
+ </string>
+</result>
+</xsl:template>
+</xsl:stylesheet>
+
Modified: packages/libxslt/branches/upstream/current/tests/general/Makefile.am
===================================================================
--- packages/libxslt/branches/upstream/current/tests/general/Makefile.am 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/tests/general/Makefile.am 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/tests/general/Makefile.in
===================================================================
--- packages/libxslt/branches/upstream/current/tests/general/Makefile.in 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/tests/general/Makefile.in 2005-09-05 17:43:40 UTC (rev 467)
@@ -371,6 +371,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/branches/upstream/current/tests/general/bug-142.out
===================================================================
--- packages/libxslt/branches/upstream/current/tests/general/bug-142.out 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/tests/general/bug-142.out 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/tests/general/bug-152.out
===================================================================
--- packages/libxslt/branches/upstream/current/tests/general/bug-152.out 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/tests/general/bug-152.out 2005-09-05 17:43:40 UTC (rev 467)
@@ -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>
Added: packages/libxslt/branches/upstream/current/tests/general/bug-163.out
===================================================================
--- packages/libxslt/branches/upstream/current/tests/general/bug-163.out 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/tests/general/bug-163.out 2005-09-05 17:43:40 UTC (rev 467)
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+findme
Added: packages/libxslt/branches/upstream/current/tests/general/bug-163.xsl
===================================================================
--- packages/libxslt/branches/upstream/current/tests/general/bug-163.xsl 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/tests/general/bug-163.xsl 2005-09-05 17:43:40 UTC (rev 467)
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<stylesheet version="1.0" xmlns="http://www.w3.org/1999/XSL/Transform">
+ <template match="/">
+ <value-of select="id('indexme')/@some-attr"/>
+ </template>
+</stylesheet>
Modified: packages/libxslt/branches/upstream/current/tests/general/bug-89.xsl
===================================================================
--- packages/libxslt/branches/upstream/current/tests/general/bug-89.xsl 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/tests/general/bug-89.xsl 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/tests/namespaces/tst7.out
===================================================================
--- packages/libxslt/branches/upstream/current/tests/namespaces/tst7.out 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/tests/namespaces/tst7.out 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/tests/plugins/Makefile.am
===================================================================
--- packages/libxslt/branches/upstream/current/tests/plugins/Makefile.am 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/tests/plugins/Makefile.am 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/tests/plugins/Makefile.in
===================================================================
--- packages/libxslt/branches/upstream/current/tests/plugins/Makefile.in 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/tests/plugins/Makefile.in 2005-09-05 17:43:40 UTC (rev 467)
@@ -232,7 +232,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/branches/upstream/current/win32/.cvsignore
===================================================================
--- packages/libxslt/branches/upstream/current/win32/.cvsignore 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/win32/.cvsignore 2005-09-05 17:43:40 UTC (rev 467)
@@ -3,4 +3,5 @@
depends.*
int.*
bin.*
-
+*.win32
+*.win32.zip
Modified: packages/libxslt/branches/upstream/current/win32/Makefile.mingw
===================================================================
--- packages/libxslt/branches/upstream/current/win32/Makefile.mingw 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/win32/Makefile.mingw 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/win32/Makefile.msvc
===================================================================
--- packages/libxslt/branches/upstream/current/win32/Makefile.msvc 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/win32/Makefile.msvc 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/win32/configure.js
===================================================================
--- packages/libxslt/branches/upstream/current/win32/configure.js 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/win32/configure.js 2005-09-05 17:43:40 UTC (rev 467)
@@ -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/branches/upstream/current/xsltproc/xsltproc.c
===================================================================
--- packages/libxslt/branches/upstream/current/xsltproc/xsltproc.c 2005-09-05 17:42:20 UTC (rev 466)
+++ packages/libxslt/branches/upstream/current/xsltproc/xsltproc.c 2005-09-05 17:43:40 UTC (rev 467)
@@ -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