1
0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2026-01-06 11:41:14 +03:00
Commit Graph

45 Commits

Author SHA1 Message Date
Daniel Richard G
d10a72ce8c Bundles all generated files for python into the distribution
So end users building the Python module don't need to
regenerate any source files. some clean-up too.
2012-08-14 12:50:25 +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
Pacho Ramos
1ea6b14125 Fix undefined reference in python module
For https://bugzilla.gnome.org/show_bug.cgi?id=622023
when compiled with LDFLAGS="${LDFLAGS} -Wl,-z,-defs -Wl,--no-undefined"
the python module would failed due to the undefined. This add an
explicit reference to python lib.
2012-05-15 19:36:02 +08:00
LRN
fbd4ddf226 607273 Fix python detection on MSys/Windows
Fix the lookup for python executable and headers, add an
extra variable for new dependancies when linking for Python
on Win32
2010-11-04 15:45:46 +01:00
Paul Smith
38af74f7b1 fix build error in libxml2/python
There are missing $(srcdir) values in libxml2/python/Makefile.am which
cause it to fail if built remote from out of tree.
2010-03-15 10:22:25 +01:00
Frederic Crozat
e21731dec8 link python module with python library
* configure.in python/Makefile.am: libxml2 python module wasn't linked
  with python library
2009-09-12 18:02:40 +02:00
Daniel Veillard
5ac88237e1 applied cleanup patches for cross compilation and MinGW from Roumen Petrov
* python/Makefile.am python/tests/Makefile.am: applied cleanup
  patches for cross compilation and MinGW from Roumen Petrov
Daniel

svn path=/trunk/; revision=3696
2008-02-19 07:54:52 +00:00
Daniel Veillard
9ebb632238 patches from John Carr to start cleaning up 'make diskcheck' problems c.f.
* check-relaxng-test-suite2.py check-relaxng-test-suite.py
  Makefile.am python/tests/Makefile.am python/Makefile.am
  check-xsddata-test-suite.py: patches from John Carr to
  start cleaning up 'make diskcheck' problems c.f. #506228
Daniel

svn path=/trunk/; revision=3674
2008-01-11 07:19:24 +00:00
Daniel Veillard
04db684ba9 remove the build path recorded in the python shared module as Peter
* python/Makefile.am: remove the build path recorded in the python
  shared module as Peter Breitenlohner pointed out, should fix #346022
Daniel
2006-10-11 09:27:56 +00:00
William M. Brack
106cad6619 enhanced for enabling build in a different directory. Added (optional)
* Makefile.am, gentest.py: enhanced for enabling build in
  a different directory.  Added (optional) param to gentest.py
  to specify the source directory (bug #155468)
* doc/Makefile.am: changed destination of NEWS from (top_srcdir)
  to (top_builddir) (bug #155468)
* python/Makefile.am, python/generator.py: enhanced for enabling
  build in a different directory(bug #155468).  Added (optional)
  param to generator.py to specify the source directory.  Added
  a new table of functions which have possible "foreign" encodings
  (e.g. UTF16), and code to use python 't' format instead of
  'z' format (mostly solving bug #152286, but still need to
  populate the table).
2004-12-23 15:56:12 +00:00
Daniel Veillard
43b8e5790c applied patch from Thomas Fitzsimmons fixing #155240 building outside the
* python/Makefile.am: applied patch from Thomas Fitzsimmons fixing
  #155240 building outside the source tree. but make tests fails.
Daniel
2004-10-12 22:20:10 +00:00
Daniel Veillard
d392ba7ef1 applied a patch from Gerrit P. Haase to get python bindings on Cygwin
* Makefile.am config.h.in configure.in python/Makefile.am:
  applied a patch from Gerrit P. Haase to get python bindings
  on Cygwin
Daniel
2004-08-04 14:56:45 +00:00
William M. Brack
e9449c5d29 added an encoding "special comment" to avoid warning message in python2.3
* python/drv_libxml.py: added an encoding "special comment" to avoid
  warning message in python2.3 (bug 146889)
* Makefile.am, python/Makefile.am, python/tests/Makefile.am: small
  change to make "make tests" a little quieter (MAKEFLAGS+=--silent)
* xpath.c: enhanced to take advantage of current libxslt handling
  of tmpRVT.  Fixes bug 145547.
2004-07-11 14:41:20 +00:00
Daniel Veillard
377e1a9059 move the TODO as comments as the function while not finished are usable
* xmlsave.c: move the TODO as comments as the function while not
  finished are usable as-is
* xmlschemas.c include/libxml/xmlerror.h: patch from Kasimier Buchcik
  implementing union
* test/schemas/union_0_0.x* result/schemas/union_0_0*: added example
* python/Makefile.am: applied fix from Mike Hommey
Daniel
2004-04-16 16:30:05 +00:00
William M. Brack
cafe885168 applied fixes to allow build from 'outside' directory (Bug 129172)
* python/Makefile.am, python/tests/Makefile.am,
  doc/Makefile.am: applied fixes to allow build from
  'outside' directory (Bug 129172)
2003-12-21 10:14:35 +00:00
Daniel Veillard
38b80a8faa trying to conciliate --with-python= requirements and RPM builds, a PITA
* configure.in libxml.spec.in python/Makefile.am: trying
  to conciliate --with-python= requirements and RPM builds,
  a PITA really...
Daniel
2003-05-14 18:59:00 +00:00
Daniel Veillard
7b4b2f9d8f preparing 2.5.0 release only warn in pedantic mode about namespace name
* configure.in NEWS: preparing 2.5.0 release
* SAX.c: only warn in pedantic mode about namespace name
  brokeness
* globals.c: fix a doc generation problem
* uri.c: fix #101520
* doc/*: updated and rebuilt the doc for the release, includuding
  stylesheet update
* python/Makefile.am: fix a filename bug
Daniel
2003-01-06 13:11:20 +00:00
Daniel Veillard
4f86020248 integrated drv_libxml2.py Python xml.sax driver from Stphane Bidoul based
* libxml.spec.in python/Makefile.am python/drv_libxml2.py:
  integrated drv_libxml2.py Python xml.sax driver from Stphane Bidoul
  based on the python XmlTextReader interface.
Daniel
2003-01-02 13:00:02 +00:00
Daniel Veillard
66651aa8a0 trying to fix bug #98517 about building outside the source tree fixed the
* Makefile.am python/Makefile.am python/tests/Makefile.am:
  trying to fix bug #98517 about building outside the source tree
* doc/xml.html doc/FAQ.html: fixed the link to libiconv #94585
Daniel
2002-11-15 11:21:43 +00:00
Daniel Veillard
2206dbfabe applied patch from Christophe Merlet to reestablish DESTDIR Daniel
* python/Makefile.am: applied patch from Christophe Merlet to
  reestablish DESTDIR
Daniel
2002-09-05 08:09:37 +00:00
Daniel Veillard
08cccaa05a typo in target name resulted in libxml2.py to not be rebuilt. fixed
* python/Makefile.am: typo in target name resulted in libxml2.py
  to not be rebuilt. fixed DESTDIR similary to the libxslt one.
Daniel
2002-08-22 09:47:29 +00:00
Daniel Veillard
b6984efcc9 more AMD 64 induced changes from Frederic Crozat Daniel
* configure.in python/Makefile.am: more AMD 64 induced changes from
  Frederic Crozat
Daniel
2002-08-14 16:55:31 +00:00
William M. Brack
61eaba5b75 fixed python/Makefile.am for bug 72012 2002-07-21 11:14:18 +00:00
Daniel Veillard
f544f1935c patch from Cristian Gafton to build on Red Hat 6.2, should also fix #75779
* python/Makefile.am: patch from Cristian Gafton to build on
  Red Hat 6.2, should also fix #75779
Daniel
2002-04-15 12:56:56 +00:00
Daniel Veillard
5fc1f0893a Added Igor Zlatkovic as official maintainer Albert Chin pointed that
* AUTHORS HACKING: Added Igor Zlatkovic as official maintainer
* python/Makefile.am python/tests/Makefile.am: Albert Chin pointed
  that $(datadir) should be used for docs
Daniel
2002-03-27 09:05:40 +00:00
Daniel Veillard
5997aca8b8 humm, changed the way the SAX parser work when
* parser.c: humm, changed the way the SAX parser work when
  xmlSubstituteEntitiesDefault(1) is set, it will then
  do the entity registration and loading by itself in case the
  user provided SAX getEntity() returns NULL.
* testSAX.c: added --noent to test the behaviour.
Daniel
2002-03-18 18:36:20 +00:00
Daniel Veillard
38bf6f0425 small fix to avoid potential problem due to ordering of freeing data
* xpath.c: small fix to avoid potential problem due to
  ordering of freeing data
* python/Makefile.am: people were complaining about
  the generated file in python dir not being built
Daniel
2002-03-16 22:03:31 +00:00
Daniel Veillard
d2379010b1 Cleanup of the python Makefiles based on Jacob and James feedback, fixed
* libxml.spec.in python/Makefile.am python/tests/Makefile.am
  python/generator.py python/libxml.c python/types.c: Cleanup
  of the python Makefiles based on Jacob and James feedback,
  fixed the spec file accordingly, fixed the number of warning
  that passing my pedantic CFLAGS was generating. Conclusion
  is that Python includes are real crap.
Daniel
2002-03-15 22:24:56 +00:00
jacob berkman
9be6586ca9 remove LDADD and CFLAGS as this is broken usage, redundant, and gcc
2002-03-13  jacob berkman  <jacob@ximian.com>

	* python/Makefile.am: remove LDADD and CFLAGS as this is broken
	usage, redundant, and gcc specific
2002-03-14 02:15:56 +00:00
Daniel Veillard
a6d2e9ec00 config.py* was missing, Daniel 2002-03-09 10:22:50 +00:00
Daniel Veillard
bb7ddb3429 python script to run regression tests against the XML Test suite of
* check-xml-test-suite.py: python script to run regression tests
  against the XML Test suite of W3C/OASis
* SAX.c: fixed a validation bug
* parser.c: fixed 3 errors pointed by the test suite
* doc/buildDocBookCatalog: fixed a typo pointed by drake
* python/Makefile.am: fixed a dependendy
Daniel
2002-02-17 21:26:33 +00:00
Daniel Veillard
1c18e30b46 seems some version of automake didn't generate the dependancies right as
* python/Makefile.am: seems some version of automake didn't
  generate the dependancies right as Jacob found out. Add
  an extra dependancy rule.
Daniel
2002-02-09 22:16:40 +00:00
Daniel Veillard
5e5c2d0a93 Justin Fletcher found some parts of the code needing cleanup Fixed the
* parserInternals.c valid.c: Justin Fletcher found some parts
  of the code needing cleanup
* libxml.spec.in python/Makefile.am python/generator.py
  python/libxml.c python/libxml.py: Fixed the python Makefiles
  corrected a bug showing up on ia64, changed the name of the
  python internal module too
Daniel
2002-02-09 18:03:01 +00:00
Daniel Veillard
7db3871bf5 cleanup always use stdout if output is NULL don't close filedescriptors
* Makefile.am: cleanup
* debugXML.c: always use stdout if output is NULL
* xmlIO.c: don't close filedescriptors passed to outputBuffers
* python/Makefile.am python/generator.py python/libxml2class.txt
  python/libxml_wrap.h python/types.c: augmented the number of bindings
  handling FILE * and XPath contexts
* python/tests/Makefile.am: avoid a stupid problem due to the
  use of TEST.
Daniel
2002-02-07 16:39:11 +00:00
Daniel Veillard
7a96efc0c9 do not install outside of prefix Daniel
* configure.in python/Makefile.am: do not install outside
  of prefix
Daniel
2002-02-05 16:34:33 +00:00
Daniel Veillard
3ce5257b29 cleanup added class for parser context, added first cut for push mode
* python/Makefile.am python/types.c: cleanup
* python/libxml.c python/libxml.py python/libxml_wrap.h
  python/generator.py python/libxml2-python-api.xml
  python/libxml2class.txt: added class for parser context, added
  first cut for push mode support. Added a framework to generate
  accessors functions.
* python/tests/Makefile.am python/tests/push.py: added a push
  test
Daniel
2002-02-03 15:08:05 +00:00
Daniel Veillard
cfb0546244 fixed a small bug a bit of cleanup. Daniel
* python/Makefile.am python/TODO python/libxml.py: fixed a small
  bug a bit of cleanup.
Daniel
2002-02-02 23:18:22 +00:00
Daniel Veillard
5d81903b06 adding error redirections and preformat to a python handler cleanup made
* python/Makefile.am python/libxml.c python/libxml2-python-api.xml
  python/libxml2class.txt: adding error redirections and preformat
  to a python handler
* python/tests/Makefile.am python/tests/*.py: cleanup made all
  tests self checking
Daniel
2002-02-02 21:49:17 +00:00
Daniel Veillard
4cf998a639 Oops, missing an EXTRA_DIST, Daniel 2002-02-02 10:42:43 +00:00
Daniel Veillard
9589d4551e Progressing through the TODOs, class description output, extra XML API,
* libxml.spec.in python/Makefile.am python/TODO python/generator.py
  python/libxml.c python/libxml2-python-api.xml
  python/libxml2class.txt: Progressing through the TODOs, class
  description output, extra XML API, RPM now builds the wrappers
  for all python installed versions
Daniel
2002-02-02 10:28:17 +00:00
Daniel Veillard
253aa2c33b added more informations in the libxml2-python package including docs.
* configure.in libxml.spec.in python/Makefile.am python/TODO
  python/generator.py python/libxml2class.txt: added more informations
  in the libxml2-python package including docs. Slightly changed
  the class hierarchy
* python/tests/*: added basic regression tests infrastructure too
Daniel
2002-02-02 09:17:16 +00:00
Daniel Veillard
a7340c830e more work, now able to extend the XPath interpreter with functions written
* python/Makefile.am python/generator.py python/libxml.c
  python/libxml.py: more work, now able to extend the
  XPath interpreter with functions written in python.
Daniel
2002-02-01 17:56:45 +00:00
Daniel Veillard
c3e39448e5 Jacob sent a patch to allow building from tarfile. Daniel
* python/Makefile.am: Jacob sent a patch to allow building from
  tarfile.
Daniel
2002-02-01 09:29:41 +00:00
Daniel Veillard
96c9af76e7 Fixed a couple more of python building problems, Daniel 2002-02-01 00:06:44 +00:00
Daniel Veillard
f1d0e6be57 inserted the python wrappers build, I hope this won't be too unportable
* python/Makefile.am python/libxml.c configure.in Makefile.am:
  inserted the python wrappers build, I hope this won't be too
  unportable
Daniel
2002-01-31 23:42:44 +00:00