lib/libxslt
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxslt synced 2025-08-07 10:42:55 +03:00
Code Activity

some cleanup and trial for the upcoming 1.1.0 release this release removes

Browse Source 
* Makefile.am configure.in libxslt.spec.in doc/libxslt-api.xml
  libxslt/xslt.h libxslt/xsltwin32config.h: some cleanup and trial
  for the upcoming 1.1.0 release
* breakpoint/*: this release removes the deprecated breakpoint library
Daniel
This commit is contained in:
Daniel Veillard
2003-11-02 09:53:42 +00:00
parent a083b0b03e
commit d88c798e1e
10 changed files with 31 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
Sun Nov 2 10:51:58 CET 2003 Daniel Veillard <daniel@veillard.com>
* Makefile.am configure.in libxslt.spec.in doc/libxslt-api.xml
libxslt/xslt.h libxslt/xsltwin32config.h: some cleanup and trial
for the upcoming 1.1.0 release
* breakpoint/*: this release removes the deprecated breakpoint library
Sat Nov 1 17:04:27 PST 2003 William Brack <wbrack@mmm.com.hk> Sat Nov 1 17:04:27 PST 2003 William Brack <wbrack@mmm.com.hk>
* libxslt/transform.c, tests/general/bug-119.out: fixed * libxslt/transform.c, tests/general/bug-119.out: fixed

14
Makefile.am
View File

@@ -1,14 +1,3 @@
## 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 = \ SUBDIRS = \
libxslt \ libxslt \
libexslt \ libexslt \
@@ -16,9 +5,8 @@ SUBDIRS = \
doc \ doc \
@PYTHON_SUBDIR@ \ @PYTHON_SUBDIR@ \
tests tests
endif
DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests breakpoint DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests
confexecdir=$(libdir) confexecdir=$(libdir)
confexec_DATA = xsltConf.sh confexec_DATA = xsltConf.sh

2
breakpoint/.cvsignore
View File

@@ -1,2 +0,0 @@
Makefile
Makefile.in

17
breakpoint/Makefile.am
View File

@@ -1,17 +0,0 @@
INCLUDES = -I$(top_srcdir) -I$(top_builddir)/libxslt -I$(top_srcdir)/libxslt $(LIBXML_CFLAGS)
lib_LTLIBRARIES = libxsltbreakpoint.la
libxsltbreakpoint_la_SOURCES = \
deprecated.c
libxsltbreakpoint_la_LIBADD =
libxsltbreakpoint_la_LDFLAGS = -version-info @LIBXSLTBREAK_VERSION_INFO@
clean:
rm -f *.lo
rm -f *.o
rm -rf .libs
rm -f *.la

462
breakpoint/deprecated.c
View File

@@ -1,462 +0,0 @@
/*
* deprecated.c: remains of the now deprecated libxsltbreakpoint.so.1
* shared library
*
* See Copyright for the status of this software.
*
* (C) 2001 by Keith Isdale
* k_isdale@tpg.com.au
* daniel@veillard.com
*/
#include "config.h"
#include "libxslt/xsltutils.h"
int xslDebugStatus = 0;
int xslActiveBreakPoint(void);
int xslSetActiveBreakPoint(int breakPointNumber);
int xslAddBreakPoint(const xmlChar * url, long lineNumber,
const xmlChar * templateName, int type);
int xslDeleteBreakPoint(int breakPointNumber);
int xslEnableBreakPoint(int breakPointNumber, int enable);
int xslIsBreakPointEnabled(int breakPointNumber);
int xslBreakPointCount(void);
void *xslGetBreakPoint(int breakPointNumber);
int xslPrintBreakPoint(FILE * file, int breakPointNumber);
int xslIsBreakPoint(const xmlChar * url, long lineNumber);
int xslIsBreakPointNode(xmlNodePtr node);
void *xslAddCallInfo(const xmlChar * templateName, const xmlChar * url);
int xslAddCall(xsltTemplatePtr templ, xmlNodePtr source);
void xslDropCall(void);
int xslStepupToDepth(int depth);
int xslStepdownToDepth(int depth);
void *xslGetCall(int depth);
void *xslGetCallStackTop(void);
int xslCallDepth(void);
void xslDebugInit(void);
void xslDebugFree(void);
void xslDebugBreak(xmlNodePtr templ, xmlNodePtr node, xsltTemplatePtr root,
xsltTransformContextPtr ctxt);
int xslDebugGotControl(int reached);
xmlNodePtr xslFindTemplateNode(xsltStylesheetPtr style,
const xmlChar * name);
xmlNodePtr xslFindNodeByLineNo(xsltTransformContextPtr ctxt,
const xmlChar * url, long lineNumber);
int xslFindBreakPointById(int id);
int xslFindBreakPointByLineNo(const xmlChar * url, long lineNumber);
int xslFindBreakPointByName(const xmlChar * templateName);
/**
* xslActiveBreakPoint(void);
*
* DEPRECATED
*
* Returns 0
*/
int
xslActiveBreakPoint(void)
{
return 0;
}
/**
* xslSetActiveBreakPoint:
* @breakPointNumber : 0 < breakPointNumber <= xslBreakPointCount(void)
*
* DEPRECATED
*
* Returns 0
*/
int
xslSetActiveBreakPoint(int breakPointNumber ATTRIBUTE_UNUSED)
{
return 0;
}
/**
* xslAddBreakPoint:
* @url : url non-null, non-empty file name that has been loaded by
* debugger
* @lineNumber : number >= 0 and is available in url specified and points to
* an xml element
* @temlateName : the template name of breakpoint or NULL
* @type : DEBUG_BREAK_SOURCE if are we stopping at a xsl source line
* DEBUG_BREAK_DATA otherwise
*
*
* DEPRECATED
*
* Returns 0
*/
int
xslAddBreakPoint(const xmlChar * url ATTRIBUTE_UNUSED,
long lineNumber ATTRIBUTE_UNUSED,
const xmlChar * templateName ATTRIBUTE_UNUSED,
int type ATTRIBUTE_UNUSED)
{
return 0;
}
/**
* xslDeleteBreakPoint:
* @breakPointNumber : 0 < breakPointNumber <= xslBreakPointCount(void)
*
* DEPRECATED
*
* Returns 0
*/
int
xslDeleteBreakPoint(int breakPointNumber ATTRIBUTE_UNUSED)
{
return 0;
}
/**
* xslEnableBreakPoint:
* @breakPointNumber : 0 < breakPointNumber <= xslBreakPointCount(void)
* @enable : enable break point if 1, disable if 0, toggle if -1
*
* DEPRECATED
*
* Returns 0
*/
int
xslEnableBreakPoint(int breakPointNumber ATTRIBUTE_UNUSED,
int enable ATTRIBUTE_UNUSED)
{
return 0;
}
/**
* xslIsBreakPointEnabled:
* @breakPointNumber : 0 < breakPointNumber <= xslBreakPointCount(void)
*
* DEPRECATED
*
* Returns -1
*/
int
xslIsBreakPointEnabled(int breakPointNumber ATTRIBUTE_UNUSED)
{
return -1;
}
/**
* xslBreakPointCount:
*
* Return the number of breakpoints present
*/
int
xslBreakPointCount(void)
{
return 0;
}
/**
* xslGetBreakPoint:
* @breakPointNumber : 0 < breakPointNumber <= xslBreakPointCount(void)
*
* DEPRECATED
*
* Returns NULL
*/
void *
xslGetBreakPoint(int breakPointNumber ATTRIBUTE_UNUSED)
{
return NULL;
}
/**
* xslPrintBreakPoint:
* @file : file != NULL
* @breakPointNumber : 0 < breakPointNumber <= xslBreakPointCount(void)
*
* DEPRECATED
*
* Returns 0
*/
int
xslPrintBreakPoint(FILE * file ATTRIBUTE_UNUSED,
int breakPointNumber ATTRIBUTE_UNUSED)
{
return 0;
}
/**
* xslIsBreakPoint:
* @url : url non-null, non-empty file name that has been loaded by debugger
* @lineNumber : number >= 0 and is available in url specified
*
* DEPRECATED
*
* Returns 0
*/
int
xslIsBreakPoint(const xmlChar * url ATTRIBUTE_UNUSED,
long lineNumber ATTRIBUTE_UNUSED)
{
xsltGenericError(xsltGenericErrorContext,
"Error!: Debugger function 'xslIsBreakPoint' not overloaded\n");
return 0;
}
/**
* xslIsBreakPointNode:
* @node : node != NULL
*
* DEPRECATED
*
* Returns: 0
*/
int
xslIsBreakPointNode(xmlNodePtr node ATTRIBUTE_UNUSED)
{
return 0;
}
/**
* xslAddCallInfo:
* @templateName : template name to add
* @url : url for templateName
*
* DEPRECATED
*
* Returns NULL
*/
void *
xslAddCallInfo(const xmlChar * templateName ATTRIBUTE_UNUSED,
const xmlChar * url ATTRIBUTE_UNUSED)
{
return NULL;
}
/**
* xslAddCall:
* @templ : current template being applied
* @source : the source node being processed
*
* DEPRECATED
*
* Returns 0
*/
int
xslAddCall(xsltTemplatePtr templ ATTRIBUTE_UNUSED,
xmlNodePtr source ATTRIBUTE_UNUSED)
{
return 0;
}
/**
* xslDropCall :
*
* DEPRECATED
*/
void
xslDropCall(void)
{
}
/**
* xslStepupToDepth :
* @depth :the frame depth to step up to
*
* DEPRECATED
*
* Returns 0
*/
int
xslStepupToDepth(int depth ATTRIBUTE_UNUSED)
{
return 0;
}
/**
* xslStepdownToDepth :
* @depth : the frame depth to step down to
*
* DEPRECATED
*
* Returns 0
*/
int
xslStepdownToDepth(int depth ATTRIBUTE_UNUSED)
{
return 0;
}
/**
* xslGetCall :
* @depth : 0 < depth <= xslCallDepth(void)
*
* DEPRECATED
*
* Return NULL
*/
void *
xslGetCall(int depth ATTRIBUTE_UNUSED)
{
return NULL;
}
/**
* xslGetCallStackTop :
*
* DEPRECATED
*
* Returns NULL
*/
void *
xslGetCallStackTop(void)
{
return NULL;
}
/**
* xslCallDepth :
*
* DEPRECATED
*
* Returns 0
*/
int
xslCallDepth(void)
{
return 0;
}
/**
* xslDebugInit :
*
* DEPRECATED
*/
void
xslDebugInit(void)
{
}
/**
* xslDebugFree :
*
* Free up any memory taken by debugging
*/
void
xslDebugFree(void)
{
}
/**
* xslDebugBreak:
* @templ : The source node being executed
* @node : The data node being processed
* @root : The template being applide to "node"
* @ctxt : stylesheet being processed
*
* DEPRECATED
*/
void
xslDebugBreak(xmlNodePtr templ ATTRIBUTE_UNUSED,
xmlNodePtr node ATTRIBUTE_UNUSED,
xsltTemplatePtr root ATTRIBUTE_UNUSED,
xsltTransformContextPtr ctxt ATTRIBUTE_UNUSED)
{
}
/**
* xslDebugGotControl :
* @reached : true if debugger has received control
*
* DEPRECATED
* Returns 0
*/
int
xslDebugGotControl(int reached ATTRIBUTE_UNUSED)
{
return 0;
}
/**
* xslFindTemplateNode:
* @style : valid stylesheet collection context to look into
* @name : template name to look for
*
* DEPRECATED
*
* Returns NULL
*/
xmlNodePtr
xslFindTemplateNode(xsltStylesheetPtr style ATTRIBUTE_UNUSED,
const xmlChar * name ATTRIBUTE_UNUSED)
{
return NULL;
}
/**
* xslFindBreakPointByLineNo:
* @ctxt : valid ctxt to look into
* @url : url non-null, non-empty file name that has been loaded by
* debugger
* @lineNumber : number >= 0 and is available in url specified
*
* DEPRECATED
*
* Returns NULL
*/
xmlNodePtr
xslFindNodeByLineNo(xsltTransformContextPtr ctxt ATTRIBUTE_UNUSED,
const xmlChar * url ATTRIBUTE_UNUSED,
long lineNumber ATTRIBUTE_UNUSED)
{
return NULL;
}
/**
* xslFindBreakPointById:
* @id : The break point id to look for
*
* DEPRECATED
*
* Returns 0
*/
int
xslFindBreakPointById(int id ATTRIBUTE_UNUSED)
{
return 0;
}
/**
* xslFindBreakPointByLineNo:
* @url : a valid url that has been loaded by debugger
* @lineNumber : lineNumber >= 0 and is available in url specified
*
* DEPRECATED
*
* Returns 0
*/
int
xslFindBreakPointByLineNo(const xmlChar * url ATTRIBUTE_UNUSED,
long lineNumber ATTRIBUTE_UNUSED)
{
return 0;
}
/**
* xslFindBreakPointByName:
* @templateName : template name to look for
*
* DEPRECATED
*
* Returns 0
*/
int
xslFindBreakPointByName(const xmlChar * templateName ATTRIBUTE_UNUSED)
{
return 0;
}

37
configure.in
View File

@@ -5,13 +5,13 @@ dnl libxslt is the main part of the package
dnl libexslt is an extension dnl libexslt is an extension
dnl dnl
LIBXSLT_MAJOR_VERSION=1 LIBXSLT_MAJOR_VERSION=1
LIBXSLT_MINOR_VERSION=0 LIBXSLT_MINOR_VERSION=1
LIBXSLT_MICRO_VERSION=33 LIBXSLT_MICRO_VERSION=0
PACKAGE=libxslt PACKAGE=libxslt
LIBEXSLT_MAJOR_VERSION=0 LIBEXSLT_MAJOR_VERSION=0
LIBEXSLT_MINOR_VERSION=7 LIBEXSLT_MINOR_VERSION=8
LIBEXSLT_MICRO_VERSION=22 LIBEXSLT_MICRO_VERSION=0
LIBXML_REQUIRED_VERSION=2.5.10 LIBXML_REQUIRED_VERSION=2.6.0
LIBXSLT_VERSION=$LIBXSLT_MAJOR_VERSION.$LIBXSLT_MINOR_VERSION.$LIBXSLT_MICRO_VERSION LIBXSLT_VERSION=$LIBXSLT_MAJOR_VERSION.$LIBXSLT_MINOR_VERSION.$LIBXSLT_MICRO_VERSION
@@ -42,31 +42,6 @@ AC_SUBST(LIBEXSLT_VERSION)
AC_SUBST(LIBEXSLT_VERSION_INFO) AC_SUBST(LIBEXSLT_VERSION_INFO)
AC_SUBST(LIBEXSLT_VERSION_NUMBER) AC_SUBST(LIBEXSLT_VERSION_NUMBER)
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} VERSION=${LIBXSLT_VERSION}
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
@@ -270,7 +245,6 @@ else
WITH_DEBUGGER=1 WITH_DEBUGGER=1
AC_DEFINE(WITH_DEBUGGER) AC_DEFINE(WITH_DEBUGGER)
fi fi
AM_CONDITIONAL(WITH_DEBUGGER, test "${WITH_DEBUGGER}" = "1")
AC_SUBST(WITH_DEBUGGER) AC_SUBST(WITH_DEBUGGER)
dnl dnl
@@ -453,7 +427,6 @@ libxslt.pc
libxslt/Makefile libxslt/Makefile
libxslt/xsltconfig.h libxslt/xsltconfig.h
libxslt/xsltwin32config.h libxslt/xsltwin32config.h
breakpoint/Makefile
libexslt/Makefile libexslt/Makefile
libexslt/exsltconfig.h libexslt/exsltconfig.h
xsltproc/Makefile xsltproc/Makefile

4
doc/libxslt-api.xml
View File

@@ -341,6 +341,7 @@
<exports symbol='XSLT_DEFAULT_VENDOR'/> <exports symbol='XSLT_DEFAULT_VENDOR'/>
<exports symbol='XSLT_DEFAULT_VERSION'/> <exports symbol='XSLT_DEFAULT_VERSION'/>
<exports symbol='XSLT_NAMESPACE'/> <exports symbol='XSLT_NAMESPACE'/>
<exports symbol='XSLT_PARSE_OPTIONS'/>
<exports symbol='xsltCleanupGlobals'/> <exports symbol='xsltCleanupGlobals'/>
<exports symbol='xsltEngineVersion'/> <exports symbol='xsltEngineVersion'/>
<exports symbol='xsltLibxmlVersion'/> <exports symbol='xsltLibxmlVersion'/>
@@ -439,6 +440,9 @@
<macro name='XSLT_NORM_SAXON_NAMESPACE' file='extra'> <macro name='XSLT_NORM_SAXON_NAMESPACE' file='extra'>
<info>This is Norm&apos;s namespace for SAXON extensions.</info> <info>This is Norm&apos;s namespace for SAXON extensions.</info>
</macro> </macro>
<macro name='XSLT_PARSE_OPTIONS' file='xslt'>
<info>The set of options to pass to an xmlReadxxx when loading files for XSLT consumption.</info>
</macro>
<macro name='XSLT_PAT_NO_PRIORITY' file='xsltInternals'> <macro name='XSLT_PAT_NO_PRIORITY' file='xsltInternals'>
<info>Specific value for pattern without priority expressed.</info> <info>Specific value for pattern without priority expressed.</info>
</macro> </macro>

15
libxslt.spec.in
View File

@@ -7,8 +7,8 @@ Group: Development/Libraries
Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}.tar.gz Source: ftp://xmlsoft.org/XSLT/libxslt-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
URL: http://xmlsoft.org/XSLT/ URL: http://xmlsoft.org/XSLT/
Requires: libxml2 >= 2.5.10 Requires: libxml2 >= @LIBXML_REQUIRED_VERSION@
BuildRequires: libxml2-devel >= 2.5.10 BuildRequires: libxml2-devel >= @LIBXML_REQUIRED_VERSION@
BuildRequires: python python-devel BuildRequires: python python-devel
BuildRequires: libxml2-python BuildRequires: libxml2-python
Prefix: %{_prefix} Prefix: %{_prefix}
@@ -17,7 +17,7 @@ Docdir: %{_docdir}
%description %description
This C library allows to transform XML files into other XML files This C library allows to transform XML files into other XML files
(or HTML, text, ...) using the standard XSLT stylesheet transformation (or HTML, text, ...) using the standard XSLT stylesheet transformation
mechanism. To use it you need to have a version of libxml2 >= 2.5.6 mechanism. To use it you need to have a version of libxml2 >= @LIBXML_REQUIRED_VERSION@
installed. The xsltproc command is a command line interface to the XSLT engine installed. The xsltproc command is a command line interface to the XSLT engine
%package devel %package devel
@@ -29,14 +29,15 @@ Requires: libxml2-devel >= 2.5.6
%description devel %description devel
This C library allows to transform XML files into other XML files This C library allows to transform XML files into other XML files
(or HTML, text, ...) using the standard XSLT stylesheet transformation (or HTML, text, ...) using the standard XSLT stylesheet transformation
mechanism. To use it you need to have a version of libxml2 >= 2.5.6 mechanism. To use it you need to have a version of libxml2 >= @LIBXML_REQUIRED_VERSION@
installed. installed.
%package python %package python
Summary: Python bindings for the libxslt library Summary: Python bindings for the libxslt library
Group: Development/Libraries Group: Development/Libraries
Requires: libxslt = %{version} Requires: libxslt = %{version}
Requires: libxml2 >= 2.5.6 Requires: libxml2 >= @LIBXML_REQUIRED_VERSION@
Requires: libxml2-python >= @LIBXML_REQUIRED_VERSION@
Requires: python Requires: python
%description python %description python
@@ -111,6 +112,10 @@ rm -fr %{buildroot}
* @RELDATE@ Daniel Veillard <veillard@redhat.com> * @RELDATE@ Daniel Veillard <veillard@redhat.com>
- upstream release @VERSION@ see http://xmlsoft.org/XSLT/news.html - upstream release @VERSION@ see http://xmlsoft.org/XSLT/news.html
* Sun Nov 2 2003 Daniel Veillard <veillard@redhat.com>
- cleanup, removal of the deprecated breakpoint library and
automated libxml2 dependancy level in the generated spec file.
* Wed Oct 23 2002 Daniel Veillard <veillard@redhat.com> * Wed Oct 23 2002 Daniel Veillard <veillard@redhat.com>
- revamped the spec file, cleaned up some rpm building problems - revamped the spec file, cleaned up some rpm building problems

1
libxslt/xslt.h
View File

@@ -54,6 +54,7 @@ extern "C" {
#define XSLT_PARSE_OPTIONS \ #define XSLT_PARSE_OPTIONS \
XML_PARSE_NOENT | XML_PARSE_DTDLOAD | XML_PARSE_DTDATTR | XML_PARSE_NOCDATA XML_PARSE_NOENT | XML_PARSE_DTDLOAD | XML_PARSE_DTDATTR | XML_PARSE_NOCDATA
#endif #endif
/** /**
* xsltMaxDepth: * xsltMaxDepth:
* *

6
libxslt/xsltwin32config.h
View File

@@ -21,21 +21,21 @@ extern "C" {
* *
* the version string like "1.2.3" * the version string like "1.2.3"
*/ */
#define LIBXSLT_DOTTED_VERSION "1.0.33" #define LIBXSLT_DOTTED_VERSION "1.1.0"
/** /**
* LIBXSLT_VERSION: * LIBXSLT_VERSION:
* *
* the version number: 1.2.3 value is 1002003 * the version number: 1.2.3 value is 1002003
*/ */
#define LIBXSLT_VERSION 10033 #define LIBXSLT_VERSION 10100
/** /**
* LIBXSLT_VERSION_STRING: * LIBXSLT_VERSION_STRING:
* *
* the version number string, 1.2.3 value is "1002003" * the version number string, 1.2.3 value is "1002003"
*/ */
#define LIBXSLT_VERSION_STRING "10033" #define LIBXSLT_VERSION_STRING "10100"
/** /**
* WITH_XSLT_DEBUG: * WITH_XSLT_DEBUG: