From bada6666c70977a058755ccf232e7d67b24adeed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Wed, 23 Jul 2014 15:21:29 +0200
Subject: New upstream release

---
 xsd/examples/cxx/tree/caching/driver.cxx  | 44 -------------------------------
 xsd/examples/cxx/tree/caching/library.xml |  1 -
 xsd/examples/cxx/tree/caching/library.xsd |  1 -
 xsd/examples/cxx/tree/caching/makefile    | 10 +++----
 4 files changed, 4 insertions(+), 52 deletions(-)

(limited to 'xsd/examples/cxx/tree/caching')

diff --git a/xsd/examples/cxx/tree/caching/driver.cxx b/xsd/examples/cxx/tree/caching/driver.cxx
index a3877d8..2aa9396 100644
--- a/xsd/examples/cxx/tree/caching/driver.cxx
+++ b/xsd/examples/cxx/tree/caching/driver.cxx
@@ -1,5 +1,4 @@
 // file      : examples/cxx/tree/caching/driver.cxx
-// author    : Boris Kolpackov <boris@codesynthesis.com>
 // copyright : not copyrighted - public domain
 
 #include <memory>   // std::auto_ptr
@@ -51,10 +50,6 @@ main (int argc, char* argv[])
     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));
 
@@ -128,41 +123,6 @@ main (int argc, char* argv[])
     //
     conf->setParameter (XMLUni::fgXercesUserAdoptsDOMDocument, true);
 
-#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, true);
-    parser->setFeature (XMLUni::fgXercesSchema, true);
-    parser->setFeature (XMLUni::fgXercesSchemaFullChecking, false);
-
-    tree::error_handler<char> eh;
-    xml::dom::bits::error_handler_proxy<char> ehp (eh);
-    parser->setErrorHandler (&ehp);
-
-    if (!parser->loadGrammar ("library.xsd", Grammar::SchemaGrammarType, true))
-    {
-      eh.handle ("library.xsd", 0, 0,
-                 tree::error_handler<char>::severity::fatal,
-                 "unable to load schema");
-    }
-
-    eh.throw_if_failed<xml_schema::parsing> ();
-    parser->setFeature (XMLUni::fgXercesUseCachedGrammarInParse, true);
-
-    parser->setFeature (XMLUni::fgXercesUserAdoptsDOMDocument, true);
-
-#endif // _XERCES_VERSION >= 30000
-
     // Parse XML documents.
     //
     for (unsigned long i (0); i < 10; ++i)
@@ -178,11 +138,7 @@ main (int argc, char* argv[])
 
       // Parse XML to DOM.
       //
-#if _XERCES_VERSION >= 30000
       xml_schema::dom::auto_ptr<DOMDocument> doc (parser->parse (&wrap));
-#else
-      xml_schema::dom::auto_ptr<DOMDocument> doc (parser->parse (wrap));
-#endif
 
       eh.throw_if_failed<xml_schema::parsing> ();
 
diff --git a/xsd/examples/cxx/tree/caching/library.xml b/xsd/examples/cxx/tree/caching/library.xml
index 4c12c6e..6d4d6f1 100644
--- a/xsd/examples/cxx/tree/caching/library.xml
+++ b/xsd/examples/cxx/tree/caching/library.xml
@@ -3,7 +3,6 @@
 <!--
 
 file      : examples/cxx/tree/caching/library.xml
-author    : Boris Kolpackov <boris@codesynthesis.com>
 copyright : not copyrighted - public domain
 
 -->
diff --git a/xsd/examples/cxx/tree/caching/library.xsd b/xsd/examples/cxx/tree/caching/library.xsd
index 5dca460..a46c558 100644
--- a/xsd/examples/cxx/tree/caching/library.xsd
+++ b/xsd/examples/cxx/tree/caching/library.xsd
@@ -3,7 +3,6 @@
 <!--
 
 file      : examples/cxx/tree/caching/library.xsd
-author    : Boris Kolpackov <boris@codesynthesis.com>
 copyright : not copyrighted - public domain
 
 -->
diff --git a/xsd/examples/cxx/tree/caching/makefile b/xsd/examples/cxx/tree/caching/makefile
index cd0447e..cb9b191 100644
--- a/xsd/examples/cxx/tree/caching/makefile
+++ b/xsd/examples/cxx/tree/caching/makefile
@@ -1,6 +1,5 @@
 # file      : examples/cxx/tree/caching/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,17 +28,16 @@ $(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)
 gen  := $(addprefix $(out_base)/,$(genf))
 
 $(gen): xsd := $(out_root)/xsd/xsd
-$(gen): xsd_options :=
 $(gen): $(out_root)/xsd/xsd
 
-$(call include-dep,$(dep))
+$(call include-dep,$(dep),$(obj),$(gen))
 
 # Convenience alias for default target.
 #
@@ -68,7 +66,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.
-- 
cgit v1.2.3