c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

applied patch from Rob Richards to add schematron to the build on Windows

Browse Source 
* 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
This commit is contained in:
Daniel Veillard 2005-07-31 14:05:18 +00:00
parent eaecb3eab2
commit 5fe95a8fd9
14 changed files with 91 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Sun Jul 31 16:02:59 CEST 2005 Daniel Veillard <daniel@veillard.com>
* 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 <daniel@veillard.com>
* schematron.c: more bug fixes, improve the error reporting.

4
result/schematron/zvon10_0 Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0"?>
<AAA>
<BBB/>
</AAA>

5
result/schematron/zvon10_0.err Normal file
View File

@ -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

5
result/schematron/zvon10_1 Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0"?>
<AAA>
<BBB/>
<DDD/>
</AAA>

6
result/schematron/zvon10_1.err Normal file
View File

@ -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

9
result/schematron/zvon3_0 Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0"?>
<AAA>
<BBB>
<CCC/>
<CCC/>
</BBB>
<CCC name="c1"/>
<CCC name="c2"/>
</AAA>

6
result/schematron/zvon3_0.err Normal file
View File

@ -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

15
test/schematron/zvon10.sct Normal file
View File

@ -0,0 +1,15 @@
<schema xmlns="http://www.ascc.net/xml/schematron" >
<pattern name="Open model">
<rule context="AAA">
<assert test="BBB"> BBB element is not present</assert>
<assert test="CCC"> CCC element is not present</assert>
</rule>
</pattern>
<pattern name="Closed model">
<rule context="AAA">
<assert test="BBB"> BBB element is not present</assert>
<assert test="CCC"> CCC element is not present</assert>
<assert test="count(BBB|CCC) = count (*)">There is an extra element</assert>
</rule>
</pattern>
</schema>

3
test/schematron/zvon10_0.xml Normal file
View File

@ -0,0 +1,3 @@
<AAA>
<BBB/>
</AAA>

4
test/schematron/zvon10_1.xml Normal file
View File

@ -0,0 +1,4 @@
<AAA>
<BBB/>
<DDD/>
</AAA>

8
test/schematron/zvon3.sct Normal file
View File

@ -0,0 +1,8 @@
<schema xmlns="http://www.ascc.net/xml/schematron" >
<pattern name="Attribute test">
<rule context="CCC">
<assert test="@name">attribute name is not present</assert>
<report test="@name">attribute name is present</report>
</rule>
</pattern>
</schema>

8
test/schematron/zvon3_0.xml Normal file
View File

@ -0,0 +1,8 @@
<AAA>
<BBB>
<CCC/>
<CCC/>
</BBB>
<CCC name="c1"/>
<CCC name="c2"/>
</AAA>

2
win32/Makefile.msvc
View File

@ -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\

8
win32/configure.js
View File

@ -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";