From b3b1a1d789d06c8d5ad5c93ae1c5a3c6a5e7fdff Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 20 Nov 2013 09:08:24 +0200 Subject: Enable by default generation of inline files in build rules for XSD --- examples/cxx/parser/generated/makefile | 2 +- examples/cxx/parser/library/makefile | 2 +- examples/cxx/parser/mixed/makefile | 2 +- examples/cxx/parser/mixin/makefile | 2 +- examples/cxx/parser/multiroot/makefile | 2 +- examples/cxx/parser/performance/makefile | 2 +- examples/cxx/parser/polymorphism/makefile | 2 +- examples/cxx/parser/polyroot/makefile | 2 +- examples/cxx/tree/binary/boost/makefile | 2 +- examples/cxx/tree/binary/cdr/makefile | 2 +- examples/cxx/tree/binary/xdr/makefile | 2 +- examples/cxx/tree/caching/makefile | 1 - examples/cxx/tree/compression/makefile | 2 +- examples/cxx/tree/custom/calendar/makefile | 2 +- examples/cxx/tree/custom/comments/makefile | 2 +- examples/cxx/tree/custom/contacts/makefile | 2 +- examples/cxx/tree/custom/double/makefile | 4 ++-- examples/cxx/tree/custom/mixed/makefile | 2 +- examples/cxx/tree/custom/taxonomy/makefile | 2 +- examples/cxx/tree/custom/wildcard/makefile | 2 +- examples/cxx/tree/embedded/makefile | 1 - examples/cxx/tree/hello/makefile | 1 - examples/cxx/tree/library/makefile | 2 +- examples/cxx/tree/messaging/makefile | 4 ++-- examples/cxx/tree/mixed/makefile | 1 - examples/cxx/tree/multiroot/makefile | 2 +- examples/cxx/tree/performance/makefile | 2 +- examples/cxx/tree/polymorphism/makefile | 2 +- examples/cxx/tree/streaming/makefile | 2 +- examples/cxx/tree/wildcard/makefile | 2 +- examples/cxx/tree/xpath/makefile | 1 - 31 files changed, 28 insertions(+), 33 deletions(-) (limited to 'examples/cxx') diff --git a/examples/cxx/parser/generated/makefile b/examples/cxx/parser/generated/makefile index fefa1f8..0ece646 100644 --- a/examples/cxx/parser/generated/makefile +++ b/examples/cxx/parser/generated/makefile @@ -41,7 +41,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options := --generate-print-impl --generate-test-driver \ +$(gen): xsd_options += --generate-print-impl --generate-test-driver \ --force-overwrite $(gen): $(out_root)/xsd/xsd diff --git a/examples/cxx/parser/library/makefile b/examples/cxx/parser/library/makefile index 4f8082c..d5fc622 100644 --- a/examples/cxx/parser/library/makefile +++ b/examples/cxx/parser/library/makefile @@ -36,7 +36,7 @@ genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) gen := $(addprefix $(out_base)/,$(genf)) $(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options := --generate-inline --type-map $(src_base)/library.map +$(gen): xsd_options += --generate-inline --type-map $(src_base)/library.map $(gen): $(out_root)/xsd/xsd $(src_base)/library.map $(call include-dep,$(dep),$(obj),$(gen)) diff --git a/examples/cxx/parser/mixed/makefile b/examples/cxx/parser/mixed/makefile index 7feca93..fe53782 100644 --- a/examples/cxx/parser/mixed/makefile +++ b/examples/cxx/parser/mixed/makefile @@ -36,7 +36,7 @@ genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) gen := $(addprefix $(out_base)/,$(genf)) $(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options := --type-map $(src_base)/text.map +$(gen): xsd_options += --type-map $(src_base)/text.map $(gen): $(out_root)/xsd/xsd $(src_base)/text.map $(call include-dep,$(dep),$(obj),$(gen)) diff --git a/examples/cxx/parser/mixin/makefile b/examples/cxx/parser/mixin/makefile index b30261d..655429a 100644 --- a/examples/cxx/parser/mixin/makefile +++ b/examples/cxx/parser/mixin/makefile @@ -36,7 +36,7 @@ genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) gen := $(addprefix $(out_base)/,$(genf)) $(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options := --type-map $(src_base)/schema.map +$(gen): xsd_options += --type-map $(src_base)/schema.map $(gen): $(out_root)/xsd/xsd $(src_base)/schema.map $(call include-dep,$(dep),$(obj),$(gen)) diff --git a/examples/cxx/parser/multiroot/makefile b/examples/cxx/parser/multiroot/makefile index 016a63b..b1ec58c 100644 --- a/examples/cxx/parser/multiroot/makefile +++ b/examples/cxx/parser/multiroot/makefile @@ -36,7 +36,7 @@ genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) gen := $(addprefix $(out_base)/,$(genf)) $(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options := --type-map $(src_base)/protocol.map +$(gen): xsd_options += --type-map $(src_base)/protocol.map $(gen): $(out_root)/xsd/xsd $(src_base)/protocol.map $(call include-dep,$(dep),$(obj),$(gen)) diff --git a/examples/cxx/parser/performance/makefile b/examples/cxx/parser/performance/makefile index e8efd93..dfa009c 100644 --- a/examples/cxx/parser/performance/makefile +++ b/examples/cxx/parser/performance/makefile @@ -36,7 +36,7 @@ genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) gen := $(addprefix $(out_base)/,$(genf)) $(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options := --generate-inline +$(gen): xsd_options += --generate-inline $(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep),$(obj),$(gen)) diff --git a/examples/cxx/parser/polymorphism/makefile b/examples/cxx/parser/polymorphism/makefile index 17fc38a..a98fac7 100644 --- a/examples/cxx/parser/polymorphism/makefile +++ b/examples/cxx/parser/polymorphism/makefile @@ -36,7 +36,7 @@ genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) gen := $(addprefix $(out_base)/,$(genf)) $(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options := --generate-polymorphic +$(gen): xsd_options += --generate-polymorphic $(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep),$(obj),$(gen)) diff --git a/examples/cxx/parser/polyroot/makefile b/examples/cxx/parser/polyroot/makefile index c0a8020..aa430c8 100644 --- a/examples/cxx/parser/polyroot/makefile +++ b/examples/cxx/parser/polyroot/makefile @@ -36,7 +36,7 @@ genf := $(xsd:.xsd=-pskel.hxx) $(xsd:.xsd=-pskel.ixx) $(xsd:.xsd=-pskel.cxx) gen := $(addprefix $(out_base)/,$(genf)) $(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options := --generate-polymorphic +$(gen): xsd_options += --generate-polymorphic $(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep),$(obj),$(gen)) diff --git a/examples/cxx/tree/binary/boost/makefile b/examples/cxx/tree/binary/boost/makefile index 2a2c297..fe3c77b 100644 --- a/examples/cxx/tree/binary/boost/makefile +++ b/examples/cxx/tree/binary/boost/makefile @@ -43,7 +43,7 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options := --generate-ostream \ +$(gen): xsd_options += --generate-ostream \ --hxx-prologue-file $(src_base)/library-prologue.hxx \ --generate-insertion boost::archive::text_oarchive \ --generate-extraction boost::archive::text_iarchive diff --git a/examples/cxx/tree/binary/cdr/makefile b/examples/cxx/tree/binary/cdr/makefile index d09b730..91a5023 100644 --- a/examples/cxx/tree/binary/cdr/makefile +++ b/examples/cxx/tree/binary/cdr/makefile @@ -42,7 +42,7 @@ 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-ostream \ +$(gen): xsd_options += --generate-ostream \ --generate-insertion ACE_OutputCDR --generate-extraction ACE_InputCDR $(gen): $(out_root)/xsd/xsd diff --git a/examples/cxx/tree/binary/xdr/makefile b/examples/cxx/tree/binary/xdr/makefile index 55613a8..6483e82 100644 --- a/examples/cxx/tree/binary/xdr/makefile +++ b/examples/cxx/tree/binary/xdr/makefile @@ -34,7 +34,7 @@ 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-ostream \ +$(gen): xsd_options += --generate-ostream \ --generate-insertion XDR --generate-extraction XDR $(gen): $(out_root)/xsd/xsd diff --git a/examples/cxx/tree/caching/makefile b/examples/cxx/tree/caching/makefile index eb05222..4f4c609 100644 --- a/examples/cxx/tree/caching/makefile +++ b/examples/cxx/tree/caching/makefile @@ -36,7 +36,6 @@ 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): $(out_root)/xsd/xsd $(call include-dep,$(dep),$(obj),$(gen)) diff --git a/examples/cxx/tree/compression/makefile b/examples/cxx/tree/compression/makefile index 04c867d..84df653 100644 --- a/examples/cxx/tree/compression/makefile +++ b/examples/cxx/tree/compression/makefile @@ -41,7 +41,7 @@ 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-ostream --generate-serialization +$(gen): xsd_options += --generate-ostream --generate-serialization $(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep),$(obj),$(gen)) diff --git a/examples/cxx/tree/custom/calendar/makefile b/examples/cxx/tree/custom/calendar/makefile index 656ceab..cc4d9d9 100644 --- a/examples/cxx/tree/custom/calendar/makefile +++ b/examples/cxx/tree/custom/calendar/makefile @@ -51,7 +51,7 @@ 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 \ --extern-xml-schema xml-schema.xsd diff --git a/examples/cxx/tree/custom/comments/makefile b/examples/cxx/tree/custom/comments/makefile index 4138710..6eca039 100644 --- a/examples/cxx/tree/custom/comments/makefile +++ b/examples/cxx/tree/custom/comments/makefile @@ -45,7 +45,7 @@ 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 diff --git a/examples/cxx/tree/custom/contacts/makefile b/examples/cxx/tree/custom/contacts/makefile index c3d45f6..6ad6f96 100644 --- a/examples/cxx/tree/custom/contacts/makefile +++ b/examples/cxx/tree/custom/contacts/makefile @@ -40,7 +40,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 \ --custom-type contact=/contact_base \ --hxx-epilogue '\#include "contacts-custom.hxx"' diff --git a/examples/cxx/tree/custom/double/makefile b/examples/cxx/tree/custom/double/makefile index ee90e7e..0461bb0 100644 --- a/examples/cxx/tree/custom/double/makefile +++ b/examples/cxx/tree/custom/double/makefile @@ -42,8 +42,8 @@ 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 diff --git a/examples/cxx/tree/custom/mixed/makefile b/examples/cxx/tree/custom/mixed/makefile index f95c1fe..43a1774 100644 --- a/examples/cxx/tree/custom/mixed/makefile +++ b/examples/cxx/tree/custom/mixed/makefile @@ -40,7 +40,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-serialization \ --custom-type bio=/bio_base \ diff --git a/examples/cxx/tree/custom/taxonomy/makefile b/examples/cxx/tree/custom/taxonomy/makefile index 48ba7e8..fdd5636 100644 --- a/examples/cxx/tree/custom/taxonomy/makefile +++ b/examples/cxx/tree/custom/taxonomy/makefile @@ -40,7 +40,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 \ diff --git a/examples/cxx/tree/custom/wildcard/makefile b/examples/cxx/tree/custom/wildcard/makefile index c90526b..7e7a0ee 100644 --- a/examples/cxx/tree/custom/wildcard/makefile +++ b/examples/cxx/tree/custom/wildcard/makefile @@ -40,7 +40,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-ostream \ --generate-serialization \ diff --git a/examples/cxx/tree/embedded/makefile b/examples/cxx/tree/embedded/makefile index ffc9ded..b1ecbf9 100644 --- a/examples/cxx/tree/embedded/makefile +++ b/examples/cxx/tree/embedded/makefile @@ -40,7 +40,6 @@ 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): $(out_root)/xsd/xsd genf += $(xsd:.xsd=-schema.hxx) $(xsd:.xsd=-schema.cxx) diff --git a/examples/cxx/tree/hello/makefile b/examples/cxx/tree/hello/makefile index a2662a5..c414d35 100644 --- a/examples/cxx/tree/hello/makefile +++ b/examples/cxx/tree/hello/makefile @@ -36,7 +36,6 @@ 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): $(out_root)/xsd/xsd $(call include-dep,$(dep),$(obj),$(gen)) diff --git a/examples/cxx/tree/library/makefile b/examples/cxx/tree/library/makefile index d984aaa..73af87f 100644 --- a/examples/cxx/tree/library/makefile +++ b/examples/cxx/tree/library/makefile @@ -36,7 +36,7 @@ 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-inline --generate-ostream \ +$(gen): xsd_options += --generate-inline --generate-ostream \ --generate-serialization $(gen): $(out_root)/xsd/xsd diff --git a/examples/cxx/tree/messaging/makefile b/examples/cxx/tree/messaging/makefile index 31a67a4..d9ea6d4 100644 --- a/examples/cxx/tree/messaging/makefile +++ b/examples/cxx/tree/messaging/makefile @@ -37,8 +37,8 @@ gen := $(addprefix $(out_base)/,$(genf)) $(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options := --root-element-all \ ---generate-element-type --generate-element-map --generate-serialization +$(gen): xsd_options += --root-element-all --generate-element-type \ +--generate-element-map --generate-serialization $(gen): $(out_root)/xsd/xsd diff --git a/examples/cxx/tree/mixed/makefile b/examples/cxx/tree/mixed/makefile index 9da0d41..010bd05 100644 --- a/examples/cxx/tree/mixed/makefile +++ b/examples/cxx/tree/mixed/makefile @@ -36,7 +36,6 @@ 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): $(out_root)/xsd/xsd $(call include-dep,$(dep),$(obj),$(gen)) diff --git a/examples/cxx/tree/multiroot/makefile b/examples/cxx/tree/multiroot/makefile index 6c0e9ec..9357932 100644 --- a/examples/cxx/tree/multiroot/makefile +++ b/examples/cxx/tree/multiroot/makefile @@ -36,7 +36,7 @@ genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) gen := $(addprefix $(out_base)/,$(genf)) $(gen): xsd := $(out_root)/xsd/xsd -$(gen): xsd_options := --root-element-all +$(gen): xsd_options += --root-element-all $(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep),$(obj),$(gen)) diff --git a/examples/cxx/tree/performance/makefile b/examples/cxx/tree/performance/makefile index d3e29b6..4877886 100644 --- a/examples/cxx/tree/performance/makefile +++ b/examples/cxx/tree/performance/makefile @@ -36,7 +36,7 @@ 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-inline --generate-serialization +$(gen): xsd_options += --generate-inline --generate-serialization $(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep),$(obj),$(gen)) diff --git a/examples/cxx/tree/polymorphism/makefile b/examples/cxx/tree/polymorphism/makefile index aadb79e..03107e2 100644 --- a/examples/cxx/tree/polymorphism/makefile +++ b/examples/cxx/tree/polymorphism/makefile @@ -36,7 +36,7 @@ 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-polymorphic --generate-serialization \ +$(gen): xsd_options += --generate-polymorphic --generate-serialization \ --root-element-last $(gen): $(out_root)/xsd/xsd diff --git a/examples/cxx/tree/streaming/makefile b/examples/cxx/tree/streaming/makefile index 9e07aec..deeba1f 100644 --- a/examples/cxx/tree/streaming/makefile +++ b/examples/cxx/tree/streaming/makefile @@ -36,7 +36,7 @@ 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 +$(gen): xsd_options += --generate-serialization $(gen): $(out_root)/xsd/xsd $(call include-dep,$(dep),$(obj),$(gen)) diff --git a/examples/cxx/tree/wildcard/makefile b/examples/cxx/tree/wildcard/makefile index d0c47b7..9c9feb2 100644 --- a/examples/cxx/tree/wildcard/makefile +++ b/examples/cxx/tree/wildcard/makefile @@ -36,7 +36,7 @@ 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-inline --generate-wildcard \ +$(gen): xsd_options += --generate-inline --generate-wildcard \ --generate-serialization --root-element message $(gen): $(out_root)/xsd/xsd diff --git a/examples/cxx/tree/xpath/makefile b/examples/cxx/tree/xpath/makefile index 0bf123e..ab0f0f3 100644 --- a/examples/cxx/tree/xpath/makefile +++ b/examples/cxx/tree/xpath/makefile @@ -42,7 +42,6 @@ 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): $(out_root)/xsd/xsd $(call include-dep,$(dep),$(obj),$(gen)) -- cgit v1.1