1
0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-26 00:37:43 +03:00
Commit Graph

69 Commits

Author SHA1 Message Date
Daniel Richard G
5d6c02ba61 Various "make distcheck" and portability fixups 2nd part
doc/examples/Makefile.am:

* Use $(VAR), not @VAR@

* Use $(MKDIR_P) instead of $(mkinstalldirs), as the latter is an
* obsolete
  name

* Added $(srcdir) qualification to the various test program invocations
* in
  the "tests" target. More work is needed here (notably, when the
  reference output contains the path to the input file), but this gets
  things a lot closer to working correctly in an out-of-source build.

doc/examples/reader4.res:

* Added "./" path qualifiers so that the reader4 test continues to pass
  cleanly for in-source builds

python/tests/Makefile.am:

* Symlink in test input files for out-of-source builds
2012-08-07 10:05:34 +08:00
Daniel Richard G
5706b6d876 Various "make distcheck" and portability fixups
Makefile.am:

* Don't use @VAR@, use $(VAR). Autoconf's AC_SUBST provides us the Make
   variable, it allows overriding the value at the command line, and
   (notably) it avoids a Make parse error in the libxml2_la_LDFLAGS
   assignment when @MODULE_PLATFORM_LIBS@ is empty

* Changed how the THREADS_W32 mechanism switches the build between
   testThreads.c and testThreadsWin32.c as appropriate; using AM_CONDITIONAL
   allows this to work cleanly and plays well with dependencies

* testapi.c should be specified as BUILT_SOURCES

* Create symlinks to the test/ and result/ subdirs so that the runtests
   target is usable in out-of-source-tree builds

* Don't do MAKEFLAGS+=--silent as this is not portable to non-GNU Makes

* Fixed incorrect find(1) syntax in the "cleanup" rule, and doing "rm -f"
   instead of just "rm" is good form

* (DIST)CLEANFILES needed a bit more coverage to allow "make distcheck" to
   pass

configure.in:

* Need AC_PROG_LN_S to create test/ and result/ symlinks in Makefile.am

* AC_LIBTOOL_WIN32_DLL and AM_PROG_LIBTOOL are obsolete; these have been
   superceded by LT_INIT

* Don't rebuild docs by default, as this requires GNU Make (as
   implemented)

* Check for uint32_t as some platforms don't provide it

* Check for some more functions, and undefine HAVE_MMAP if we don't also
   HAVE_MUNMAP (one system I tested on actually needed this)

* Changed THREADS_W32 from a filename insert into an Automake conditional

* The "Copyright" file will not be in the current directory if builddir !=
   srcdir

doc/Makefile.am:

* EXTRA_DIST cannot use wildcards when they refer to generated files; this
   breaks dependencies. What I did was define EXTRA_DIST_wc, which uses GNU
   Make $(wildcard) directives to build up a list of files, and EXTRA_DIST,
   as a literal expansion of EXTRA_DIST_wc. I also added a new rule,
   "check-extra-dist", to simplify checking that the two variables are
   equivalent. (Note that this works only when builddir == srcdir)

   (I can implement this differently if desired; this is just one way of
   doing it)

* Don't define an "all" target; this steps on Automake's toes

* Fixed up the "libxml2-api.xml ..." rule by using $(wildcard) for
   dependencies (as Make doesn't process the wildcards otherwise) and
   qualifying appropriate files with $(srcdir)

   (Note that $(srcdir) is not needed in the dependencies, thanks to VPATH,
   which we can count on as this is GNU-Make-only code anyway)

doc/devhelp/Makefile.am:

* Qualified appropriate files with $(srcdir)

* Added an "uninstall-local" rule so that "make distcheck" passes

doc/examples/Makefile.am:

* Rather than use a wildcard that doesn't work, use a substitution that
   most Make programs can handle

doc/examples/index.py:

* Do the same here

include/libxml/nanoftp.h:

* Some platforms (e.g. MSVC 6) already #define INVALID_SOCKET:

     user@host:/cygdrive/c/Program Files/Microsoft Visual Studio/VC98/\
     Include$ grep -R INVALID_SOCKET .
     ./WINSOCK.H:#define INVALID_SOCKET  (SOCKET)(~0)
     ./WINSOCK2.H:#define INVALID_SOCKET  (SOCKET)(~0)

include/libxml/xmlversion.h.in:

* Support ancient GCCs (I was actually able to build the library with 2.5
   but for this bit)

python/Makefile.am:

* Expanded CLEANFILES to allow "make distcheck" to pass

python/tests/Makefile.am:

* Define CLEANFILES instead of a "clean" rule, and added tmp.xml to allow
   "make distcheck" to pass

testRelax.c:

* Use HAVE_MMAP instead of the less explicit HAVE_SYS_MMAN_H (as some
   systems have the header but not the function)

testSchemas.c:

* Use HAVE_MMAP instead of the less explicit HAVE_SYS_MMAN_H

testapi.c:

* Don't use putenv() if it's not available

threads.c:

* This fixes the following build error on Solaris 8:

     libtool: compile:  cc -DHAVE_CONFIG_H -I. -I./include -I./include \
     -D_REENTRANT -D__EXTENSIONS__ -D_REENTRANT -Dsparc -Xa -mt -v \
     -xarch=v9 -xcrossfile -xO5 -c threads.c  -KPIC -DPIC -o threads.o
     "threads.c", line 442: controlling expressions must have scalar type
     "threads.c", line 512: controlling expressions must have scalar type
     cc: acomp failed for threads.c
     *** Error code 1

trio.c:

* Define isascii() if the system doesn't provide it

trio.h:

* The trio library's HAVE_CONFIG_H header is not the same as LibXML2's
   HAVE_CONFIG_H header; this change is needed to avoid a double-inclusion

win32/configure.js:

* Added support for the LZMA compression option

win32/Makefile.{bcb,mingw,msvc}:

* Added appropriate bits to support WITH_LZMA=1

* Install the header files under $(INCPREFIX)\libxml2\libxml instead of
   $(INCPREFIX)\libxml, to mirror the install location on Unix+Autotools

xml2-config.in:

* @MODULE_PLATFORM_LIBS@ (usually "-ldl") needs to be in there in order for
   `xml2-config --libs` to provide a complete set of dependencies

xmllint.c:

* Use HAVE_MMAP instead of the less-explicit HAVE_SYS_MMAN_H
2012-08-06 11:32:54 +08:00
Stefan Kost
4ea1866f7d testWriter: xmlTextWriterWriteFormatElement wants an int instead of a long int
Fixes compiler warnings about wrong argument type.
2011-05-21 21:56:50 +03:00
Adrian Bunk
64b0d60c28 Switch from the obsolete mkinstalldirs to AC_PROG_MKDIR_P
This was obsoleted in 2005 so we should be safe.
But keep AC_PREREQ to 2.59 as it's still widely deployed.
2010-11-04 09:43:31 +01:00
Daniel Veillard
bccae2d210 * c14n.c debugXML.c doc/examples/io2.c parser.c schematron.c
valid.c xmlschemas.c xmlwriter.c xpath.c: use %s to printf string
  patch by Christian Persch, fixes #581612
2009-06-04 11:22:45 +02:00
Daniel Veillard
b40744e3e4 patch from Adrian Bunk which adds --disable-rebuild-docs to avoid
* configure.in doc/Makefile.am: patch from Adrian Bunk which
  adds --disable-rebuild-docs to avoid rebuilding them
daniel

svn path=/trunk/; revision=3801
2008-10-17 13:26:44 +00:00
Daniel Veillard
28b7b4bd80 regenerated Daniel
* doc/* testapi.c: regenerated
Daniel

svn path=/trunk/; revision=3786
2008-08-30 08:19:02 +00:00
Daniel Veillard
4cc67bb77e patch from Robert Schwebel , allows to compile the example if configured
* doc/examples/reader3.c: patch from  Robert Schwebel , allows to
  compile the example if configured without output support fixes
  #545582
* Makefile.am: add testrecurse to the make check tests
* HTMLparser.c: if the parser got a encoding argument it should be
  used over what the meta specifies, patch fixing #536346
Daniel

svn path=/trunk/; revision=3785
2008-08-29 19:58:23 +00:00
Daniel Veillard
cba68396ac a couple more fixes patch from Andreas Färber to compile on Haiku
* parser.c: a couple more fixes
* nanohttp.c nanoftp.c: patch from Andreas Färber  to compile on Haiku
* doc/examples/*: regenerated
daniel

svn path=/trunk/; revision=3784
2008-08-29 12:43:40 +00:00
Daniel Veillard
851b2d0ee5 regenerated, it was truncated. Daniel
* doc/examples/examples.xml: regenerated, it was truncated.
Daniel

svn path=/trunk/; revision=3690
2008-02-08 10:57:57 +00:00
Daniel Veillard
aa2404e92e apply patch from Fred Crozat to avoid outputting -L/usr/lib from
* xml2-config.in: apply patch from Fred Crozat to avoid
  outputting -L/usr/lib from xml2-config, fixes #497012
Daniel

svn path=/trunk/; revision=3672
2008-01-11 06:44:00 +00:00
Daniel Veillard
cb4284e296 applied patch from Richard Jones to for the silent flag on valgrind when
* xstc/Makefile.am doc/examples/Makefile.am Makefile.am: applied
  patch from Richard Jones to for the silent flag on valgrind
  when doing "make valgrind"
* xmlregexp.c: raise a regexp error when '\' is misused to escape
  a standard character.
Daniel

svn path=/trunk/; revision=3606
2007-04-25 13:55:20 +00:00
Daniel Veillard
28aac0b0f4 remove a warning check with uppercase for AIX iconv() should fix #352644
* HTMLparser.c: remove a warning
* encoding.c: check with uppercase for AIX iconv() should fix #352644
* doc/examples/Makefile.am: partially handle one bug report
Daniel
2006-10-16 08:31:18 +00:00
Daniel Veillard
6795260135 upated the news regenerated the docs, preparing for release of 2.6.23
* NEWS configure.in libxml.spec.in testapi.c doc/*: upated the news
  regenerated the docs, preparing for release of 2.6.23
* pattern.c xmlschemas.c: fixed some comments
Daniel
2006-01-05 15:29:44 +00:00
Daniel Veillard
5d4644ef6e revamped the elfgcchack.h format to cope with gcc4 change of aliasing
* doc/apibuild.py doc/elfgcchack.xsl: revamped the elfgcchack.h
  format to cope with gcc4 change of aliasing allowed scopes, had
  to add extra informations to doc/libxml2-api.xml to separate
  the header from the c module source.
* *.c: updated all c library files to add a #define bottom_xxx
  and reimport elfgcchack.h thereafter, and a bit of cleanups.
* doc//* testapi.c: regenerated when rebuilding the API
Daniel
2005-04-01 13:11:58 +00:00
Daniel Veillard
ff4c1852e9 second patch from Rick Jones, portability fix for HP-UX first fix from
* xmlmodule.c: second patch from Rick Jones, portability fix for
  HP-UX
* doc/examples/xpath1.c doc/examples/xpath2.c: first fix from Rick Jones
  to avoid warnings.
Daniel
2005-03-10 10:37:28 +00:00
Daniel Veillard
25c90c589b try to fix a problem with valgrind. applied memory leak fix from Brent
* Makefile.am doc/examples/Makefile.am python/tests/Makefile.am
  xstc/Makefile.am: try to fix a problem with valgrind.
* python/generator.py python/libxml.c python/tests/Makefile.am
  python/tests/tstmem.py: applied memory leak fix from Brent Hendricks
  c.f. bug #165349
Daniel
2005-03-02 10:47:41 +00:00
Daniel Veillard
9186a1fdb6 fixed bug #157633 in relaxng choice optimization added regression tests
* relaxng.c: fixed bug #157633 in relaxng choice optimization
* result/relaxng/choice0* test/relaxng/choice0*: added regression
  tests about it.
* doc/*: rebuilt
* testdso.c: removed a warning due to a missing void in signature.
Daniel
2005-01-15 12:38:10 +00:00
William M. Brack
21e4ef20f6 Re-examined the problems of configuring a "minimal" library.
Synchronized the header files with the library code in order
to assure that all the various conditionals (LIBXML_xxxx_ENABLED)
were the same in both.  Modified the API database content to more
accurately reflect the conditionals.  Enhanced the generation
of that database.  Although there was no substantial change to
any of the library code's logic, a large number of files were
modified to achieve the above, and the configuration script
was enhanced to do some automatic enabling of features (e.g.
--with-xinclude forces --with-xpath).  Additionally, all the format
errors discovered by apibuild.py were corrected.
* configure.in: enhanced cross-checking of options
* doc/apibuild.py, doc/elfgcchack.xsl, doc/libxml2-refs.xml,
  doc/libxml2-api.xml, gentest.py: changed the usage of the
  <cond> element in module descriptions
* elfgcchack.h, testapi.c: regenerated with proper conditionals
* HTMLparser.c, SAX.c, globals.c, tree.c, xmlschemas.c, xpath.c,
  testSAX.c: cleaned up conditionals
* include/libxml/[SAX.h, SAX2.h, debugXML.h, encoding.h, entities.h,
  hash.h, parser.h, parserInternals.h, schemasInternals.h, tree.h,
  valid.h, xlink.h, xmlIO.h, xmlautomata.h, xmlreader.h, xpath.h]:
  synchronized the conditionals with the corresponding module code
* doc/examples/tree2.c, doc/examples/xpath1.c, doc/examples/xpath2.c:
  added additional conditions required for compilation
* doc/*.html, doc/html/*.html: rebuilt the docs
2005-01-02 09:53:13 +00:00
Daniel Veillard
c3d7cb4e58 preparing release of libxml2-2.6.16 Daniel
* NEWS configure.in doc/*: preparing release of libxml2-2.6.16
Daniel
2004-11-10 14:34:45 +00:00
Daniel Veillard
d0cf7f6eea integrated in "make tests" added -q option, and more conditional features
* Makefile.am gentest.py testapi.c: integrated in "make tests"
  added -q option, and more conditional features fixes
* catalog.c debugXML.c parser.c testThreads.c xmllint.c
  xmlschemastypes.c xmlwriter.cinclude/libxml/catalog.h
  include/libxml/debugXML.h: various compilation and conditional
  cleanups.
* doc/*: regenerated
Daniel
2004-11-09 16:17:02 +00:00
Daniel Veillard
05f9735ba3 Fixed bug #153937, making sure the conversion functions return the number
* encoding.c doc/examples/testWriter.c: Fixed bug #153937, making
  sure the conversion functions return the number of byte written.
  Had to fix one of the examples.
Daniel
2004-10-31 15:35:32 +00:00
Daniel Veillard
03a53c34db added checking for names values and dictionnaries generates a tons of
* debugXML.c include/libxml/xmlerror.h: added checking for names
  values and dictionnaries generates a tons of errors
* SAX2.ccatalog.c parser.c relaxng.c tree.c xinclude.c xmlwriter.c
  include/libxml/tree.h: fixing the errors in the regression tests
Daniel
2004-10-26 16:06:51 +00:00
William M. Brack
367df6e7e1 unlinked the internal subset within xmlValidateDtd (bug 141827) added
* valid.c: unlinked the internal subset within xmlValidateDtd
  (bug 141827)
* configure.in: added -Wall to developer's flags
* doc/examples/reader4.res: added to CVS
2004-10-23 18:14:36 +00:00
Daniel Veillard
1a380b8924 fixed a memory bug added test from Graham Bennett and regenerated the
* xmlschemas.c: fixed a memory bug
* doc/examples/reader4.c doc/examples/*: added test from Graham Bennett
  and regenerated the directory
Daniel
2004-10-21 16:00:06 +00:00
William M. Brack
cb40c222a4 changed changed sys.path setting from 'append' to 'insert' (patch supplied
* check-relaxng-test-suite.py, check-relaxng-test-suite2.py,
  check-xinclude-test-suite.py, check-xml-test-suite.py,
  check-xsddata-test-suite.py, doc/examples/index.py: changed
  changed sys.path setting from 'append' to 'insert' (patch
  supplied by Malcolm Tredinnick) (bug 153716)
2004-10-02 22:55:49 +00:00
Daniel Veillard
eb70f93ffa make the push interfaces synchronous added a specific test added the new
* parser.c: make the push interfaces synchronous
* python/tests/sync.py: added a specific test
* python/tests/Makefile.am doc/examples/Makefile.am
  doc/examples/index.py: added the new test, cleaning up
  "make tests" output
Daniel
2004-07-05 16:46:09 +00:00
Daniel Veillard
a2351322c8 hack based on Arjan van de Ven suggestion to reduce ELF footprint and
* elfgcchack.h doc/elfgcchack.xsl libxml.h: hack based on Arjan van de
  Ven suggestion to reduce ELF footprint and generated code. Based on
  aliasing of libraries function to generate direct call instead of
  indirect ones
* doc/libxml2-api.xml doc/Makefile.am doc/apibuild.py: added automatic
  generation of elfgcchack.h based on the API description, extended
  the API description to show the conditionals configuration flags
  required for symbols.
* nanohttp.c parser.c xmlsave.c include/libxml/*.h: lot of cleanup
* doc/*: regenerated the docs.
Daniel
2004-06-27 12:08:10 +00:00
William M. Brack
9333cc2115 suppressed warnings from within xmlValidGetValidElements (bug 144644)
* valid.c: suppressed warnings from within xmlValidGetValidElements
  (bug 144644)
* doc/examples/testWriter.c: corrected typo in comment for ISO-8859-1
  (bug 144245)
2004-06-24 08:33:40 +00:00
Daniel Veillard
3cf6950b93 fixing a couple of compilation errors when configured with --with-minimum
* doc/examples/io2.c doc/examples/parse4.c: fixing a couple of
  compilation errors when configured with --with-minimum
Daniel
2004-06-16 22:52:59 +00:00
Daniel Veillard
f5850a14bb Added missing file, Daniel 2004-04-20 11:53:53 +00:00
Daniel Veillard
eca726dcd6 preparing 2.6.9 release updated and rebuilt the docs Daniel
* configure.in: preparing 2.6.9 release
* doc/* News: updated and rebuilt the docs
Daniel
2004-04-18 21:47:34 +00:00
William M. Brack
87640d5f14 minor warning cleanup (no change to logic) fixed return value for internal
* xmlschemas.c, xmlwriter.c, doc/examples/parse4.c,
  doc/examples/io2.c: minor warning cleanup (no change to logic)
* xinclude: fixed return value for internal function
  xmlXIncludeLoadFallback (now always 0 or -1)
2004-04-17 14:58:15 +00:00
Daniel Veillard
3dd87ba8ad added information about compiling on Unix Daniel
* doc/examples/examples.xsl doc/examples/index.html: added
  information about compiling on Unix
Daniel
2004-03-29 14:58:38 +00:00
Daniel Veillard
3d354a798e handle and explain a very tricky problem when modifying the tree based on
* doc/examples/xpath2.c doc/examples/xpath2.res: handle and explain
  a very tricky problem when modifying the tree based on an XPath
  result query.
Daniel
2004-03-28 12:18:45 +00:00
Daniel Veillard
f8e6668041 Opps, forgot to add it, Daniel 2004-03-27 01:13:22 +00:00
Daniel Veillard
b5eb714320 added a test template added a new example, and make valgrind target Daniel
* doc/examples/xpath1.c: added a test template
* doc/examples/xpath2.c doc/examples/xpath2.res doc/examples/*:
  added a new example, and make valgrind target
Daniel
2004-03-26 13:55:38 +00:00
John Fleck
03fdeb2744 John Fleck <jfleck@inkstain.net>
John Fleck <jfleck@inkstain.net>

* doc/examples/io2.c
	* doc/examples/io2.res
	add xmlDocDumpMemory example in response to mailing list FAQ
	(rebuilt xml and html also)
2004-03-26 03:24:28 +00:00
Daniel Veillard
88155d85e5 Added a couple of parsing examples, Daniel 2004-03-25 10:43:16 +00:00
Daniel Veillard
fc97906edf paalied patch from Julio M. Merino Vidal fixing bug #134751 to fix
* configure.in doc/Makefile.am include/libxml/Makefile.am:
  paalied patch from Julio M. Merino Vidal fixing bug #134751
  to fix --with-html-dir option.
* doc/*: rebuilt fully the docs
* doc/html/libxml-xmlsave.html: new file from new header.
Daniel
2004-03-04 22:07:16 +00:00
Daniel Veillard
2156d4387b fixing compilation bug with some options disabled as well as
* debugXML.c testHTML.c tree.c doc/examples/*.c
  include/libxml/xmlsave.h: fixing compilation bug with some options
  disabled as well as --with-minimum should fix #134695
Daniel
2004-03-04 15:59:36 +00:00
John Fleck
f2497c16b2 Sat Jan 31 08:22:02 MST 2004 John Fleck <jfleck@inkstain.net
Sat Jan 31 08:22:02 MST 2004 John Fleck <jfleck@inkstain.net

	* doc/examples/reader1.c, reader2.c, reader3.c
	* doc/examples/examples.xml
	* doc/examples/*.html
	add note that reader examples need libmxl2 > 2.6, rebuild
	html - this time doing it correctly :-)
2004-01-31 15:23:33 +00:00
MST 2004 John Fleck
ba6bec6762 doc/examples/examples.xml doc/examples/*.html add note that reader
Fri Jan 30 20:45:36 MST 2004 John Fleck <jfleck@inkstain.net>

	* doc/examples/examples.xml
	* doc/examples/*.html
	add note that reader examples need libmxl2 > 2.6, rebuild
	html
2004-01-31 03:48:11 +00:00
MST 2004 John Fleck
4f8b8d9d45 doc/examples/Makefile.am per Jan. 15 email to the list from oliverst, the
Wed Jan 28 07:20:37 MST 2004 John Fleck <jfleck@inkstain.net>

	* doc/examples/Makefile.am
	per Jan. 15 email to the list from oliverst, the index.html
	file from this directory wasn't making it into the tarball
2004-01-28 14:22:37 +00:00
Daniel Veillard
c3a429aac8 don't rely on . being on the path for make tests, should keep Mr. Crozat
* doc/examples/index.py: don't rely on . being on the path for
  make tests, should keep Mr. Crozat quiet until next time...
Daniel
2004-01-26 11:55:11 +00:00
Daniel Veillard
189f46b18c preparing release 2.6.5, rebuilt the docs, checked rngparser stuff does
* configure.in NEWS doc/*: preparing release 2.6.5, rebuilt the
  docs, checked rngparser stuff does not end up in the tarball
Daniel
2004-01-25 21:03:04 +00:00
Daniel Veillard
4773df2a58 added io1.c an example ox xmlIO usage and io1.res test result, fixed a
* doc/examples/*: added io1.c an example ox xmlIO usage and io1.res
  test result, fixed a awful lot of memory leaks showing up in
  testWriter.c, changed the examples and the Makefiles to test
  memory leaks.
* xmlwriter.c: fixed a memory leak
* Makefile.am: run the doc/examples regression tests as part of
  make tests
* xpath.c include/libxml/xpath.h: added xmlXPathCtxtCompile() to
  compile an XPath expression within a context, currently the goal
  is to be able to reuse the XSLT stylesheet dictionnary, but this
  opens the door to others possible optimizations.
* dict.c include/libxml/dict.h: added xmlDictCreateSub() which allows
  to build a new dictionnary based on another read-only dictionnary.
  This is needed for XSLT to keep the stylesheet dictionnary read-only
  while being able to reuse the strings for the transformation
  dictionnary.
* xinclude.c: fixed a dictionnar reference counting problem occuring
  when document parsing failed.
* testSAX.c: adding option --repeat for timing 100times the parsing
* doc/* : rebuilt all the docs
Daniel
2004-01-23 13:15:13 +00:00
Daniel Veillard
87247e8740 applied patch from Mark Vadoc to not use SAX1 unless necessary. Daniel
* HTMLparser.c relaxng.c testRelax.c testSchemas.c: applied
  patch from Mark Vadoc to not use SAX1 unless necessary.
Daniel
2004-01-13 20:42:02 +00:00
Daniel Veillard
7ecced58c1 base64Binary is supported now, Daniel 2003-12-18 14:22:09 +00:00
Daniel Veillard
b286d84b86 don't call the result files .out but .res as the Makefiles tend to try
* doc/examples/*: don't call the result files .out but .res as
  the Makefiles tend to try generating binaries for .out targets...
Daniel
2003-12-17 15:08:55 +00:00