diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2010-10-11 12:43:48 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2010-10-11 12:43:48 +0200 |
| commit | 9553149aa6b6561c49981adf2848607a43765054 (patch) | |
| tree | ff941ad89aa2c87ec5ddbd7a7bdd189fc33f87ba /dist/libxsde | |
| parent | 0dd6d623af5dfe3590d0c269f76a2fa322e75e58 (diff) | |
Support for validation of the pattern facet
New test: hybrid/pattern.
Diffstat (limited to 'dist/libxsde')
| -rw-r--r-- | dist/libxsde/xsde/makefile | 9 | ||||
| -rw-r--r-- | dist/libxsde/xsde/nmakefile | 11 |
2 files changed, 19 insertions, 1 deletions
diff --git a/dist/libxsde/xsde/makefile b/dist/libxsde/xsde/makefile index a134d29..1e3db26 100644 --- a/dist/libxsde/xsde/makefile +++ b/dist/libxsde/xsde/makefile @@ -9,6 +9,12 @@ EXTRA_CPPFLAGS := -I.. src := c/expat/xmlparse.c c/expat/xmlrole.c c/expat/xmltok.c src += c/genx/genx.c c/genx/char-props.c +ifneq ($(XSDE_PARSER_VALIDATION)$(XSDE_SERIALIZER_VALIDATION),nn) +ifeq ($(XSDE_REGEXP),y) +src += c/regexp/chvalid.c c/regexp/xmlunicode.c c/regexp/xmlregexp.c +endif +endif + ifeq ($(XSDE_CUSTOM_ALLOCATOR),y) ifeq ($(XSDE_DEFAULT_ALLOCATOR),y) src += allocator.c @@ -563,6 +569,9 @@ endif ifeq ($(XSDE_SERIALIZER_VALIDATION),y) @echo $(h)define XSDE_SERIALIZER_VALIDATION >>$@ endif +ifeq ($(XSDE_REGEXP),y) + @echo $(h)define XSDE_REGEXP >>$@ +endif ifeq ($(XSDE_REUSE_STYLE),mixin) @echo $(h)define XSDE_REUSE_STYLE_MIXIN >>$@ else diff --git a/dist/libxsde/xsde/nmakefile b/dist/libxsde/xsde/nmakefile index 9eb9aea..da40ece 100644 --- a/dist/libxsde/xsde/nmakefile +++ b/dist/libxsde/xsde/nmakefile @@ -11,6 +11,12 @@ EXTRA_CPPFLAGS = /I.. src = c\expat\xmlparse.c c\expat\xmlrole.c c\expat\xmltok.c src = $(src) c\genx\genx.c c\genx\char-props.c +!if "$(XSDE_PARSER_VALIDATION)$(XSDE_SERIALIZER_VALIDATION)" != "nn" +!if "$(XSDE_REGEXP)" == "n" +src = $(src) c\regexp\chvalid.c c\regexp\xmlunicode.c c\regexp\xmlregexp.c +!endif +!endif + !if "$(XSDE_CUSTOM_ALLOCATOR)" == "y" !if "$(XSDE_DEFAULT_ALLOCATOR)" == "y" src = $(src) allocator.c @@ -562,7 +568,9 @@ config.h: !if "$(XSDE_SERIALIZER_VALIDATION)" == "y" @echo #define XSDE_SERIALIZER_VALIDATION >>$@ !endif - +!if "$(XSDE_REGEXP)" == "y" + @echo #define REGEXP >>$@ +!endif !if "$(XSDE_REUSE_STYLE)" == "mixin" @echo #define XSDE_REUSE_STYLE_MIXIN >>$@ !else @@ -619,6 +627,7 @@ cleanobj: -del xsde.lib config.h -del c\expat\*.obj -del c\genx\*.obj + -del c\regexp\*.obj -del cxx\*.obj -del cxx\parser\*.obj -del cxx\parser\expat\*.obj |