1
0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-03-16 02:50:07 +03:00

18 Commits

Author SHA1 Message Date
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
Daniel Veillard
ff8b5417b7 applied patch from Mike Hommey fixing distclean, fixes #520387 Daniel
* xstc/Makefile.am: applied patch from Mike Hommey fixing distclean,
  fixes #520387
Daniel

svn path=/trunk/; revision=3723
2008-04-03 05:41:28 +00:00
Daniel Veillard
3130fe95db apply patch from Ryan Hill to cope with changes in GNU tar, should fix
* xstc/Makefile.am: apply patch from Ryan Hill to cope with changes
  in GNU tar, should fix #396751
Daniel

svn path=/trunk/; revision=3633
2007-06-12 12:24:54 +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
33a2de9921 applied patch from Peter Breitenlohner for wget detection and fix of a
* configure.in xstc/Makefile.am: applied patch from Peter Breitenlohner
  for wget detection and fix of a Python path problem, should fix
  #340993
Daniel
2006-10-11 08:33:22 +00:00
Daniel Veillard
1f33c4d61f preparing to make testsuite releases along with code source releases fixed
* xstc/Makefile.am README README.tests Makefile.tests Makefile.am:
  preparing to make testsuite releases along with code source releases
* gentest.py testapi.c: fixed a couple of problem introduced by
  the new Schemas support for Readers
* xpath.c: fixed the XPath attribute:: bug #309580, #309864 in a crude
  but simple way.
* xmlschemas.c include/libxml/tree.h: fixed a couple of problems
  raised by the doc builder.
* doc/*: made rebuild
Daniel
2005-07-10 21:38:31 +00:00
Kasimier T. Buchcik
d8e10448d1 Some more adjustments.
* xstc/Makefile.am: Some more adjustments.
2005-06-13 13:00:15 +00:00
Kasimier T. Buchcik
34b9a9c063 Changed test extraction process, since some boxes don't know about "tar
* xstc/Makefile.am: Changed test extraction process, since some
  boxes don't know about "tar --strip-path".
2005-06-13 12:43:29 +00:00
Kasimier T. Buchcik
1ace20342a Adapted the XS tests to use the new release of tests and test-definitions.
* xstc/Makefile.am xstc.py xstc-to-python.xsl: Adapted the
  XS tests to use the new release of tests and test-definitions.
2005-06-08 17:15:58 +00:00
Daniel Veillard
cdc1a59a63 integrated fixup-tests.py Daniel
* xstc/Makefile.am: integrated fixup-tests.py
Daniel
2005-04-02 10:28:13 +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
William M. Brack
a22da29921 fixed xmlXIncludeParseFile to prevent overwriting XML_COMPLETE_ATTRS when
* xinclude.c: fixed xmlXIncludeParseFile to prevent
  overwriting XML_COMPLETE_ATTRS when setting pctxt->loadsubset
  (bug 166199)
* Makefile.am, python/tests/Makefile.am, xstc/Makefile.am: added
  code to add $(top_builddir)/.libs to LD_LIBRARY_PATH whenever
  PYTHONPATH is set, to assure new libxml2 routines are used.
2005-02-12 01:08:22 +00:00
Daniel Veillard
06500c8aa6 some cleanup checking for xmllint and xsltproc in configure.in, fixed make
* configure.in doc/Makefile.am xstc/Makefile.am: some cleanup
  checking for xmllint and xsltproc in configure.in, fixed
  make dist w.r.t. the new xstc subdir.
* doc/*: rebuilt
Daniel
2004-09-07 09:12:44 +00:00
Daniel Veillard
f31187d31b integrated to "make valgrind", heavy ... weight 250MB of VM ! Daniel
* xstc/Makefile.am Makefile.am: integrated to "make valgrind",
  heavy ... weight 250MB of VM !
Daniel
2004-09-06 14:05:06 +00:00
Daniel Veillard
aa9a352fc7 Small updates, Daniel 2004-09-06 13:20:05 +00:00
Daniel Veillard
2cdd2f3a82 more cleanup in integrating the xstc testsuite Daniel
* xstc/Makefile.am xstc/xstc-to-python.xsl xstc/xstc.py Makefile.am:
  more cleanup in integrating the xstc testsuite
Daniel
2004-09-06 12:55:41 +00:00
Daniel Veillard
68763173d1 Small fix, Daniel 2004-09-06 12:02:19 +00:00
Daniel Veillard
b1da40c144 starting to integrate the xstc suite in the normal regression tests Daniel
* Makefile.am configure.in xstc/.cvsignore xstc/Makefile.am:
  starting to integrate the xstc suite in the normal regression
  tests
Daniel
2004-09-06 11:57:44 +00:00