diff --git a/ChangeLog b/ChangeLog index 3452ea02..206ba125 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Dec 11 14:55:22 CET 2003 Igor Zlatkovic + + * win32/Makefile.* win32/configure.js: Added pattern support + Wed Dec 10 14:11:20 CET 2003 Daniel Veillard * configure.in doc/* libxml.spec.in: preparing release of diff --git a/win32/Makefile.bcb b/win32/Makefile.bcb index 3bf45713..0fa03ab7 100644 --- a/win32/Makefile.bcb +++ b/win32/Makefile.bcb @@ -129,6 +129,7 @@ XML_OBJS = $(XML_INTDIR)\c14n.obj\ $(XML_INTDIR)\nanohttp.obj\ $(XML_INTDIR)\parser.obj\ $(XML_INTDIR)\parserInternals.obj\ + $(XML_INTDIR)\pattern.obj\ $(XML_INTDIR)\relaxng.obj\ $(XML_INTDIR)\SAX.obj\ $(XML_INTDIR)\SAX2.obj\ @@ -169,6 +170,7 @@ XML_OBJS_A = $(XML_INTDIR_A)\c14n.obj\ $(XML_INTDIR_A)\nanohttp.obj\ $(XML_INTDIR_A)\parser.obj\ $(XML_INTDIR_A)\parserInternals.obj\ + $(XML_INTDIR_A)\pattern.obj\ $(XML_INTDIR_A)\relaxng.obj\ $(XML_INTDIR_A)\SAX.obj\ $(XML_INTDIR_A)\SAX2.obj\ diff --git a/win32/Makefile.mingw b/win32/Makefile.mingw index c6a167f0..2f2b4d87 100644 --- a/win32/Makefile.mingw +++ b/win32/Makefile.mingw @@ -119,6 +119,7 @@ XML_OBJS = $(XML_INTDIR)/c14n.o\ $(XML_INTDIR)/nanohttp.o\ $(XML_INTDIR)/parser.o\ $(XML_INTDIR)/parserInternals.o\ + $(XML_INTDIR)/pattern.o\ $(XML_INTDIR)/relaxng.o\ $(XML_INTDIR)/SAX.o\ $(XML_INTDIR)/SAX2.o\ @@ -161,6 +162,7 @@ XML_OBJS_A = $(XML_INTDIR_A)/c14n.o\ $(XML_INTDIR_A)/nanohttp.o\ $(XML_INTDIR_A)/parser.o\ $(XML_INTDIR_A)/parserInternals.o\ + $(XML_INTDIR_A)/pattern.o\ $(XML_INTDIR_A)/relaxng.o\ $(XML_INTDIR_A)/SAX.o\ $(XML_INTDIR_A)/SAX2.o\ diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc index 08c34918..15651f5c 100644 --- a/win32/Makefile.msvc +++ b/win32/Makefile.msvc @@ -108,6 +108,7 @@ XML_OBJS = $(XML_INTDIR)\c14n.obj\ $(XML_INTDIR)\nanohttp.obj\ $(XML_INTDIR)\parser.obj\ $(XML_INTDIR)\parserInternals.obj\ + $(XML_INTDIR)\pattern.obj\ $(XML_INTDIR)\relaxng.obj\ $(XML_INTDIR)\SAX2.obj\ $(XML_INTDIR)\SAX.obj\ @@ -148,6 +149,7 @@ XML_OBJS_A = $(XML_INTDIR_A)\c14n.obj\ $(XML_INTDIR_A)\nanohttp.obj\ $(XML_INTDIR_A)\parser.obj\ $(XML_INTDIR_A)\parserInternals.obj\ + $(XML_INTDIR_A)\pattern.obj\ $(XML_INTDIR_A)\relaxng.obj\ $(XML_INTDIR_A)\SAX2.obj\ $(XML_INTDIR_A)\SAX.obj\ diff --git a/win32/configure.js b/win32/configure.js index 6c2ec908..df3836d4 100644 --- a/win32/configure.js +++ b/win32/configure.js @@ -48,6 +48,7 @@ var withTree = true; var withReader = true; var withWriter = true; var withWalker = true; +var withPattern = true; var withPush = true; var withValid = true; var withSax1 = true; @@ -126,6 +127,7 @@ function usage() txt += " reader: Enable xmlReader api (" + (withReader? "yes" : "no") + ")\n"; txt += " writer: Enable xmlWriter api (" + (withWriter? "yes" : "no") + ")\n"; txt += " walker: Enable xmlDocWalker api (" + (withWalker? "yes" : "no") + ")\n"; + txt += " pattern: Enable xmlPattern api (" + (withPattern? "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"; @@ -215,6 +217,7 @@ function discoverVersion() vf.WriteLine("WITH_READER=" + (withReader? "1" : "0")); vf.WriteLine("WITH_WRITER=" + (withWriter? "1" : "0")); vf.WriteLine("WITH_WALKER=" + (withWalker? "1" : "0")); + vf.WriteLine("WITH_PATTERN=" + (withPattern? "1" : "0")); vf.WriteLine("WITH_PUSH=" + (withPush? "1" : "0")); vf.WriteLine("WITH_VALID=" + (withValid? "1" : "0")); vf.WriteLine("WITH_SAX1=" + (withSax1? "1" : "0")); @@ -304,6 +307,8 @@ function configureLibxml() of.WriteLine(s.replace(/\@WITH_WRITER\@/, withWriter? "1" : "0")); } else if (s.search(/\@WITH_WALKER\@/) != -1) { of.WriteLine(s.replace(/\@WITH_WALKER\@/, withWalker? "1" : "0")); + } else if (s.search(/\@WITH_PATTERN\@/) != -1) { + of.WriteLine(s.replace(/\@WITH_PATTERN\@/, withPattern? "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) { @@ -457,6 +462,8 @@ for (i = 0; (i < WScript.Arguments.length) && (error == 0); i++) { withWriter = strToBool(arg.substring(opt.length + 1, arg.length)); else if (opt == "walker") withWalker = strToBool(arg.substring(opt.length + 1, arg.length)); + else if (opt == "pattern") + withPattern = 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") @@ -601,6 +608,7 @@ txtOut += " Tree support: " + boolToStr(withTree) + "\n"; txtOut += " Reader support: " + boolToStr(withReader) + "\n"; txtOut += " Writer support: " + boolToStr(withWriter) + "\n"; txtOut += " Walker support: " + boolToStr(withWalker) + "\n"; +txtOut += " Pattern support: " + boolToStr(withPattern) + "\n"; txtOut += " Push support: " + boolToStr(withPush) + "\n"; txtOut += "Validation support: " + boolToStr(withValid) + "\n"; txtOut += " SAX1 support: " + boolToStr(withSax1) + "\n";