diff options
Diffstat (limited to 'xsd-examples/cxx/tree')
26 files changed, 33 insertions, 85 deletions
diff --git a/xsd-examples/cxx/tree/binary/boost/buildfile b/xsd-examples/cxx/tree/binary/boost/buildfile index 4306273..17e67fb 100644 --- a/xsd-examples/cxx/tree/binary/boost/buildfile +++ b/xsd-examples/cxx/tree/binary/boost/buildfile @@ -13,9 +13,7 @@ exe{driver}: xml{library}: test.input = true <{hxx ixx cxx}{library}>: xsd{library} hxx{library-prologue} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-ostream \ --hxx-prologue-file $path($<[1]) \ diff --git a/xsd-examples/cxx/tree/binary/cdr/buildfile b/xsd-examples/cxx/tree/binary/cdr/buildfile index d78a56a..ccff659 100644 --- a/xsd-examples/cxx/tree/binary/cdr/buildfile +++ b/xsd-examples/cxx/tree/binary/cdr/buildfile @@ -13,9 +13,7 @@ exe{driver}: xml{library}: test.input = true <{hxx ixx cxx}{library}>: xsd{library} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-ostream \ --generate-insertion 'ACE_OutputCDR' \ diff --git a/xsd-examples/cxx/tree/binary/xdr/buildfile b/xsd-examples/cxx/tree/binary/xdr/buildfile index 92f0c48..0fbab13 100644 --- a/xsd-examples/cxx/tree/binary/xdr/buildfile +++ b/xsd-examples/cxx/tree/binary/xdr/buildfile @@ -15,9 +15,7 @@ exe{driver}: xml{library}: test.input = true <{hxx ixx cxx}{library}>: xsd{library} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-ostream \ --generate-insertion 'XDR' \ diff --git a/xsd-examples/cxx/tree/caching/buildfile b/xsd-examples/cxx/tree/caching/buildfile index cb369b7..f1bcb10 100644 --- a/xsd-examples/cxx/tree/caching/buildfile +++ b/xsd-examples/cxx/tree/caching/buildfile @@ -12,9 +12,7 @@ exe{driver}: {xml xsd}{library}: test.input = true <{hxx ixx cxx}{library}>: xsd{library} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-examples/cxx/tree/compression/buildfile b/xsd-examples/cxx/tree/compression/buildfile index 6997339..99dd8a6 100644 --- a/xsd-examples/cxx/tree/compression/buildfile +++ b/xsd-examples/cxx/tree/compression/buildfile @@ -11,9 +11,7 @@ exe{driver}: {hxx cxx}{* -library} {hxx ixx cxx}{library} $libs testscript <{hxx ixx cxx}{library}>: xsd{library} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --generate-ostream \ diff --git a/xsd-examples/cxx/tree/custom/calendar/buildfile b/xsd-examples/cxx/tree/custom/calendar/buildfile index 3c26122..3309f6f 100644 --- a/xsd-examples/cxx/tree/custom/calendar/buildfile +++ b/xsd-examples/cxx/tree/custom/calendar/buildfile @@ -16,9 +16,7 @@ exe{driver}: xml{calendar}: test.input = true <{hxx ixx cxx}{calendar}>: xsd{calendar} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --extern-xml-schema xml-schema.xsd \ --output-dir $out_base \ @@ -27,12 +25,12 @@ exe{driver}: xml{calendar}: test.input = true hxx{xml-schema}: $xsd {{ - diag xsd gen ($>[0]) + diag xsd $> # Note that the specified xml-schema.xsd doesn't exist and is only used to # deduce the generated header name. # - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-xml-schema \ --custom-type date \ --hxx-epilogue '#include "xml-schema-custom.hxx"' \ diff --git a/xsd-examples/cxx/tree/custom/comments/buildfile b/xsd-examples/cxx/tree/custom/comments/buildfile index 093a6cc..6edf81a 100644 --- a/xsd-examples/cxx/tree/custom/comments/buildfile +++ b/xsd-examples/cxx/tree/custom/comments/buildfile @@ -15,9 +15,7 @@ exe{driver}: xml{people}: test.input = true <{hxx ixx cxx}{people}>: xsd{people} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --extern-xml-schema xml-schema.xsd \ @@ -27,12 +25,12 @@ exe{driver}: xml{people}: test.input = true hxx{xml-schema}: $xsd {{ - diag xsd gen ($>[0]) + diag xsd $> # Note that the specified xml-schema.xsd doesn't exist and is only used to # deduce the generated header name. # - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-xml-schema \ --generate-serialization \ --custom-type anyType=/type_base \ diff --git a/xsd-examples/cxx/tree/custom/contacts/buildfile b/xsd-examples/cxx/tree/custom/contacts/buildfile index 190306c..e401362 100644 --- a/xsd-examples/cxx/tree/custom/contacts/buildfile +++ b/xsd-examples/cxx/tree/custom/contacts/buildfile @@ -12,9 +12,7 @@ exe{driver}: xml{contacts}: test.input = true <{hxx ixx cxx}{contacts}>: xsd{contacts} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --custom-type contact=/contact_base \ --hxx-epilogue '#include "contacts-custom.hxx"' \ diff --git a/xsd-examples/cxx/tree/custom/double/buildfile b/xsd-examples/cxx/tree/custom/double/buildfile index 258191a..0c33afe 100644 --- a/xsd-examples/cxx/tree/custom/double/buildfile +++ b/xsd-examples/cxx/tree/custom/double/buildfile @@ -13,9 +13,7 @@ exe{driver}: {hxx cxx}{* -order -xml-schema} \ <{hxx ixx cxx}{order}>: xsd{order} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --extern-xml-schema xml-schema.xsd \ @@ -25,12 +23,12 @@ exe{driver}: {hxx cxx}{* -order -xml-schema} \ hxx{xml-schema}: $xsd {{ - diag xsd gen ($>[0]) + diag xsd $> # Note that the specified xml-schema.xsd doesn't exist and is only used to # deduce the generated header name. # - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-xml-schema \ --generate-serialization \ --custom-type double=double \ diff --git a/xsd-examples/cxx/tree/custom/mixed/buildfile b/xsd-examples/cxx/tree/custom/mixed/buildfile index 9da936e..e5919fe 100644 --- a/xsd-examples/cxx/tree/custom/mixed/buildfile +++ b/xsd-examples/cxx/tree/custom/mixed/buildfile @@ -12,9 +12,7 @@ exe{driver}: xml{people}: test.input = true <{hxx ixx cxx}{people}>: xsd{people} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --custom-type bio=/bio_base \ diff --git a/xsd-examples/cxx/tree/custom/taxonomy/buildfile b/xsd-examples/cxx/tree/custom/taxonomy/buildfile index 9267c68..4068daa 100644 --- a/xsd-examples/cxx/tree/custom/taxonomy/buildfile +++ b/xsd-examples/cxx/tree/custom/taxonomy/buildfile @@ -12,9 +12,7 @@ exe{driver}: xml{people}: test.input = true <{hxx ixx cxx}{people} hxx{people-fwd}>: xsd{people} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-forward \ --generate-polymorphic \ diff --git a/xsd-examples/cxx/tree/custom/wildcard/buildfile b/xsd-examples/cxx/tree/custom/wildcard/buildfile index e386709..1bb5a8f 100644 --- a/xsd-examples/cxx/tree/custom/wildcard/buildfile +++ b/xsd-examples/cxx/tree/custom/wildcard/buildfile @@ -12,9 +12,7 @@ exe{driver}: xml{wildcard}: test.input = true <{hxx ixx cxx}{wildcard}>: xsd{wildcard} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --generate-ostream \ diff --git a/xsd-examples/cxx/tree/embedded/buildfile b/xsd-examples/cxx/tree/embedded/buildfile index c8e7808..20b7207 100644 --- a/xsd-examples/cxx/tree/embedded/buildfile +++ b/xsd-examples/cxx/tree/embedded/buildfile @@ -17,9 +17,7 @@ exe{driver}: xml{library}: test.input = true <{hxx ixx cxx}{library}>: xsd{library} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --output-dir $out_base \ $path($<[0]) @@ -27,7 +25,7 @@ exe{driver}: xml{library}: test.input = true <{hxx cxx}{library-schema}>: xsd{library} exe{xsdbin} {{ - diag xsdbin ($<[0]) # @@ TMP + diag xsdbin ($<[0]) -> $> ($<[1]) --output-dir $out_base $path($<[0]) }} diff --git a/xsd-examples/cxx/tree/hello/buildfile b/xsd-examples/cxx/tree/hello/buildfile index 241d6f1..1cd17ac 100644 --- a/xsd-examples/cxx/tree/hello/buildfile +++ b/xsd-examples/cxx/tree/hello/buildfile @@ -12,9 +12,7 @@ exe{driver}: xml{hello}: test.input = true <{hxx ixx cxx}{hello}>: xsd{hello} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-examples/cxx/tree/library/buildfile b/xsd-examples/cxx/tree/library/buildfile index 4ab023b..03745fb 100644 --- a/xsd-examples/cxx/tree/library/buildfile +++ b/xsd-examples/cxx/tree/library/buildfile @@ -12,9 +12,7 @@ exe{driver}: xml{library}: test.input = true <{hxx ixx cxx}{library}>: xsd{library} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-ostream \ --generate-serialization \ diff --git a/xsd-examples/cxx/tree/messaging/buildfile b/xsd-examples/cxx/tree/messaging/buildfile index 62fadda..7be8caf 100644 --- a/xsd-examples/cxx/tree/messaging/buildfile +++ b/xsd-examples/cxx/tree/messaging/buildfile @@ -10,9 +10,7 @@ exe{driver}: {hxx cxx}{* -protocol} {hxx ixx cxx}{protocol} $libs testscript <{hxx ixx cxx}{protocol}>: xsd{protocol} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --root-element-all \ --generate-element-type \ diff --git a/xsd-examples/cxx/tree/mixed/buildfile b/xsd-examples/cxx/tree/mixed/buildfile index 4c1be8e..c91021a 100644 --- a/xsd-examples/cxx/tree/mixed/buildfile +++ b/xsd-examples/cxx/tree/mixed/buildfile @@ -12,9 +12,7 @@ exe{driver}: xml{text}: test.input = true <{hxx ixx cxx}{text}>: xsd{text} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-examples/cxx/tree/multiroot/buildfile b/xsd-examples/cxx/tree/multiroot/buildfile index dc10588..55ddb0d 100644 --- a/xsd-examples/cxx/tree/multiroot/buildfile +++ b/xsd-examples/cxx/tree/multiroot/buildfile @@ -10,9 +10,7 @@ exe{driver}: {hxx cxx}{* -protocol} {hxx ixx cxx}{protocol} $libs testscript <{hxx ixx cxx}{protocol}>: xsd{protocol} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --root-element-all \ --output-dir $out_base \ diff --git a/xsd-examples/cxx/tree/order/element/buildfile b/xsd-examples/cxx/tree/order/element/buildfile index eb3834e..6e56a60 100644 --- a/xsd-examples/cxx/tree/order/element/buildfile +++ b/xsd-examples/cxx/tree/order/element/buildfile @@ -12,9 +12,7 @@ exe{driver}: xml{transactions}: test.input = true <{hxx ixx cxx}{transactions}>: xsd{transactions} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --generate-wildcard \ diff --git a/xsd-examples/cxx/tree/order/mixed/buildfile b/xsd-examples/cxx/tree/order/mixed/buildfile index 149bca0..6bc21e2 100644 --- a/xsd-examples/cxx/tree/order/mixed/buildfile +++ b/xsd-examples/cxx/tree/order/mixed/buildfile @@ -12,9 +12,7 @@ exe{driver}: xml{text}: test.input = true <{hxx ixx cxx}{text}>: xsd{text} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --ordered-type-mixed \ diff --git a/xsd-examples/cxx/tree/performance/buildfile b/xsd-examples/cxx/tree/performance/buildfile index e9faeef..7b28308 100644 --- a/xsd-examples/cxx/tree/performance/buildfile +++ b/xsd-examples/cxx/tree/performance/buildfile @@ -14,9 +14,7 @@ exe{driver}: xml{test-50k}: test.input = true <{hxx ixx cxx}{test}>: xsd{test} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --output-dir $out_base \ diff --git a/xsd-examples/cxx/tree/polymorphism/buildfile b/xsd-examples/cxx/tree/polymorphism/buildfile index 754c6c2..359d4d3 100644 --- a/xsd-examples/cxx/tree/polymorphism/buildfile +++ b/xsd-examples/cxx/tree/polymorphism/buildfile @@ -12,9 +12,7 @@ exe{driver}: xml{supermen}: test.input = true <{hxx ixx cxx}{supermen}>: xsd{supermen} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-polymorphic \ --generate-serialization \ diff --git a/xsd-examples/cxx/tree/secure/buildfile b/xsd-examples/cxx/tree/secure/buildfile index b1ca71f..a86af57 100644 --- a/xsd-examples/cxx/tree/secure/buildfile +++ b/xsd-examples/cxx/tree/secure/buildfile @@ -12,9 +12,7 @@ exe{driver}: xml{library}: test.input = true <{hxx ixx cxx}{library}>: xsd{library} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --output-dir $out_base \ $path($<[0]) diff --git a/xsd-examples/cxx/tree/streaming/buildfile b/xsd-examples/cxx/tree/streaming/buildfile index 8c34b17..8555257 100644 --- a/xsd-examples/cxx/tree/streaming/buildfile +++ b/xsd-examples/cxx/tree/streaming/buildfile @@ -10,9 +10,7 @@ exe{driver}: {hxx cxx}{* -position} {hxx ixx cxx}{position} $libs testscript <{hxx ixx cxx}{position}>: xsd{position} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-serialization \ --output-dir $out_base \ diff --git a/xsd-examples/cxx/tree/wildcard/buildfile b/xsd-examples/cxx/tree/wildcard/buildfile index 5bc63c5..dc158f4 100644 --- a/xsd-examples/cxx/tree/wildcard/buildfile +++ b/xsd-examples/cxx/tree/wildcard/buildfile @@ -12,9 +12,7 @@ exe{driver}: xml{email}: test.input = true <{hxx ixx cxx}{email}>: xsd{email} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --generate-wildcard \ --generate-serialization \ diff --git a/xsd-examples/cxx/tree/xpath/buildfile b/xsd-examples/cxx/tree/xpath/buildfile index c6f090a..4f49599 100644 --- a/xsd-examples/cxx/tree/xpath/buildfile +++ b/xsd-examples/cxx/tree/xpath/buildfile @@ -13,9 +13,7 @@ exe{driver}: xml{people}: test.input = true <{hxx ixx cxx}{people}>: xsd{people} $xsd {{ - diag xsd ($<[0]) # @@ TMP - - $xsd cxx-tree --std c++11 \ + $xsd cxx-tree \ --generate-inline \ --output-dir $out_base \ $path($<[0]) |