Merge tag 'debian/4.0.0-10' into developdevelop

Bugfix release

7 files changed, 365 insertions, 0 deletions

diff --git a/xsd/examples/cxx/tree/custom/calendar/README b/xsd/examples/cxx/tree/custom/calendar/README
new file mode 100644
index 0000000..f7f6989
--- /dev/null
+++ b/xsd/examples/cxx/tree/custom/calendar/README
@@ -0,0 +1,47 @@
+This example shows how to customize the XML Schema built-in types by mapping
+xsd:date built-in type to the date class from the Boost date_time library.
+You will need the Boost date_time library[1] installed in order to build
+and run this example. For more information on the C++/Tree mapping
+customization see the C++/Tree Mapping Customization Guide[2].
+
+[1] http://www.boost.org
+[2] http://wiki.codesynthesis.com/Tree/Customization_guide
+
+The example consists of the following files:
+
+calendar.xsd
+  XML Schema definition for a simple calendar format.
+
+calendar.xml
+  Sample XML instance document.
+
+xml-schema.hxx
+  C++ types for XML Schema built-in types. This header file is generated
+  by XSD using the --generate-xml-schema option. The --custom-type option
+  is also used to customize the xsd:date type.
+
+calendar.hxx
+calendar.ixx
+calendar.cxx
+  C++ types that represent the given vocabulary and a set of parsing
+  functions that convert XML instance documents to a tree-like in-memory
+  object model. These are generated by XSD from calendar.xsd with the
+  --extern-xml-schema option in order to include xml-schema.hxx.
+
+xml-schema-custom.hxx
+  Header file which defines our own xml_schema::date class. It is
+  included at the end of xml-schema.hxx using the --hxx-epilogue
+  option.
+
+xml-schema-custom.cxx
+  Source file which contains the implementation of our xml_schema:date
+  class.
+
+driver.cxx
+  Driver for the example. It first calls one of the parsing functions
+  that constructs the object model from the input file. It then prints
+  the calendar events to STDERR.
+
+To run the example on the sample XML instance document simply execute:
+
+$ ./driver calendar.xml
diff --git a/xsd/examples/cxx/tree/custom/calendar/calendar.xml b/xsd/examples/cxx/tree/custom/calendar/calendar.xml
new file mode 100644
index 0000000..5cc898a
--- /dev/null
+++ b/xsd/examples/cxx/tree/custom/calendar/calendar.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+
+<!--
+
+file      : examples/cxx/tree/custom/calendar/calendar.xml
+copyright : not copyrighted - public domain
+
+-->
+
+<cal:events xmlns:cal="http://www.codesynthesis.com/calendar"
+	     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	     xsi:schemaLocation="http://www.codesynthesis.com/calendar calendar.xsd">
+
+  <event title="Bike ride" date="2006-09-04">
+  Don't forget to change the tire.
+  </event>
+
+  <event title="Mountain hike" date="2006-09-05">
+  Can be cancelled if it is too cold.
+  </event>
+
+</cal:events>
diff --git a/xsd/examples/cxx/tree/custom/calendar/calendar.xsd b/xsd/examples/cxx/tree/custom/calendar/calendar.xsd
new file mode 100644
index 0000000..04b3af1
--- /dev/null
+++ b/xsd/examples/cxx/tree/custom/calendar/calendar.xsd
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+
+<!--
+
+file      : examples/cxx/tree/custom/calendar/calendar.xsd
+copyright : not copyrighted - public domain
+
+-->
+
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:cal="http://www.codesynthesis.com/calendar"
+            targetNamespace="http://www.codesynthesis.com/calendar">
+
+  <xsd:complexType name="event">
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:string">
+        <xsd:attribute name="title" type="xsd:string" use="required"/>
+        <xsd:attribute name="date" type="xsd:date" use="required"/>
+      </xsd:extension>
+    </xsd:simpleContent>
+  </xsd:complexType>
+
+  <xsd:complexType name="events">
+    <xsd:sequence>
+      <xsd:element name="event" type="cal:event" maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+
+  <xsd:element name="events" type="cal:events"/>
+
+</xsd:schema>
diff --git a/xsd/examples/cxx/tree/custom/calendar/driver.cxx b/xsd/examples/cxx/tree/custom/calendar/driver.cxx
new file mode 100644
index 0000000..a5b223e
--- /dev/null
+++ b/xsd/examples/cxx/tree/custom/calendar/driver.cxx
@@ -0,0 +1,39 @@
+// file      : examples/cxx/tree/custom/calendar/driver.cxx
+// copyright : not copyrighted - public domain
+
+#include <memory>   // std::auto_ptr
+#include <iostream>
+
+#include "calendar.hxx"
+
+using std::cerr;
+using std::endl;
+
+int
+main (int argc, char* argv[])
+{
+  if (argc != 2)
+  {
+    cerr << "usage: " << argv[0] << " calendar.xml" << endl;
+    return 1;
+  }
+
+  try
+  {
+    using namespace calendar;
+
+    std::auto_ptr<events> e (events_ (argv[1]));
+
+    for (events::event_const_iterator i (e->event ().begin ());
+         i != e->event ().end (); ++i)
+    {
+      cerr << i->date () << " " << i->title () << endl
+           << *i << endl;
+    }
+  }
+  catch (const xml_schema::exception& e)
+  {
+    cerr << e << endl;
+    return 1;
+  }
+}
diff --git a/xsd/examples/cxx/tree/custom/calendar/makefile b/xsd/examples/cxx/tree/custom/calendar/makefile
new file mode 100644
index 0000000..6998ffd
--- /dev/null
+++ b/xsd/examples/cxx/tree/custom/calendar/makefile
@@ -0,0 +1,137 @@
+# file      : examples/cxx/tree/custom/calendar/makefile
+# 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
+
+xsd := calendar.xsd
+cxx := driver.cxx xml-schema-custom.cxx
+
+obj := $(addprefix $(out_base)/,$(cxx:.cxx=.o) $(xsd:.xsd=.o))
+dep := $(obj:.o=.o.d)
+
+driver   := $(out_base)/driver
+install  := $(out_base)/.install
+dist     := $(out_base)/.dist
+dist-win := $(out_base)/.dist-win
+clean    := $(out_base)/.clean
+
+
+# Import.
+#
+$(call import,\
+  $(scf_root)/import/libxerces-c/stub.make,\
+  l: xerces_c.l,cpp-options: xerces_c.l.cpp-options)
+
+ifeq ($(filter $(MAKECMDGOALS),dist dist-win install),)
+$(call import,\
+  $(scf_root)/import/libboost/date-time/stub.make,\
+  l: boost_date_time.l,cpp-options: boost_date_time.l.cpp-options)
+endif
+
+# Build.
+#
+$(driver): $(obj) $(xerces_c.l) $(boost_date_time.l)
+
+$(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.
+#
+$(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)
+
+#
+#
+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 \
+--extern-xml-schema xml-schema.xsd
+
+$(gen): $(out_root)/xsd/xsd
+
+$(call include-dep,$(dep),$(obj),$(gen))
+
+# Convenience alias for default target.
+#
+$(out_base)/: $(driver)
+
+
+# Install & Dist.
+#
+dist-common := $(out_base)/.dist-common
+
+$(install) $(dist) $(dist-win) $(dist-common): path := $(subst $(src_root)/,,$(src_base))
+
+$(install):
+	$(call install-data,$(src_base)/README,$(install_doc_dir)/xsd/$(path)/README)
+	$(call install-data,$(src_base)/driver.cxx,$(install_doc_dir)/xsd/$(path)/driver.cxx)
+	$(call install-data,$(src_base)/calendar.xsd,$(install_doc_dir)/xsd/$(path)/calendar.xsd)
+	$(call install-data,$(src_base)/calendar.xml,$(install_doc_dir)/xsd/$(path)/calendar.xml)
+	$(call install-data,$(src_base)/xml-schema-custom.hxx,$(install_doc_dir)/xsd/$(path)/xml-schema-custom.hxx)
+	$(call install-data,$(src_base)/xml-schema-custom.cxx,$(install_doc_dir)/xsd/$(path)/xml-schema-custom.cxx)
+
+$(dist-common):
+	$(call install-data,$(src_base)/driver.cxx,$(dist_prefix)/$(path)/driver.cxx)
+	$(call install-data,$(src_base)/calendar.xsd,$(dist_prefix)/$(path)/calendar.xsd)
+	$(call install-data,$(src_base)/calendar.xml,$(dist_prefix)/$(path)/calendar.xml)
+	$(call install-data,$(src_base)/xml-schema-custom.hxx,$(dist_prefix)/$(path)/xml-schema-custom.hxx)
+	$(call install-data,$(src_base)/xml-schema-custom.cxx,$(dist_prefix)/$(path)/xml-schema-custom.cxx)
+
+$(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,,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.
+#
+$(clean): $(driver).o.clean                            \
+  $(addsuffix .cxx.clean,$(obj))                       \
+  $(addsuffix .cxx.clean,$(dep))                       \
+  $(addprefix $(out_base)/,$(xsd:.xsd=.cxx.xsd.clean))
+	$(call message,rm $$1,rm -f $$1,$(out_base)/xml-schema.hxx)
+
+# Generated .gitignore.
+#
+ifeq ($(out_base),$(src_base))
+$(gen): | $(out_base)/.gitignore
+$(driver): | $(out_base)/.gitignore
+
+$(out_base)/.gitignore: files := driver xml-schema.hxx $(genf)
+$(clean): $(out_base)/.gitignore.clean
+
+$(call include,$(bld_root)/git/gitignore.make)
+endif
+
+# How to.
+#
+$(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,$(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
new file mode 100644
index 0000000..645880b
--- /dev/null
+++ b/xsd/examples/cxx/tree/custom/calendar/xml-schema-custom.cxx
@@ -0,0 +1,56 @@
+// file      : examples/cxx/tree/custom/calendar/xml-schema-custom.cxx
+// copyright : not copyrighted - public domain
+
+// Include xml-schema.hxx instead of xml-schema-custom.hxx here.
+//
+#include "xml-schema.hxx"
+
+#include <xsd/cxx/xml/string.hxx> // xsd::cxx::xml::transcode
+#include <xsd/cxx/tree/text.hxx> // xsd::cxx::tree::text_content
+
+using namespace boost;
+using namespace boost::gregorian;
+
+namespace xml_schema
+{
+  date::
+  date (const xercesc::DOMElement& e, flags f, container* c)
+      : simple_type (e, f, c),
+        gregorian::date (
+          from_simple_string (
+            xsd::cxx::tree::text_content<char> (e)))
+  {
+  }
+
+  date::
+  date (const xercesc::DOMAttr& a, flags f, container* c)
+      : simple_type (a, f, c),
+        gregorian::date (
+          from_simple_string (
+            xsd::cxx::xml::transcode<char> (a.getValue ())))
+  {
+  }
+
+  date::
+  date (const std::string& s,
+        const xercesc::DOMElement* e,
+        flags f,
+        container* c)
+      : simple_type (s, e, f, c),
+        gregorian::date (from_simple_string (s))
+  {
+  }
+
+  date::
+  date (const date& d, flags f, container* c)
+      : simple_type (d, f, c),
+        gregorian::date (d)
+  {
+  }
+
+  date* date::
+  _clone (flags f, container* c) const
+  {
+    return new date (*this, f, c);
+  }
+}
diff --git a/xsd/examples/cxx/tree/custom/calendar/xml-schema-custom.hxx b/xsd/examples/cxx/tree/custom/calendar/xml-schema-custom.hxx
new file mode 100644
index 0000000..58f57e6
--- /dev/null
+++ b/xsd/examples/cxx/tree/custom/calendar/xml-schema-custom.hxx
@@ -0,0 +1,33 @@
+// file      : examples/cxx/tree/custom/calendar/xml-schema-custom.hxx
+// copyright : not copyrighted - public domain
+
+// Do not include this file directly, use xml-schema.hxx instead. This
+// file is included into generated xml-schema.hxx so we do not need to
+// guard against multiple inclusions.
+//
+
+#include <boost/date_time/gregorian/gregorian.hpp> // boost::gregorian::date
+
+namespace xml_schema
+{
+  class date: public simple_type,
+              public boost::gregorian::date
+  {
+  public:
+    // Parsing c-tors: element, attribute, and list item.
+    //
+    date (const xercesc::DOMElement&, flags = 0, container* = 0);
+    date (const xercesc::DOMAttr&, flags = 0, container* = 0);
+    date (const std::string&,
+          const xercesc::DOMElement*,
+          flags = 0,
+          container* = 0);
+
+    // Copy c-tor and _clone.
+    //
+    date (const date&, flags = 0, container* = 0);
+
+    virtual date*
+    _clone (flags = 0, container* = 0) const;
+  };
+}