summaryrefslogtreecommitdiff
path: root/xsd/examples/cxx/tree/custom/taxonomy
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2014-07-23 15:21:29 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2014-07-23 15:21:29 +0200
commitbada6666c70977a058755ccf232e7d67b24adeed (patch)
tree1e92d50cebce96abaf9bce19e36026c47f77b9ba /xsd/examples/cxx/tree/custom/taxonomy
parenteaf34adcbd8095bc6d1f3371b1227f654c7b19fc (diff)
New upstream release
Diffstat (limited to 'xsd/examples/cxx/tree/custom/taxonomy')
-rw-r--r--xsd/examples/cxx/tree/custom/taxonomy/driver.cxx1
-rw-r--r--xsd/examples/cxx/tree/custom/taxonomy/makefile15
-rw-r--r--xsd/examples/cxx/tree/custom/taxonomy/people-custom-fwd.hxx1
-rw-r--r--xsd/examples/cxx/tree/custom/taxonomy/people-custom.cxx1
-rw-r--r--xsd/examples/cxx/tree/custom/taxonomy/people-custom.hxx1
-rw-r--r--xsd/examples/cxx/tree/custom/taxonomy/people.xml1
-rw-r--r--xsd/examples/cxx/tree/custom/taxonomy/people.xsd1
7 files changed, 7 insertions, 14 deletions
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
-->