lib/libxslt
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxslt synced 2025-07-29 15:41:13 +03:00
Code Activity

applied patch from Roumen Petrov for bug #124539 when building outside the

Browse Source 
* configure.in python/Makefile.am python/tests/Makefile.am: applied
  patch from Roumen Petrov for bug #124539 when building outside the
  source directory
* libxslt/xsltutils.c: fixed the way to grab the line number from
  the document, use the predefiend libxml2 API which mate it work
  with both 2.5.x and 2.6.x
Daniel
This commit is contained in:
Daniel Veillard
2003-10-28 14:33:17 +00:00
parent d09eebaf56
commit db3d2b48e8
6 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Tue Oct 28 15:30:54 CET 2003 Daniel Veillard <daniel@veillard.com>
* configure.in python/Makefile.am python/tests/Makefile.am: applied
patch from Roumen Petrov for bug #124539 when building outside the
source directory
* libxslt/xsltutils.c: fixed the way to grab the line number from
the document, use the predefiend libxml2 API which mate it work
with both 2.5.x and 2.6.x
Mon Oct 27 08:57:43 HKT 2003 William Brack <wbrack@mmm.com.hk> Mon Oct 27 08:57:43 HKT 2003 William Brack <wbrack@mmm.com.hk>
* libxslt/xslt.c: put in #undef for IS_BLANK macros to fix * libxslt/xslt.c: put in #undef for IS_BLANK macros to fix

5
configure.in
View File

@ -304,6 +304,7 @@ AC_ARG_WITH(libxml-src,
[ --with-libxml-src=[DIR] For libxml thats not installed yet (sets all three above)], [ --with-libxml-src=[DIR] For libxml thats not installed yet (sets all three above)],
LIBXML_SRC="$withval" LIBXML_SRC="$withval"
) )
AC_SUBST(LIBXML_SRC)
dnl dnl
dnl where is xml2-config dnl where is xml2-config
@ -440,8 +441,10 @@ dnl for the spec file
RELDATE=`date +'%a %b %e %Y'` RELDATE=`date +'%a %b %e %Y'`
AC_SUBST(RELDATE) AC_SUBST(RELDATE)
( cd $srcdir
rm -f COPYING.LIB COPYING rm -f COPYING.LIB COPYING
ln -s Copyright COPYING $LN_S Copyright COPYING
)
AC_OUTPUT([ AC_OUTPUT([

13
libxslt/xsltutils.c
View File

@ -415,18 +415,7 @@ xsltPrintErrorContext(xsltTransformContextPtr ctxt,
file = doc->URL; file = doc->URL;
} else { } else {
/* line = xmlGetLineNo(node);
* Try to find contextual informations to report
*/
if (node->type == XML_ELEMENT_NODE) {
line = (int) node->content;
} else if ((node->prev != NULL) &&
(node->prev->type == XML_ELEMENT_NODE)) {
line = (int) node->prev->content;
} else if ((node->parent != NULL) &&
(node->parent->type == XML_ELEMENT_NODE)) {
line = (int) node->parent->content;
}
if ((node->doc != NULL) && (node->doc->URL != NULL)) if ((node->doc != NULL) && (node->doc->URL != NULL))
file = node->doc->URL; file = node->doc->URL;
if (node->name != NULL) if (node->name != NULL)

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.34" #define LIBXSLT_DOTTED_VERSION "1.0.33"
/** /**
* 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 10034 #define LIBXSLT_VERSION 10033
/** /**
* 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 "10034" #define LIBXSLT_VERSION_STRING "10033"
/** /**
* WITH_XSLT_DEBUG: * WITH_XSLT_DEBUG:

5
python/Makefile.am
View File

@ -7,7 +7,8 @@ INCLUDES = \
-I$(PYTHON_INCLUDES) \ -I$(PYTHON_INCLUDES) \
$(LIBXML_CFLAGS) \ $(LIBXML_CFLAGS) \
-I$(top_srcdir)/libxslt \ -I$(top_srcdir)/libxslt \
-I$(top_srcdir) -I$(top_srcdir) \
-I../libexslt
DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION) DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)
# libxsltclass.txt is generated # libxsltclass.txt is generated
@ -46,7 +47,7 @@ install-data-local:
@INSTALL@ -m 0644 libxslt.py $(DESTDIR)$(pythondir) @INSTALL@ -m 0644 libxslt.py $(DESTDIR)$(pythondir)
$(mkinstalldirs) $(DESTDIR)$(DOCS_DIR) $(mkinstalldirs) $(DESTDIR)$(DOCS_DIR)
@(for doc in $(DOCS) ; \ @(for doc in $(DOCS) ; \
do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done) do @INSTALL@ -m 0644 $(srcdir)/$$doc $(DESTDIR)$(DOCS_DIR) ; done)
GENERATE = generator.py GENERATE = generator.py
API_DESC = $(top_srcdir)/doc/libxslt-api.xml $(srcdir)/libxslt-python-api.xml API_DESC = $(top_srcdir)/doc/libxslt-api.xml $(srcdir)/libxslt-python-api.xml

8
python/tests/Makefile.am
View File

@ -17,8 +17,10 @@ EXTRA_DIST = $(TESTSPY) $(XMLS) $(EXTRAS)
if WITH_PYTHON if WITH_PYTHON
tests: $(TESTSPY) tests: $(TESTSPY)
-@(PYTHONPATH="..:../.libs:$(srcdir)/.." ; export PYTHONPATH; \ -@(PYTHONPATH="`pwd`/..:`pwd`/../.libs:$(srcdir)/.."; \
for test in $(TESTSPY) ; do echo "-- $$test" ; $(PYTHON) $(srcdir)/$$test ; done) if test "x$(LIBXML_SRC)" != "x" ; then PYTHONPATH="$$PYTHONPATH:$(LIBXML_SRC)/python:$(LIBXML_SRC)/python/.libs"; fi; \
export PYTHONPATH; \
for test in $(TESTSPY) ; do echo "-- $$test" ; (cd $(srcdir) && $(PYTHON) $$test ); done)
else else
tests: tests:
endif endif
@ -29,5 +31,5 @@ clean:
install-data-local: install-data-local:
$(mkinstalldirs) $(DESTDIR)$(EXAMPLE_DIR) $(mkinstalldirs) $(DESTDIR)$(EXAMPLE_DIR)
-(for test in $(TESTSPY) $(XMLS) $(EXTRAS); \ -(for test in $(TESTSPY) $(XMLS) $(EXTRAS); \
do @INSTALL@ -m 0644 $$test $(DESTDIR)$(EXAMPLE_DIR) ; done) do @INSTALL@ -m 0644 $(srcdir)/$$test $(DESTDIR)$(EXAMPLE_DIR) ; done)