diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-07-23 15:25:44 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-07-23 15:25:44 +0200 |
| commit | 8286ac511144e4f17d34eac9affb97e50646344a (patch) | |
| tree | f1af7320d7b6be6be059216d0ad08ac7b4f73fd0 /xsd/examples/cxx/tree/custom | |
| parent | a15cf65c44d5c224169c32ef5495b68c758134b7 (diff) | |
Imported Upstream version 4.0.0upstream/4.0.0
Diffstat (limited to 'xsd/examples/cxx/tree/custom')
45 files changed, 74 insertions, 131 deletions
diff --git a/xsd/examples/cxx/tree/custom/calendar/calendar.xml b/xsd/examples/cxx/tree/custom/calendar/calendar.xml index ae9e570..5cc898a 100644 --- a/xsd/examples/cxx/tree/custom/calendar/calendar.xml +++ b/xsd/examples/cxx/tree/custom/calendar/calendar.xml @@ -3,7 +3,6 @@ <!-- file : examples/cxx/tree/custom/calendar/calendar.xml -author : Boris Kolpackov <boris@codesynthesis.com> copyright : not copyrighted - public domain --> diff --git a/xsd/examples/cxx/tree/custom/calendar/calendar.xsd b/xsd/examples/cxx/tree/custom/calendar/calendar.xsd index fa612a7..04b3af1 100644 --- a/xsd/examples/cxx/tree/custom/calendar/calendar.xsd +++ b/xsd/examples/cxx/tree/custom/calendar/calendar.xsd @@ -3,7 +3,6 @@ <!-- file : examples/cxx/tree/custom/calendar/calendar.xsd -author : Boris Kolpackov <boris@codesynthesis.com> copyright : not copyrighted - public domain --> diff --git a/xsd/examples/cxx/tree/custom/calendar/driver.cxx b/xsd/examples/cxx/tree/custom/calendar/driver.cxx index 02f1c27..a5b223e 100644 --- a/xsd/examples/cxx/tree/custom/calendar/driver.cxx +++ b/xsd/examples/cxx/tree/custom/calendar/driver.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/calendar/driver.cxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain #include <memory> // std::auto_ptr diff --git a/xsd/examples/cxx/tree/custom/calendar/makefile b/xsd/examples/cxx/tree/custom/calendar/makefile index f4f4598..6998ffd 100644 --- a/xsd/examples/cxx/tree/custom/calendar/makefile +++ b/xsd/examples/cxx/tree/custom/calendar/makefile @@ -1,6 +1,5 @@ # file : examples/cxx/tree/custom/calendar/makefile -# author : Boris Kolpackov <boris@codesynthesis.com> -# copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC +# copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC # license : GNU GPL v2 + exceptions; see accompanying LICENSE file include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make @@ -34,7 +33,7 @@ endif # $(driver): $(obj) $(xerces_c.l) $(boost_date_time.l) -$(obj) $(dep): cpp_options := -I$(src_root)/libxsd +$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) $(boost_date_time.l.cpp-options) # Header file for XML Schema namespace. @@ -43,7 +42,7 @@ $(out_base)/xml-schema.hxx: $(out_root)/xsd/xsd $(call message,xsd $(src_base)/xml-schema.xsd,\ $(out_root)/xsd/xsd cxx-tree --output-dir $(out_base) --generate-xml-schema \ --custom-type date \ ---hxx-epilogue '\#include "xml-schema-custom.hxx"' xml-schema.xsd) +--hxx-epilogue '#include "xml-schema-custom.hxx"' xml-schema.xsd) # # @@ -51,17 +50,13 @@ genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) gen := $(addprefix $(out_base)/,$(genf)) $(gen): xsd := $(out_root)/xsd/xsd - -# We have to double-escape '#' because the message function -# (which is used in command scripts) expands things twice. -# -$(gen): xsd_options := \ +$(gen): xsd_options += \ --generate-inline \ --extern-xml-schema xml-schema.xsd $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # @@ -92,9 +87,16 @@ $(dist-common): $(dist): $(dist-common) $(call install-data,$(src_base)/README,$(dist_prefix)/$(path)/README) +$(dist-win): |$(out_root)/.dist-pre $(dist-win): $(dist-common) $(call install-data,$(src_base)/README,$(dist_prefix)/$(path)/README.txt) - $(call message,,unix2dos $(dist_prefix)/$(path)/README.txt) + $(call message,,todos $(dist_prefix)/$(path)/README.txt) + $(call meta-vc8sln,$(src_root)/dist/template-vc8.sln,calendar-vc8.sln) + $(call meta-vc9sln,$(src_root)/dist/template-vc9.sln,calendar-vc9.sln) + $(call meta-vc10sln,$(src_root)/dist/template-vc10.sln,calendar-vc10.sln) + $(call meta-vc11sln,$(src_root)/dist/template-vc11.sln,calendar-vc11.sln) + $(call meta-vc12sln,$(src_root)/dist/template-vc12.sln,calendar-vc12.sln) + # Clean. # @@ -121,9 +123,15 @@ endif $(call include,$(bld_root)/cxx/o-e.make) $(call include,$(bld_root)/cxx/cxx-o.make) $(call include,$(bld_root)/cxx/cxx-d.make) -$(call include,$(bld_root)/install.make) $(call include,$(scf_root)/xsd/tree/xsd-cxx.make) +$(call include,$(bld_root)/install.make) +$(call include,$(bld_root)/meta/vc8sln.make) +$(call include,$(bld_root)/meta/vc9sln.make) +$(call include,$(bld_root)/meta/vc10sln.make) +$(call include,$(bld_root)/meta/vc11sln.make) +$(call include,$(bld_root)/meta/vc12sln.make) + # Dependencies. # $(call import,$(src_root)/xsd/makefile) diff --git a/xsd/examples/cxx/tree/custom/calendar/xml-schema-custom.cxx b/xsd/examples/cxx/tree/custom/calendar/xml-schema-custom.cxx index 440a407..645880b 100644 --- a/xsd/examples/cxx/tree/custom/calendar/xml-schema-custom.cxx +++ b/xsd/examples/cxx/tree/custom/calendar/xml-schema-custom.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/calendar/xml-schema-custom.cxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain // Include xml-schema.hxx instead of xml-schema-custom.hxx here. diff --git a/xsd/examples/cxx/tree/custom/calendar/xml-schema-custom.hxx b/xsd/examples/cxx/tree/custom/calendar/xml-schema-custom.hxx index 2bab0b5..58f57e6 100644 --- a/xsd/examples/cxx/tree/custom/calendar/xml-schema-custom.hxx +++ b/xsd/examples/cxx/tree/custom/calendar/xml-schema-custom.hxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/calendar/xml-schema-custom.hxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain // Do not include this file directly, use xml-schema.hxx instead. This diff --git a/xsd/examples/cxx/tree/custom/comments/dom-parse.cxx b/xsd/examples/cxx/tree/custom/comments/dom-parse.cxx index 1ba62e5..9999f67 100644 --- a/xsd/examples/cxx/tree/custom/comments/dom-parse.cxx +++ b/xsd/examples/cxx/tree/custom/comments/dom-parse.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/comments/dom-parse.cxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain #include "dom-parse.hxx" @@ -30,18 +29,14 @@ parse (std::istream& is, const std::string& id, bool validate) DOMImplementation* impl ( DOMImplementationRegistry::getDOMImplementation (ls_id)); -#if _XERCES_VERSION >= 30000 - - // Xerces-C++ 3.0.0 and later. - // xml::dom::auto_ptr<DOMLSParser> parser ( impl->createLSParser (DOMImplementationLS::MODE_SYNCHRONOUS, 0)); DOMConfiguration* conf (parser->getDomConfig ()); - // Discard comment nodes in the document. + // Preserve comment nodes in the document. // - conf->setParameter (XMLUni::fgDOMComments, false); + conf->setParameter (XMLUni::fgDOMComments, true); // Enable datatype normalization. // @@ -85,39 +80,12 @@ parse (std::istream& is, const std::string& id, bool validate) xml::dom::bits::error_handler_proxy<char> ehp (eh); conf->setParameter (XMLUni::fgDOMErrorHandler, &ehp); -#else // _XERCES_VERSION >= 30000 - - // Same as above but for Xerces-C++ 2 series. - // - xml::dom::auto_ptr<DOMBuilder> parser ( - impl->createDOMBuilder (DOMImplementationLS::MODE_SYNCHRONOUS, 0)); - - parser->setFeature (XMLUni::fgDOMComments, false); - parser->setFeature (XMLUni::fgDOMDatatypeNormalization, true); - parser->setFeature (XMLUni::fgDOMEntities, false); - parser->setFeature (XMLUni::fgDOMNamespaces, true); - parser->setFeature (XMLUni::fgDOMWhitespaceInElementContent, false); - parser->setFeature (XMLUni::fgDOMValidation, validate); - parser->setFeature (XMLUni::fgXercesSchema, validate); - parser->setFeature (XMLUni::fgXercesSchemaFullChecking, false); - parser->setFeature (XMLUni::fgXercesUserAdoptsDOMDocument, true); - - tree::error_handler<char> eh; - xml::dom::bits::error_handler_proxy<char> ehp (eh); - parser->setErrorHandler (&ehp); - -#endif // _XERCES_VERSION >= 30000 - // Prepare input stream. // xml::sax::std_input_source isrc (is, id); Wrapper4InputSource wrap (&isrc, false); -#if _XERCES_VERSION >= 30000 xml::dom::auto_ptr<DOMDocument> doc (parser->parse (&wrap)); -#else - xml::dom::auto_ptr<DOMDocument> doc (parser->parse (wrap)); -#endif eh.throw_if_failed<tree::parsing<char> > (); diff --git a/xsd/examples/cxx/tree/custom/comments/dom-parse.hxx b/xsd/examples/cxx/tree/custom/comments/dom-parse.hxx index 05bfa2e..fea46d0 100644 --- a/xsd/examples/cxx/tree/custom/comments/dom-parse.hxx +++ b/xsd/examples/cxx/tree/custom/comments/dom-parse.hxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/comments/dom-parse.hxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain #ifndef DOM_PARSE diff --git a/xsd/examples/cxx/tree/custom/comments/driver.cxx b/xsd/examples/cxx/tree/custom/comments/driver.cxx index 4ce2573..39b16f7 100644 --- a/xsd/examples/cxx/tree/custom/comments/driver.cxx +++ b/xsd/examples/cxx/tree/custom/comments/driver.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/commens/driver.cxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain #include <memory> // std::auto_ptr diff --git a/xsd/examples/cxx/tree/custom/comments/makefile b/xsd/examples/cxx/tree/custom/comments/makefile index de265a1..eebb75e 100644 --- a/xsd/examples/cxx/tree/custom/comments/makefile +++ b/xsd/examples/cxx/tree/custom/comments/makefile @@ -1,6 +1,5 @@ # file : examples/cxx/tree/custom/comments/makefile -# author : Boris Kolpackov <boris@codesynthesis.com> -# copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC +# copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC # license : GNU GPL v2 + exceptions; see accompanying LICENSE file include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make @@ -28,7 +27,7 @@ $(call import,\ # $(driver): $(obj) $(xerces_c.l) -$(obj) $(dep): cpp_options := -I$(src_root)/libxsd +$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) # Header file for XML Schema namespace. @@ -37,7 +36,7 @@ $(out_base)/xml-schema.hxx: $(out_root)/xsd/xsd $(call message,xsd $(src_base)/xml-schema.xsd,\ $(out_root)/xsd/xsd cxx-tree --output-dir $(out_base) --generate-xml-schema \ --generate-serialization --custom-type anyType=/type_base \ ---hxx-epilogue '\#include "xml-schema-custom.hxx"' xml-schema.xsd) +--hxx-epilogue '#include "xml-schema-custom.hxx"' xml-schema.xsd) # # @@ -45,15 +44,14 @@ genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) gen := $(addprefix $(out_base)/,$(genf)) $(gen): xsd := $(out_root)/xsd/xsd - -$(gen): xsd_options := \ +$(gen): xsd_options += \ --generate-inline \ --generate-serialization \ --extern-xml-schema xml-schema.xsd $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # @@ -90,7 +88,7 @@ $(dist): $(dist-common) $(dist-win): $(dist-common) $(call install-data,$(src_base)/README,$(dist_prefix)/$(path)/README.txt) - $(call message,,unix2dos $(dist_prefix)/$(path)/README.txt) + $(call message,,todos $(dist_prefix)/$(path)/README.txt) # Clean. # diff --git a/xsd/examples/cxx/tree/custom/comments/people.xml b/xsd/examples/cxx/tree/custom/comments/people.xml index b6a44e5..55c08a1 100644 --- a/xsd/examples/cxx/tree/custom/comments/people.xml +++ b/xsd/examples/cxx/tree/custom/comments/people.xml @@ -3,7 +3,6 @@ <!-- file : examples/cxx/tree/custom/comments/people.xml -author : Boris Kolpackov <boris@codesynthesis.com> copyright : not copyrighted - public domain --> diff --git a/xsd/examples/cxx/tree/custom/comments/people.xsd b/xsd/examples/cxx/tree/custom/comments/people.xsd index 2f40754..e70dd2a 100644 --- a/xsd/examples/cxx/tree/custom/comments/people.xsd +++ b/xsd/examples/cxx/tree/custom/comments/people.xsd @@ -3,7 +3,6 @@ <!-- file : examples/cxx/tree/custom/comments/people.xsd -author : Boris Kolpackov <boris@codesynthesis.com> copyright : not copyrighted - public domain --> diff --git a/xsd/examples/cxx/tree/custom/comments/xml-schema-custom.cxx b/xsd/examples/cxx/tree/custom/comments/xml-schema-custom.cxx index d86d6af..67937d1 100644 --- a/xsd/examples/cxx/tree/custom/comments/xml-schema-custom.cxx +++ b/xsd/examples/cxx/tree/custom/comments/xml-schema-custom.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/comments/xml-schema-custom.cxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain // Include xml-schema.hxx instead of xml-schema-custom.hxx here. diff --git a/xsd/examples/cxx/tree/custom/comments/xml-schema-custom.hxx b/xsd/examples/cxx/tree/custom/comments/xml-schema-custom.hxx index 821d0dd..0442a44 100644 --- a/xsd/examples/cxx/tree/custom/comments/xml-schema-custom.hxx +++ b/xsd/examples/cxx/tree/custom/comments/xml-schema-custom.hxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/comments/xml-schema-custom.hxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain // Do not include this file directly, use xml-schema.hxx instead. This diff --git a/xsd/examples/cxx/tree/custom/contacts/contacts-custom.cxx b/xsd/examples/cxx/tree/custom/contacts/contacts-custom.cxx index dd7c453..8bb0e22 100644 --- a/xsd/examples/cxx/tree/custom/contacts/contacts-custom.cxx +++ b/xsd/examples/cxx/tree/custom/contacts/contacts-custom.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/contacts/contacts-custom.cxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain #include <ostream> diff --git a/xsd/examples/cxx/tree/custom/contacts/contacts-custom.hxx b/xsd/examples/cxx/tree/custom/contacts/contacts-custom.hxx index fdb6810..65d6244 100644 --- a/xsd/examples/cxx/tree/custom/contacts/contacts-custom.hxx +++ b/xsd/examples/cxx/tree/custom/contacts/contacts-custom.hxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/contacts/contacts-custom.hxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain // Do not include this file directly, use contacts.hxx instead. This diff --git a/xsd/examples/cxx/tree/custom/contacts/contacts.xml b/xsd/examples/cxx/tree/custom/contacts/contacts.xml index c6dc38f..331e692 100644 --- a/xsd/examples/cxx/tree/custom/contacts/contacts.xml +++ b/xsd/examples/cxx/tree/custom/contacts/contacts.xml @@ -3,7 +3,6 @@ <!-- file : examples/cxx/tree/custom/contacts/contacts.xml -author : Boris Kolpackov <boris@codesynthesis.com> copyright : not copyrighted - public domain --> diff --git a/xsd/examples/cxx/tree/custom/contacts/contacts.xsd b/xsd/examples/cxx/tree/custom/contacts/contacts.xsd index da73c78..d6110fe 100644 --- a/xsd/examples/cxx/tree/custom/contacts/contacts.xsd +++ b/xsd/examples/cxx/tree/custom/contacts/contacts.xsd @@ -3,7 +3,6 @@ <!-- file : examples/cxx/tree/custom/contacts/contacts.xsd -author : Boris Kolpackov <boris@codesynthesis.com> copyright : not copyrighted - public domain --> diff --git a/xsd/examples/cxx/tree/custom/contacts/driver.cxx b/xsd/examples/cxx/tree/custom/contacts/driver.cxx index 9015e87..ae8a2da 100644 --- a/xsd/examples/cxx/tree/custom/contacts/driver.cxx +++ b/xsd/examples/cxx/tree/custom/contacts/driver.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/contacts/driver.cxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain #include <memory> // std::auto_ptr diff --git a/xsd/examples/cxx/tree/custom/contacts/makefile b/xsd/examples/cxx/tree/custom/contacts/makefile index e279634..ec9d902 100644 --- a/xsd/examples/cxx/tree/custom/contacts/makefile +++ b/xsd/examples/cxx/tree/custom/contacts/makefile @@ -1,6 +1,5 @@ # file : examples/cxx/tree/custom/contacts/makefile -# author : Boris Kolpackov <boris@codesynthesis.com> -# copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC +# copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC # license : GNU GPL v2 + exceptions; see accompanying LICENSE file include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make @@ -29,7 +28,7 @@ $(call import,\ # $(driver): $(obj) $(xerces_c.l) -$(obj) $(dep): cpp_options := -I$(src_root)/libxsd +$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) @@ -40,14 +39,14 @@ $(gen): xsd := $(out_root)/xsd/xsd # We have to double-escape '#' because the message function # (which is used in command scripts) expands things twice. # -$(gen): xsd_options := \ +$(gen): xsd_options += \ --generate-inline \ --custom-type contact=/contact_base \ ---hxx-epilogue '\\\#include "contacts-custom.hxx"' +--hxx-epilogue '\#include "contacts-custom.hxx"' $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # @@ -80,7 +79,7 @@ $(dist): $(dist-common) $(dist-win): $(dist-common) $(call install-data,$(src_base)/README,$(dist_prefix)/$(path)/README.txt) - $(call message,,unix2dos $(dist_prefix)/$(path)/README.txt) + $(call message,,todos $(dist_prefix)/$(path)/README.txt) # Clean. # diff --git a/xsd/examples/cxx/tree/custom/double/double-custom.cxx b/xsd/examples/cxx/tree/custom/double/double-custom.cxx index 78904a0..6aad908 100644 --- a/xsd/examples/cxx/tree/custom/double/double-custom.cxx +++ b/xsd/examples/cxx/tree/custom/double/double-custom.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/double/double-custom.cxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain // Include xml-schema.hxx instead of double-custom.hxx here. diff --git a/xsd/examples/cxx/tree/custom/double/double-custom.hxx b/xsd/examples/cxx/tree/custom/double/double-custom.hxx index 17d9a44..1516211 100644 --- a/xsd/examples/cxx/tree/custom/double/double-custom.hxx +++ b/xsd/examples/cxx/tree/custom/double/double-custom.hxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/double/double-custom.hxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain // Do not include this file directly, use xml-schema.hxx instead. This diff --git a/xsd/examples/cxx/tree/custom/double/driver.cxx b/xsd/examples/cxx/tree/custom/double/driver.cxx index 2e5b44d..8b102a5 100644 --- a/xsd/examples/cxx/tree/custom/double/driver.cxx +++ b/xsd/examples/cxx/tree/custom/double/driver.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/double/driver.cxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain #include <iostream> diff --git a/xsd/examples/cxx/tree/custom/double/makefile b/xsd/examples/cxx/tree/custom/double/makefile index 5bd4f71..2eed216 100644 --- a/xsd/examples/cxx/tree/custom/double/makefile +++ b/xsd/examples/cxx/tree/custom/double/makefile @@ -1,6 +1,5 @@ # file : examples/cxx/tree/custom/double/makefile -# author : Boris Kolpackov <boris@codesynthesis.com> -# copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC +# copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC # license : GNU GPL v2 + exceptions; see accompanying LICENSE file include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make @@ -29,26 +28,25 @@ $(call import,\ # $(driver): $(obj) $(xerces_c.l) -$(obj) $(dep): cpp_options := -I$(src_root)/libxsd +$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) $(out_base)/xml-schema.hxx: $(out_root)/xsd/xsd $(call message,xsd $(src_base)/xml-schema.xsd,\ $(out_root)/xsd/xsd cxx-tree --output-dir $(out_base) --generate-xml-schema \ --generate-serialization --custom-type double=double \ ---hxx-epilogue '\#include "double-custom.hxx"' xml-schema.xsd) +--hxx-epilogue '#include "double-custom.hxx"' xml-schema.xsd) genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) gen := $(addprefix $(out_base)/,$(genf)) $(gen): xsd := $(out_root)/xsd/xsd - -$(gen): xsd_options := \ ---generate-serialization --extern-xml-schema xml-schema.xsd +$(gen): xsd_options += --generate-serialization \ +--extern-xml-schema xml-schema.xsd $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # @@ -79,7 +77,7 @@ $(dist): $(dist-common) $(dist-win): $(dist-common) $(call install-data,$(src_base)/README,$(dist_prefix)/$(path)/README.txt) - $(call message,,unix2dos $(dist_prefix)/$(path)/README.txt) + $(call message,,todos $(dist_prefix)/$(path)/README.txt) # Clean. # diff --git a/xsd/examples/cxx/tree/custom/double/order.xsd b/xsd/examples/cxx/tree/custom/double/order.xsd index 0d7fe05..9cf1a1d 100644 --- a/xsd/examples/cxx/tree/custom/double/order.xsd +++ b/xsd/examples/cxx/tree/custom/double/order.xsd @@ -3,7 +3,6 @@ <!-- file : examples/cxx/tree/custom/double/order.xsd -author : Boris Kolpackov <boris@codesynthesis.com> copyright : not copyrighted - public domain --> diff --git a/xsd/examples/cxx/tree/custom/makefile b/xsd/examples/cxx/tree/custom/makefile index d1044db..d84f840 100644 --- a/xsd/examples/cxx/tree/custom/makefile +++ b/xsd/examples/cxx/tree/custom/makefile @@ -1,6 +1,5 @@ # file : examples/cxx/tree/custom/makefile -# author : Boris Kolpackov <boris@codesynthesis.com> -# copyright : Copyright (c) 2006-2010 Code Synthesis Tools CC +# copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC # license : GNU GPL v2 + exceptions; see accompanying LICENSE file include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make @@ -32,15 +31,27 @@ $(install): $(addprefix $(out_base)/,$(addsuffix /.install,$(all_examples))) $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_examples))) $(call install-data,$(src_base)/README,$(dist_prefix)/$(path)/README) +$(dist-win): |$(out_root)/.dist-pre $(dist-win): $(addprefix $(out_base)/,$(addsuffix /.dist-win,$(all_examples))) $(call install-data,$(src_base)/README,$(dist_prefix)/$(path)/README.txt) - $(call message,,unix2dos $(dist_prefix)/$(path)/README.txt) + $(call message,,todos $(dist_prefix)/$(path)/README.txt) + $(call meta-vc8sln,$(src_root)/dist/template-vc8.sln,custom-vc8.sln) + $(call meta-vc9sln,$(src_root)/dist/template-vc9.sln,custom-vc9.sln) + $(call meta-vc10sln,$(src_root)/dist/template-vc10.sln,custom-vc10.sln) + $(call meta-vc11sln,$(src_root)/dist/template-vc11.sln,custom-vc11.sln) + $(call meta-vc12sln,$(src_root)/dist/template-vc12.sln,custom-vc12.sln) + # Clean. # $(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(build_examples))) $(call include,$(bld_root)/install.make) +$(call include,$(bld_root)/meta/vc8sln.make) +$(call include,$(bld_root)/meta/vc9sln.make) +$(call include,$(bld_root)/meta/vc10sln.make) +$(call include,$(bld_root)/meta/vc11sln.make) +$(call include,$(bld_root)/meta/vc12sln.make) ifneq ($(filter $(MAKECMDGOALS),dist dist-win install),) $(foreach e,$(all_examples),$(call import,$(src_base)/$e/makefile)) diff --git a/xsd/examples/cxx/tree/custom/mixed/driver.cxx b/xsd/examples/cxx/tree/custom/mixed/driver.cxx index a6dd0a7..0378f18 100644 --- a/xsd/examples/cxx/tree/custom/mixed/driver.cxx +++ b/xsd/examples/cxx/tree/custom/mixed/driver.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/mixed/driver.cxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain #include <memory> // std::auto_ptr diff --git a/xsd/examples/cxx/tree/custom/mixed/makefile b/xsd/examples/cxx/tree/custom/mixed/makefile index 144299e..54610f0 100644 --- a/xsd/examples/cxx/tree/custom/mixed/makefile +++ b/xsd/examples/cxx/tree/custom/mixed/makefile @@ -1,6 +1,5 @@ # file : examples/cxx/tree/custom/mixed/makefile -# author : Boris Kolpackov <boris@codesynthesis.com> -# copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC +# copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC # license : GNU GPL v2 + exceptions; see accompanying LICENSE file include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make @@ -29,7 +28,7 @@ $(call import,\ # $(driver): $(obj) $(xerces_c.l) -$(obj) $(dep): cpp_options := -I$(src_root)/libxsd +$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) @@ -40,15 +39,15 @@ $(gen): xsd := $(out_root)/xsd/xsd # We have to double-escape '#' because the message function # (which is used in command scripts) expands things twice. # -$(gen): xsd_options := \ +$(gen): xsd_options += \ --generate-inline \ --generate-serialization \ --custom-type bio=/bio_base \ ---hxx-epilogue '\\\#include "people-custom.hxx"' +--hxx-epilogue '\#include "people-custom.hxx"' $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # @@ -81,7 +80,7 @@ $(dist): $(dist-common) $(dist-win): $(dist-common) $(call install-data,$(src_base)/README,$(dist_prefix)/$(path)/README.txt) - $(call message,,unix2dos $(dist_prefix)/$(path)/README.txt) + $(call message,,todos $(dist_prefix)/$(path)/README.txt) # Clean. diff --git a/xsd/examples/cxx/tree/custom/mixed/people-custom.cxx b/xsd/examples/cxx/tree/custom/mixed/people-custom.cxx index af07e22..7cd1947 100644 --- a/xsd/examples/cxx/tree/custom/mixed/people-custom.cxx +++ b/xsd/examples/cxx/tree/custom/mixed/people-custom.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/mixed/people-custom.cxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain #include <ostream> diff --git a/xsd/examples/cxx/tree/custom/mixed/people-custom.hxx b/xsd/examples/cxx/tree/custom/mixed/people-custom.hxx index f05ba4a..54dfb21 100644 --- a/xsd/examples/cxx/tree/custom/mixed/people-custom.hxx +++ b/xsd/examples/cxx/tree/custom/mixed/people-custom.hxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/mixed/people-custom.hxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain // Do not include this file directly, use people.hxx instead. This diff --git a/xsd/examples/cxx/tree/custom/mixed/people.xml b/xsd/examples/cxx/tree/custom/mixed/people.xml index 4e5c0ca..47e68b9 100644 --- a/xsd/examples/cxx/tree/custom/mixed/people.xml +++ b/xsd/examples/cxx/tree/custom/mixed/people.xml @@ -3,7 +3,6 @@ <!-- file : examples/cxx/tree/custom/mixed/people.xml -author : Boris Kolpackov <boris@codesynthesis.com> copyright : not copyrighted - public domain --> diff --git a/xsd/examples/cxx/tree/custom/mixed/people.xsd b/xsd/examples/cxx/tree/custom/mixed/people.xsd index 40c1fc1..03e6c97 100644 --- a/xsd/examples/cxx/tree/custom/mixed/people.xsd +++ b/xsd/examples/cxx/tree/custom/mixed/people.xsd @@ -3,7 +3,6 @@ <!-- file : examples/cxx/tree/custom/mixed/people.xsd -author : Boris Kolpackov <boris@codesynthesis.com> copyright : not copyrighted - public domain --> diff --git a/xsd/examples/cxx/tree/custom/taxonomy/driver.cxx b/xsd/examples/cxx/tree/custom/taxonomy/driver.cxx index f102fc3..ec562f6 100644 --- a/xsd/examples/cxx/tree/custom/taxonomy/driver.cxx +++ b/xsd/examples/cxx/tree/custom/taxonomy/driver.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/taxonomy/driver.cxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain #include <memory> // std::auto_ptr diff --git a/xsd/examples/cxx/tree/custom/taxonomy/makefile b/xsd/examples/cxx/tree/custom/taxonomy/makefile index ca3327c..5637f17 100644 --- a/xsd/examples/cxx/tree/custom/taxonomy/makefile +++ b/xsd/examples/cxx/tree/custom/taxonomy/makefile @@ -1,6 +1,5 @@ # file : examples/cxx/tree/custom/taxonomy/makefile -# author : Boris Kolpackov <boris@codesynthesis.com> -# copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC +# copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC # license : GNU GPL v2 + exceptions; see accompanying LICENSE file include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make @@ -29,7 +28,7 @@ $(call import,\ # $(driver): $(obj) $(xerces_c.l) -$(obj) $(dep): cpp_options := -I$(src_root)/libxsd +$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=-fwd.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) @@ -40,7 +39,7 @@ $(gen): xsd := $(out_root)/xsd/xsd # We have to double-escape '#' because the message function # (which is used in command scripts) expands things twice. # -$(gen): xsd_options := \ +$(gen): xsd_options += \ --generate-inline \ --generate-forward \ --generate-polymorphic \ @@ -48,12 +47,12 @@ $(gen): xsd_options := \ --custom-type "person=person_impl<person_base>/person_base" \ --custom-type "superman=superman_impl<superman_base>/superman_base" \ --custom-type "batman=batman_impl<batman_base>/batman_base" \ ---fwd-prologue '\\\#include "people-custom-fwd.hxx"' \ ---hxx-prologue '\\\#include "people-custom.hxx"' +--fwd-prologue '\#include "people-custom-fwd.hxx"' \ +--hxx-prologue '\#include "people-custom.hxx"' $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # @@ -88,7 +87,7 @@ $(dist): $(dist-common) $(dist-win): $(dist-common) $(call install-data,$(src_base)/README,$(dist_prefix)/$(path)/README.txt) - $(call message,,unix2dos $(dist_prefix)/$(path)/README.txt) + $(call message,,todos $(dist_prefix)/$(path)/README.txt) # Clean. diff --git a/xsd/examples/cxx/tree/custom/taxonomy/people-custom-fwd.hxx b/xsd/examples/cxx/tree/custom/taxonomy/people-custom-fwd.hxx index 973b6e5..2c26bf5 100644 --- a/xsd/examples/cxx/tree/custom/taxonomy/people-custom-fwd.hxx +++ b/xsd/examples/cxx/tree/custom/taxonomy/people-custom-fwd.hxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/taxonomy/people-custom-fwd.hxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain // Do not include this file directly, use people-fwd.hxx instead. This diff --git a/xsd/examples/cxx/tree/custom/taxonomy/people-custom.cxx b/xsd/examples/cxx/tree/custom/taxonomy/people-custom.cxx index 321d2df..a06a6ea 100644 --- a/xsd/examples/cxx/tree/custom/taxonomy/people-custom.cxx +++ b/xsd/examples/cxx/tree/custom/taxonomy/people-custom.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/taxonomy/people-custom.cxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain #include <ostream> diff --git a/xsd/examples/cxx/tree/custom/taxonomy/people-custom.hxx b/xsd/examples/cxx/tree/custom/taxonomy/people-custom.hxx index c601061..a60edc8 100644 --- a/xsd/examples/cxx/tree/custom/taxonomy/people-custom.hxx +++ b/xsd/examples/cxx/tree/custom/taxonomy/people-custom.hxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/taxonomy/people-custom.hxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain // Do not include this file directly, use people.hxx instead. This diff --git a/xsd/examples/cxx/tree/custom/taxonomy/people.xml b/xsd/examples/cxx/tree/custom/taxonomy/people.xml index 5f84855..b53b576 100644 --- a/xsd/examples/cxx/tree/custom/taxonomy/people.xml +++ b/xsd/examples/cxx/tree/custom/taxonomy/people.xml @@ -3,7 +3,6 @@ <!-- file : examples/cxx/tree/custom/taxonomy/people.xml -author : Boris Kolpackov <boris@codesynthesis.com> copyright : not copyrighted - public domain --> diff --git a/xsd/examples/cxx/tree/custom/taxonomy/people.xsd b/xsd/examples/cxx/tree/custom/taxonomy/people.xsd index c77a866..1181270 100644 --- a/xsd/examples/cxx/tree/custom/taxonomy/people.xsd +++ b/xsd/examples/cxx/tree/custom/taxonomy/people.xsd @@ -3,7 +3,6 @@ <!-- file : examples/cxx/tree/custom/taxonomy/people.xsd -author : Boris Kolpackov <boris@codesynthesis.com> copyright : not copyrighted - public domain --> diff --git a/xsd/examples/cxx/tree/custom/wildcard/driver.cxx b/xsd/examples/cxx/tree/custom/wildcard/driver.cxx index d63fb11..d29f125 100644 --- a/xsd/examples/cxx/tree/custom/wildcard/driver.cxx +++ b/xsd/examples/cxx/tree/custom/wildcard/driver.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/wildcard/driver.cxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain #include <memory> // std::auto_ptr diff --git a/xsd/examples/cxx/tree/custom/wildcard/makefile b/xsd/examples/cxx/tree/custom/wildcard/makefile index d06fff3..55e94b0 100644 --- a/xsd/examples/cxx/tree/custom/wildcard/makefile +++ b/xsd/examples/cxx/tree/custom/wildcard/makefile @@ -1,6 +1,5 @@ # file : examples/cxx/tree/custom/wildcard/makefile -# author : Boris Kolpackov <boris@codesynthesis.com> -# copyright : Copyright (c) 2005-2010 Code Synthesis Tools CC +# copyright : Copyright (c) 2005-2014 Code Synthesis Tools CC # license : GNU GPL v2 + exceptions; see accompanying LICENSE file include $(dir $(lastword $(MAKEFILE_LIST)))../../../../../build/bootstrap.make @@ -29,7 +28,7 @@ $(call import,\ # $(driver): $(obj) $(xerces_c.l) -$(obj) $(dep): cpp_options := -I$(src_root)/libxsd +$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) @@ -40,16 +39,16 @@ $(gen): xsd := $(out_root)/xsd/xsd # We have to double-escape '#' because the message function # (which is used in command scripts) expands things twice. # -$(gen): xsd_options := \ +$(gen): xsd_options += \ --generate-inline \ --generate-ostream \ --generate-serialization \ --custom-type data=/data_base \ ---hxx-epilogue '\\\#include "wildcard-custom.hxx"' +--hxx-epilogue '\#include "wildcard-custom.hxx"' $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # @@ -82,7 +81,7 @@ $(dist): $(dist-common) $(dist-win): $(dist-common) $(call install-data,$(src_base)/README,$(dist_prefix)/$(path)/README.txt) - $(call message,,unix2dos $(dist_prefix)/$(path)/README.txt) + $(call message,,todos $(dist_prefix)/$(path)/README.txt) # Clean. diff --git a/xsd/examples/cxx/tree/custom/wildcard/wildcard-custom.cxx b/xsd/examples/cxx/tree/custom/wildcard/wildcard-custom.cxx index 422a4b3..006f93a 100644 --- a/xsd/examples/cxx/tree/custom/wildcard/wildcard-custom.cxx +++ b/xsd/examples/cxx/tree/custom/wildcard/wildcard-custom.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/wildcard/wildcard-custom.cxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain #include <ostream> diff --git a/xsd/examples/cxx/tree/custom/wildcard/wildcard-custom.hxx b/xsd/examples/cxx/tree/custom/wildcard/wildcard-custom.hxx index 2c58cc8..0546d38 100644 --- a/xsd/examples/cxx/tree/custom/wildcard/wildcard-custom.hxx +++ b/xsd/examples/cxx/tree/custom/wildcard/wildcard-custom.hxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/wildcard/wildcard-custom.hxx -// author : Boris Kolpackov <boris@codesynthesis.com> // copyright : not copyrighted - public domain // Do not include this file directly, use wildcard.hxx instead. This diff --git a/xsd/examples/cxx/tree/custom/wildcard/wildcard.xml b/xsd/examples/cxx/tree/custom/wildcard/wildcard.xml index c980193..80f215a 100644 --- a/xsd/examples/cxx/tree/custom/wildcard/wildcard.xml +++ b/xsd/examples/cxx/tree/custom/wildcard/wildcard.xml @@ -3,7 +3,6 @@ <!-- file : examples/cxx/tree/custom/wildcard/wildcard.xml -author : Boris Kolpackov <boris@codesynthesis.com> copyright : not copyrighted - public domain --> diff --git a/xsd/examples/cxx/tree/custom/wildcard/wildcard.xsd b/xsd/examples/cxx/tree/custom/wildcard/wildcard.xsd index ccce30b..1a32b1e 100644 --- a/xsd/examples/cxx/tree/custom/wildcard/wildcard.xsd +++ b/xsd/examples/cxx/tree/custom/wildcard/wildcard.xsd @@ -3,7 +3,6 @@ <!-- file : examples/cxx/tree/custom/wildcard/wildcard.xsd -author : Boris Kolpackov <boris@codesynthesis.com> copyright : not copyrighted - public domain --> |