diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | win32/Makefile.bcb | 2 | ||||
-rw-r--r-- | win32/Makefile.mingw | 2 | ||||
-rw-r--r-- | win32/Makefile.msvc | 2 | ||||
-rw-r--r-- | win32/configure.js | 64 |
5 files changed, 76 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Mon Oct 6 10:46:35 CEST 2003 Daniel Veillard <daniel@veillard.com> + + * win32/Makefile.bcb win32/Makefile.mingw win32/Makefile.msvc + win32/configure.js: applied patch from Stéphane Bidoul to + fix the compilation of 2.6.0 code on Win32 + Mon Oct 6 10:16:30 CEST 2003 Daniel Veillard <daniel@veillard.com> * check-xml-test-suite.py: fixing the script diff --git a/win32/Makefile.bcb b/win32/Makefile.bcb index 80383aad..9fb8aac8 100644 --- a/win32/Makefile.bcb +++ b/win32/Makefile.bcb @@ -158,6 +158,7 @@ XML_OBJS = $(XML_INTDIR)\c14n.obj\ $(XML_INTDIR)\hash.obj\ $(XML_INTDIR)\HTMLparser.obj\ $(XML_INTDIR)\HTMLtree.obj\ + $(XML_INTDIR)\legacy.obj\ $(XML_INTDIR)\list.obj\ $(XML_INTDIR)\nanoftp.obj\ $(XML_INTDIR)\nanohttp.obj\ @@ -195,6 +196,7 @@ XML_OBJS_A = $(XML_INTDIR_A)\c14n.obj\ $(XML_INTDIR_A)\hash.obj\ $(XML_INTDIR_A)\HTMLparser.obj\ $(XML_INTDIR_A)\HTMLtree.obj\ + $(XML_INTDIR_A)\legacy.obj\ $(XML_INTDIR_A)\list.obj\ $(XML_INTDIR_A)\nanoftp.obj\ $(XML_INTDIR_A)\nanohttp.obj\ diff --git a/win32/Makefile.mingw b/win32/Makefile.mingw index f0460aa0..c5abb9f2 100644 --- a/win32/Makefile.mingw +++ b/win32/Makefile.mingw @@ -148,6 +148,7 @@ XML_OBJS = $(XML_INTDIR)/c14n.o\ $(XML_INTDIR)/hash.o\ $(XML_INTDIR)/HTMLparser.o\ $(XML_INTDIR)/HTMLtree.o\ + $(XML_INTDIR)/legacy.o\ $(XML_INTDIR)/list.o\ $(XML_INTDIR)/nanoftp.o\ $(XML_INTDIR)/nanohttp.o\ @@ -187,6 +188,7 @@ XML_OBJS_A = $(XML_INTDIR_A)/c14n.o\ $(XML_INTDIR_A)/hash.o\ $(XML_INTDIR_A)/HTMLparser.o\ $(XML_INTDIR_A)/HTMLtree.o\ + $(XML_INTDIR_A)/legacy.o\ $(XML_INTDIR_A)/list.o\ $(XML_INTDIR_A)/nanoftp.o\ $(XML_INTDIR_A)/nanohttp.o\ diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc index befb1bf7..b2689bfd 100644 --- a/win32/Makefile.msvc +++ b/win32/Makefile.msvc @@ -137,6 +137,7 @@ XML_OBJS = $(XML_INTDIR)\c14n.obj\ $(XML_INTDIR)\hash.obj\ $(XML_INTDIR)\HTMLparser.obj\ $(XML_INTDIR)\HTMLtree.obj\ + $(XML_INTDIR)\legacy.obj\ $(XML_INTDIR)\list.obj\ $(XML_INTDIR)\nanoftp.obj\ $(XML_INTDIR)\nanohttp.obj\ @@ -174,6 +175,7 @@ XML_OBJS_A = $(XML_INTDIR_A)\c14n.obj\ $(XML_INTDIR_A)\hash.obj\ $(XML_INTDIR_A)\HTMLparser.obj\ $(XML_INTDIR_A)\HTMLtree.obj\ + $(XML_INTDIR_A)\legacy.obj\ $(XML_INTDIR_A)\list.obj\ $(XML_INTDIR_A)\nanoftp.obj\ $(XML_INTDIR_A)\nanohttp.obj\ diff --git a/win32/configure.js b/win32/configure.js index c0cb84b7..3735aa02 100644 --- a/win32/configure.js +++ b/win32/configure.js @@ -45,6 +45,14 @@ var withDebug = true; var withMemDebug = false; var withSchemas = true; var withRegExps = true; +var withTree = true; +var withReader = true; +var withWalker = true; +var withPush = true; +var withValid = true; +var withSax1 = true; +var withLegacy = true; +var withOutput = true; var withPython = false; /* Win32 build options. */ var dirSep = "\\"; @@ -112,6 +120,14 @@ function usage() txt += " xml_debug: Enable XML debbugging module (" + (withDebug? "yes" : "no") + ")\n"; txt += " mem_debug: Enable memory debugger (" + (withMemDebug? "yes" : "no") + ")\n"; txt += " regexps: Enable regular expressions (" + (withRegExps? "yes" : "no") + ")\n"; + txt += " tree: Enable tree api (" + (withTree? "yes" : "no") + ")\n"; + txt += " reader: Enable xmlReader api (" + (withReader? "yes" : "no") + ")\n"; + txt += " walker: Enable xmlDocWalker api (" + (withWalker? "yes" : "no") + ")\n"; + txt += " push: Enable push api (" + (withPush? "yes" : "no") + ")\n"; + txt += " valid: Enable DTD validation support (" + (withValid? "yes" : "no") + ")\n"; + txt += " sax1: Enable SAX1 api (" + (withSax1? "yes" : "no") + ")\n"; + txt += " legacy: Enable Deprecated api's (" + (withLegacy? "yes" : "no") + ")\n"; + txt += " output: Enable serialization support (" + (withOutput? "yes" : "no") + ")\n"; txt += " schemas: Enable XML Schema support (" + (withSchemas? "yes" : "no") + ")\n"; txt += " python: Build Python bindings (" + (withPython? "yes" : "no") + ")\n"; txt += "\nWin32 build options, default value given in parentheses:\n\n"; @@ -191,6 +207,14 @@ function discoverVersion() vf.WriteLine("WITH_MEM_DEBUG=" + (withMemDebug? "1" : "0")); vf.WriteLine("WITH_SCHEMAS=" + (withSchemas? "1" : "0")); vf.WriteLine("WITH_REGEXPS=" + (withRegExps? "1" : "0")); + vf.WriteLine("WITH_TREE=" + (withTree? "1" : "0")); + vf.WriteLine("WITH_READER=" + (withReader? "1" : "0")); + vf.WriteLine("WITH_WALKER=" + (withWalker? "1" : "0")); + vf.WriteLine("WITH_PUSH=" + (withPush? "1" : "0")); + vf.WriteLine("WITH_VALID=" + (withValid? "1" : "0")); + vf.WriteLine("WITH_SAX1=" + (withSax1? "1" : "0")); + vf.WriteLine("WITH_LEGACY=" + (withLegacy? "1" : "0")); + vf.WriteLine("WITH_OUTPUT=" + (withOutput? "1" : "0")); vf.WriteLine("WITH_PYTHON=" + (withPython? "1" : "0")); vf.WriteLine("DEBUG=" + (buildDebug? "1" : "0")); vf.WriteLine("STATIC=" + (buildStatic? "1" : "0")); @@ -265,6 +289,22 @@ function configureLibxml() of.WriteLine(s.replace(/\@WITH_SCHEMAS\@/, withSchemas? "1" : "0")); } else if (s.search(/\@WITH_REGEXPS\@/) != -1) { of.WriteLine(s.replace(/\@WITH_REGEXPS\@/, withRegExps? "1" : "0")); + } else if (s.search(/\@WITH_TREE\@/) != -1) { + of.WriteLine(s.replace(/\@WITH_TREE\@/, withTree? "1" : "0")); + } else if (s.search(/\@WITH_READER\@/) != -1) { + of.WriteLine(s.replace(/\@WITH_READER\@/, withReader? "1" : "0")); + } else if (s.search(/\@WITH_WALKER\@/) != -1) { + of.WriteLine(s.replace(/\@WITH_WALKER\@/, withWalker? "1" : "0")); + } else if (s.search(/\@WITH_PUSH\@/) != -1) { + of.WriteLine(s.replace(/\@WITH_PUSH\@/, withPush? "1" : "0")); + } else if (s.search(/\@WITH_VALID\@/) != -1) { + of.WriteLine(s.replace(/\@WITH_VALID\@/, withValid? "1" : "0")); + } else if (s.search(/\@WITH_SAX1\@/) != -1) { + of.WriteLine(s.replace(/\@WITH_SAX1\@/, withSax1? "1" : "0")); + } else if (s.search(/\@WITH_LEGACY\@/) != -1) { + of.WriteLine(s.replace(/\@WITH_LEGACY\@/, withLegacy? "1" : "0")); + } else if (s.search(/\@WITH_OUTPUT\@/) != -1) { + of.WriteLine(s.replace(/\@WITH_OUTPUT\@/, withOutput? "1" : "0")); } else of.WriteLine(ln); } @@ -400,6 +440,22 @@ for (i = 0; (i < WScript.Arguments.length) && (error == 0); i++) { withSchemas = strToBool(arg.substring(opt.length + 1, arg.length)); else if (opt == "regexps") withRegExps = strToBool(arg.substring(opt.length + 1, arg.length)); + else if (opt == "tree") + withTree = strToBool(arg.substring(opt.length + 1, arg.length)); + else if (opt == "reader") + withReader = strToBool(arg.substring(opt.length + 1, arg.length)); + else if (opt == "walker") + withWalker = strToBool(arg.substring(opt.length + 1, arg.length)); + else if (opt == "push") + withPush = strToBool(arg.substring(opt.length + 1, arg.length)); + else if (opt == "valid") + withValid = strToBool(arg.substring(opt.length + 1, arg.length)); + else if (opt == "sax1") + withSax1 = strToBool(arg.substring(opt.length + 1, arg.length)); + else if (opt == "legacy") + withLegacy = strToBool(arg.substring(opt.length + 1, arg.length)); + else if (opt == "output") + withOutput = strToBool(arg.substring(opt.length + 1, arg.length)); else if (opt == "python") withPython = strToBool(arg.substring(opt.length + 1, arg.length)); else if (opt == "compiler") @@ -521,6 +577,14 @@ txtOut += " zlib support: " + boolToStr(withZlib) + "\n"; txtOut += " Debugging module: " + boolToStr(withDebug) + "\n"; txtOut += " Memory debugging: " + boolToStr(withMemDebug) + "\n"; txtOut += " Regexp support: " + boolToStr(withRegExps) + "\n"; +txtOut += " Tree support: " + boolToStr(withTree) + "\n"; +txtOut += " Reader support: " + boolToStr(withReader) + "\n"; +txtOut += " Walker support: " + boolToStr(withWalker) + "\n"; +txtOut += " Push support: " + boolToStr(withPush) + "\n"; +txtOut += "Validation support: " + boolToStr(withValid) + "\n"; +txtOut += " SAX1 support: " + boolToStr(withSax1) + "\n"; +txtOut += " Legacy support: " + boolToStr(withLegacy) + "\n"; +txtOut += " Output support: " + boolToStr(withOutput) + "\n"; txtOut += "XML Schema support: " + boolToStr(withSchemas) + "\n"; txtOut += " Python bindings: " + boolToStr(withPython) + "\n"; txtOut += "\n"; |