From efe91bff6078fe98f902eece8cca1e0e0803f15f Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 16 Jul 2014 09:35:15 +0200 Subject: Work around MSYS path translation --- dist/examples/cxx/tree/custom/comments/makefile | 8 +++++++- dist/examples/cxx/tree/custom/contacts/makefile | 8 +++++++- dist/examples/cxx/tree/custom/mixed/makefile | 9 ++++++++- dist/examples/cxx/tree/custom/wildcard/makefile | 10 ++++++++-- 4 files changed, 30 insertions(+), 5 deletions(-) (limited to 'dist') diff --git a/dist/examples/cxx/tree/custom/comments/makefile b/dist/examples/cxx/tree/custom/comments/makefile index 963f262..4c231c6 100644 --- a/dist/examples/cxx/tree/custom/comments/makefile +++ b/dist/examples/cxx/tree/custom/comments/makefile @@ -22,9 +22,15 @@ people.cxx people.ixx people.hxx: people.xsd # Generate header for XML Schema namespace. # XML_SCHEMA_XSDFLAGS := --generate-xml-schema --generate-serialization \ ---custom-type anyType=/type_base \ --hxx-epilogue '\#include "xml-schema-custom.hxx"' +ifneq ($(shell uname -o),Msys) +XML_SCHEMA_XSDFLAGS += --custom-type anyType=/type_base +else +# Prevent MSYS from converting / to Windows path. +XML_SCHEMA_XSDFLAGS += --custom-type anyType=//type_base +endif + xml-schema.hxx: $(XSD) cxx-tree $(XML_SCHEMA_XSDFLAGS) xml-schema.xsd diff --git a/dist/examples/cxx/tree/custom/contacts/makefile b/dist/examples/cxx/tree/custom/contacts/makefile index 8155d0e..845f6c3 100644 --- a/dist/examples/cxx/tree/custom/contacts/makefile +++ b/dist/examples/cxx/tree/custom/contacts/makefile @@ -4,9 +4,15 @@ include $(root)/build/cxx/rules.make include $(root)/build/xsd/tree-rules.make -override XSDFLAGS += --generate-inline --custom-type contact=/contact_base \ +override XSDFLAGS += --generate-inline \ --hxx-epilogue '\#include "contacts-custom.hxx"' +ifneq ($(shell uname -o),Msys) +override XSDFLAGS += --custom-type contact=/contact_base +else +# Prevent MSYS from converting / to Windows path. +override XSDFLAGS += --custom-type contact=//contact_base +endif # Build. # diff --git a/dist/examples/cxx/tree/custom/mixed/makefile b/dist/examples/cxx/tree/custom/mixed/makefile index a5ea87e..c5dac63 100644 --- a/dist/examples/cxx/tree/custom/mixed/makefile +++ b/dist/examples/cxx/tree/custom/mixed/makefile @@ -5,7 +5,14 @@ include $(root)/build/xsd/tree-rules.make override XSDFLAGS += --generate-inline --generate-serialization \ ---custom-type bio=/bio_base --hxx-epilogue '\#include "people-custom.hxx"' +--hxx-epilogue '\#include "people-custom.hxx"' + +ifneq ($(shell uname -o),Msys) +override XSDFLAGS += --custom-type bio=/bio_base +else +# Prevent MSYS from converting / to Windows path. +override XSDFLAGS += --custom-type bio=//bio_base +endif # Build. diff --git a/dist/examples/cxx/tree/custom/wildcard/makefile b/dist/examples/cxx/tree/custom/wildcard/makefile index 20ea1d2..f7561a2 100644 --- a/dist/examples/cxx/tree/custom/wildcard/makefile +++ b/dist/examples/cxx/tree/custom/wildcard/makefile @@ -5,8 +5,14 @@ include $(root)/build/xsd/tree-rules.make override XSDFLAGS += --generate-inline --generate-ostream \ ---generate-serialization --custom-type data=/data_base \ ---hxx-epilogue '\#include "wildcard-custom.hxx"' +--generate-serialization --hxx-epilogue '\#include "wildcard-custom.hxx"' + +ifneq ($(shell uname -o),Msys) +override XSDFLAGS += --custom-type data=/data_base +else +# Prevent MSYS from converting / to Windows path. +override XSDFLAGS += --custom-type data=//data_base +endif # Build. -- cgit v1.1