diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/Makefile.am | 2 | ||||
| -rw-r--r-- | python/Makefile.in | 8 | ||||
| -rwxr-xr-x | python/generator.py | 4 | ||||
| -rw-r--r-- | python/libxml.c | 2 | ||||
| -rwxr-xr-x | python/setup.py | 2 | ||||
| -rw-r--r-- | python/tests/Makefile.in | 6 |
6 files changed, 14 insertions, 10 deletions
diff --git a/python/Makefile.am b/python/Makefile.am index 3cf87e7..d2a2253 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -31,7 +31,7 @@ python_LTLIBRARIES = libxml2mod.la libxml2mod_la_SOURCES = $(srcdir)/libxml.c $(srcdir)/types.c nodist_libxml2mod_la_SOURCES = libxml2-py.c -libxml2mod_la_LIBADD = $(mylibs) @CYGWIN_EXTRA_PYTHON_LIBADD@ @PYTHON_LIBS@ +libxml2mod_la_LIBADD = $(mylibs) @CYGWIN_EXTRA_PYTHON_LIBADD@ @WIN32_EXTRA_PYTHON_LIBADD@ @PYTHON_LIBS@ $(srcdir)/libxml.c: libxml2-py.h # to generate before to compile diff --git a/python/Makefile.in b/python/Makefile.in index d7a8015..e885148 100644 --- a/python/Makefile.in +++ b/python/Makefile.in @@ -46,7 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = setup.py CONFIG_CLEAN_VPATH_FILES = @@ -219,6 +219,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ @@ -267,6 +268,7 @@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ WGET = @WGET@ WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ +WIN32_EXTRA_PYTHON_LIBADD = @WIN32_EXTRA_PYTHON_LIBADD@ WITH_C14N = @WITH_C14N@ WITH_CATALOG = @WITH_CATALOG@ WITH_DEBUG = @WITH_DEBUG@ @@ -275,6 +277,7 @@ WITH_FTP = @WITH_FTP@ WITH_HTML = @WITH_HTML@ WITH_HTTP = @WITH_HTTP@ WITH_ICONV = @WITH_ICONV@ +WITH_ICU = @WITH_ICU@ WITH_ISO8859X = @WITH_ISO8859X@ WITH_LEGACY = @WITH_LEGACY@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ @@ -345,7 +348,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -390,7 +392,7 @@ libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -av @WITH_PYTHON_TRUE@python_LTLIBRARIES = libxml2mod.la @WITH_PYTHON_TRUE@libxml2mod_la_SOURCES = $(srcdir)/libxml.c $(srcdir)/types.c @WITH_PYTHON_TRUE@nodist_libxml2mod_la_SOURCES = libxml2-py.c -@WITH_PYTHON_TRUE@libxml2mod_la_LIBADD = $(mylibs) @CYGWIN_EXTRA_PYTHON_LIBADD@ @PYTHON_LIBS@ +@WITH_PYTHON_TRUE@libxml2mod_la_LIBADD = $(mylibs) @CYGWIN_EXTRA_PYTHON_LIBADD@ @WIN32_EXTRA_PYTHON_LIBADD@ @PYTHON_LIBS@ @WITH_PYTHON_TRUE@python_DATA = \ @WITH_PYTHON_TRUE@ libxml2.py diff --git a/python/generator.py b/python/generator.py index 9e1fdaa..767c4bb 100755 --- a/python/generator.py +++ b/python/generator.py @@ -553,7 +553,7 @@ def buildStubs(): wrapper.write("#include <libxml/xmlschemastypes.h>\n") wrapper.write("#include \"libxml_wrap.h\"\n") wrapper.write("#include \"libxml2-py.h\"\n\n") - for function in functions.keys(): + for function in sorted(functions.keys()): ret = print_function_wrapper(function, wrapper, export, include) if ret < 0: failed = failed + 1 @@ -856,7 +856,7 @@ def buildWrappers(): if tinfo[2] == classe: ctypes.append(type) ctypes_processed[type] = () - for type in classes_type.keys(): + for type in sorted(classes_type.keys()): if ctypes_processed.has_key(type): continue tinfo = classes_type[type] diff --git a/python/libxml.c b/python/libxml.c index 3f01761..b0043e6 100644 --- a/python/libxml.c +++ b/python/libxml.c @@ -30,7 +30,7 @@ #if (defined(_MSC_VER) || defined(__MINGW32__)) && !defined(vsnprintf) #define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a) -#elif defined(WITH_TRIO) +#elif defined(WITH_TRIO) && !defined(vsnprintf) #include "trio.h" #define vsnprintf trio_vsnprintf #endif diff --git a/python/setup.py b/python/setup.py index 6522a51..09d0a27 100755 --- a/python/setup.py +++ b/python/setup.py @@ -226,7 +226,7 @@ else: setup (name = "libxml2-python", # On *nix, the version number is created from setup.py.in # On windows, it is set by configure.js - version = "2.7.7", + version = "2.7.8", description = descr, author = "Daniel Veillard", author_email = "veillard@redhat.com", diff --git a/python/tests/Makefile.in b/python/tests/Makefile.in index 29b53e3..832cf73 100644 --- a/python/tests/Makefile.in +++ b/python/tests/Makefile.in @@ -44,7 +44,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -151,6 +151,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PERL = @PERL@ @@ -199,6 +200,7 @@ VERSION_SCRIPT_FLAGS = @VERSION_SCRIPT_FLAGS@ WGET = @WGET@ WIN32_EXTRA_LDFLAGS = @WIN32_EXTRA_LDFLAGS@ WIN32_EXTRA_LIBADD = @WIN32_EXTRA_LIBADD@ +WIN32_EXTRA_PYTHON_LIBADD = @WIN32_EXTRA_PYTHON_LIBADD@ WITH_C14N = @WITH_C14N@ WITH_CATALOG = @WITH_CATALOG@ WITH_DEBUG = @WITH_DEBUG@ @@ -207,6 +209,7 @@ WITH_FTP = @WITH_FTP@ WITH_HTML = @WITH_HTML@ WITH_HTTP = @WITH_HTTP@ WITH_ICONV = @WITH_ICONV@ +WITH_ICU = @WITH_ICU@ WITH_ISO8859X = @WITH_ISO8859X@ WITH_LEGACY = @WITH_LEGACY@ WITH_MEM_DEBUG = @WITH_MEM_DEBUG@ @@ -277,7 +280,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ |