From 5fe95a8fd95bdc8de8c33fc87f190ae4764b2c64 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Sun, 31 Jul 2005 14:05:18 +0000 Subject: [PATCH] applied patch from Rob Richards to add schematron to the build on Windows * win32/Makefile.msvc win32/configure.js: applied patch from Rob Richards to add schematron to the build on Windows * test/schematron/zvon3* result/schematron/zvon3*: second test * test/schematron/zvon10* result/schematron/zvon10*: this is the real second test 10 and 2 are swapped. Daniel --- ChangeLog | 8 ++++++++ result/schematron/zvon10_0 | 4 ++++ result/schematron/zvon10_0.err | 5 +++++ result/schematron/zvon10_1 | 5 +++++ result/schematron/zvon10_1.err | 6 ++++++ result/schematron/zvon3_0 | 9 +++++++++ result/schematron/zvon3_0.err | 6 ++++++ test/schematron/zvon10.sct | 15 +++++++++++++++ test/schematron/zvon10_0.xml | 3 +++ test/schematron/zvon10_1.xml | 4 ++++ test/schematron/zvon3.sct | 8 ++++++++ test/schematron/zvon3_0.xml | 8 ++++++++ win32/Makefile.msvc | 2 ++ win32/configure.js | 8 ++++++++ 14 files changed, 91 insertions(+) create mode 100644 result/schematron/zvon10_0 create mode 100644 result/schematron/zvon10_0.err create mode 100644 result/schematron/zvon10_1 create mode 100644 result/schematron/zvon10_1.err create mode 100644 result/schematron/zvon3_0 create mode 100644 result/schematron/zvon3_0.err create mode 100644 test/schematron/zvon10.sct create mode 100644 test/schematron/zvon10_0.xml create mode 100644 test/schematron/zvon10_1.xml create mode 100644 test/schematron/zvon3.sct create mode 100644 test/schematron/zvon3_0.xml diff --git a/ChangeLog b/ChangeLog index a53ed8c4..7cfd76dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Sun Jul 31 16:02:59 CEST 2005 Daniel Veillard + + * win32/Makefile.msvc win32/configure.js: applied patch from Rob + Richards to add schematron to the build on Windows + * test/schematron/zvon3* result/schematron/zvon3*: second test + * test/schematron/zvon10* result/schematron/zvon10*: this is the + real second test 10 and 2 are swapped. + Sun Jul 31 15:42:31 CEST 2005 Daniel Veillard * schematron.c: more bug fixes, improve the error reporting. diff --git a/result/schematron/zvon10_0 b/result/schematron/zvon10_0 new file mode 100644 index 00000000..9aae4b1e --- /dev/null +++ b/result/schematron/zvon10_0 @@ -0,0 +1,4 @@ + + + + diff --git a/result/schematron/zvon10_0.err b/result/schematron/zvon10_0.err new file mode 100644 index 00000000..524ecd89 --- /dev/null +++ b/result/schematron/zvon10_0.err @@ -0,0 +1,5 @@ +Pattern: Open model +/AAA line 1: CCC element is not present +Pattern: Closed model +/AAA line 1: CCC element is not present +./test/schematron/zvon10_0.xml fails to validate diff --git a/result/schematron/zvon10_1 b/result/schematron/zvon10_1 new file mode 100644 index 00000000..d82353ae --- /dev/null +++ b/result/schematron/zvon10_1 @@ -0,0 +1,5 @@ + + + + + diff --git a/result/schematron/zvon10_1.err b/result/schematron/zvon10_1.err new file mode 100644 index 00000000..9bc361c3 --- /dev/null +++ b/result/schematron/zvon10_1.err @@ -0,0 +1,6 @@ +Pattern: Open model +/AAA line 1: CCC element is not present +Pattern: Closed model +/AAA line 1: CCC element is not present +/AAA line 1: There is an extra element +./test/schematron/zvon10_1.xml fails to validate diff --git a/result/schematron/zvon3_0 b/result/schematron/zvon3_0 new file mode 100644 index 00000000..a8a6ed77 --- /dev/null +++ b/result/schematron/zvon3_0 @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/result/schematron/zvon3_0.err b/result/schematron/zvon3_0.err new file mode 100644 index 00000000..419e7291 --- /dev/null +++ b/result/schematron/zvon3_0.err @@ -0,0 +1,6 @@ +Pattern: Attribute test +/AAA/BBB/CCC[1] line 3: attribute name is not present +/AAA/BBB/CCC[2] line 4: attribute name is not present +/AAA/CCC[1] line 6: attribute name is present +/AAA/CCC[2] line 7: attribute name is present +./test/schematron/zvon3_0.xml fails to validate diff --git a/test/schematron/zvon10.sct b/test/schematron/zvon10.sct new file mode 100644 index 00000000..783fac57 --- /dev/null +++ b/test/schematron/zvon10.sct @@ -0,0 +1,15 @@ + + + + BBB element is not present + CCC element is not present + + + + + BBB element is not present + CCC element is not present + There is an extra element + + + diff --git a/test/schematron/zvon10_0.xml b/test/schematron/zvon10_0.xml new file mode 100644 index 00000000..d3ac3884 --- /dev/null +++ b/test/schematron/zvon10_0.xml @@ -0,0 +1,3 @@ + + + diff --git a/test/schematron/zvon10_1.xml b/test/schematron/zvon10_1.xml new file mode 100644 index 00000000..ba9bdca8 --- /dev/null +++ b/test/schematron/zvon10_1.xml @@ -0,0 +1,4 @@ + + + + diff --git a/test/schematron/zvon3.sct b/test/schematron/zvon3.sct new file mode 100644 index 00000000..f75b67b2 --- /dev/null +++ b/test/schematron/zvon3.sct @@ -0,0 +1,8 @@ + + + + attribute name is not present + attribute name is present + + + diff --git a/test/schematron/zvon3_0.xml b/test/schematron/zvon3_0.xml new file mode 100644 index 00000000..ec8dc438 --- /dev/null +++ b/test/schematron/zvon3_0.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc index 3d115764..0c0a41bd 100644 --- a/win32/Makefile.msvc +++ b/win32/Makefile.msvc @@ -115,6 +115,7 @@ XML_OBJS = $(XML_INTDIR)\c14n.obj\ $(XML_INTDIR)\relaxng.obj\ $(XML_INTDIR)\SAX2.obj\ $(XML_INTDIR)\SAX.obj\ + $(XML_INTDIR)\schematron.obj\ $(XML_INTDIR)\threads.obj\ $(XML_INTDIR)\tree.obj\ $(XML_INTDIR)\uri.obj\ @@ -159,6 +160,7 @@ XML_OBJS_A = $(XML_INTDIR_A)\c14n.obj\ $(XML_INTDIR_A)\relaxng.obj\ $(XML_INTDIR_A)\SAX2.obj\ $(XML_INTDIR_A)\SAX.obj\ + $(XML_INTDIR_A)\schematron.obj\ $(XML_INTDIR_A)\threads.obj\ $(XML_INTDIR_A)\tree.obj\ $(XML_INTDIR_A)\uri.obj\ diff --git a/win32/configure.js b/win32/configure.js index d8571461..5837aaf2 100644 --- a/win32/configure.js +++ b/win32/configure.js @@ -45,6 +45,7 @@ var withZlib = false; var withDebug = true; var withMemDebug = false; var withSchemas = true; +var withSchematron = true; var withRegExps = true; var withModules = true; var withTree = true; @@ -138,6 +139,7 @@ function usage() 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 += " schematron: Enable Schematron support (" + (withSchematron? "yes" : "no") + ")\n"; txt += " python: Build Python bindings (" + (withPython? "yes" : "no") + ")\n"; txt += "\nWin32 build options, default value given in parentheses:\n\n"; txt += " compiler: Compiler to be used [msvc|mingw|bcb] (" + compiler + ")\n"; @@ -232,6 +234,7 @@ function discoverVersion() vf.WriteLine("WITH_DEBUG=" + (withDebug? "1" : "0")); vf.WriteLine("WITH_MEM_DEBUG=" + (withMemDebug? "1" : "0")); vf.WriteLine("WITH_SCHEMAS=" + (withSchemas? "1" : "0")); + vf.WriteLine("WITH_SCHEMATRON=" + (withSchematron? "1" : "0")); vf.WriteLine("WITH_REGEXPS=" + (withRegExps? "1" : "0")); vf.WriteLine("WITH_MODULES=" + (withModules? "1" : "0")); vf.WriteLine("WITH_TREE=" + (withTree? "1" : "0")); @@ -320,6 +323,8 @@ function configureLibxml() of.WriteLine(s.replace(/\@WITH_MEM_DEBUG\@/, withMemDebug? "1" : "0")); } else if (s.search(/\@WITH_SCHEMAS\@/) != -1) { of.WriteLine(s.replace(/\@WITH_SCHEMAS\@/, withSchemas? "1" : "0")); + } else if (s.search(/\@WITH_SCHEMATRON\@/) != -1) { + of.WriteLine(s.replace(/\@WITH_SCHEMATRON\@/, withSchematron? "1" : "0")); } else if (s.search(/\@WITH_REGEXPS\@/) != -1) { of.WriteLine(s.replace(/\@WITH_REGEXPS\@/, withRegExps? "1" : "0")); } else if (s.search(/\@WITH_MODULES\@/) != -1) { @@ -459,6 +464,8 @@ for (i = 0; (i < WScript.Arguments.length) && (error == 0); i++) { withMemDebug = strToBool(arg.substring(opt.length + 1, arg.length)); else if (opt == "schemas") withSchemas = strToBool(arg.substring(opt.length + 1, arg.length)); + else if (opt == "schematron") + withSchematron = 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") @@ -638,6 +645,7 @@ 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 += "Schematron support: " + boolToStr(withSchematron) + "\n"; txtOut += " Python bindings: " + boolToStr(withPython) + "\n"; txtOut += "\n"; txtOut += "Win32 build configuration\n";