From 8286ac511144e4f17d34eac9affb97e50646344a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 23 Jul 2014 15:25:44 +0200 Subject: Imported Upstream version 4.0.0 --- .../tree/binary/boost/boost-archive-extraction.hxx | 2 +- .../tree/binary/boost/boost-archive-insertion.hxx | 2 +- xsd/examples/cxx/tree/binary/boost/driver.cxx | 1 - xsd/examples/cxx/tree/binary/boost/library.xml | 1 - xsd/examples/cxx/tree/binary/boost/library.xsd | 1 - xsd/examples/cxx/tree/binary/boost/makefile | 27 ++++++++++++++++------ xsd/examples/cxx/tree/binary/cdr/driver.cxx | 1 - xsd/examples/cxx/tree/binary/cdr/library.xml | 1 - xsd/examples/cxx/tree/binary/cdr/library.xsd | 1 - xsd/examples/cxx/tree/binary/cdr/makefile | 25 ++++++++++++++------ xsd/examples/cxx/tree/binary/makefile | 5 ++-- xsd/examples/cxx/tree/binary/xdr/driver.cxx | 1 - xsd/examples/cxx/tree/binary/xdr/library.xml | 1 - xsd/examples/cxx/tree/binary/xdr/library.xsd | 1 - xsd/examples/cxx/tree/binary/xdr/makefile | 27 ++++++++++++++++------ 15 files changed, 62 insertions(+), 35 deletions(-) (limited to 'xsd/examples/cxx/tree/binary') diff --git a/xsd/examples/cxx/tree/binary/boost/boost-archive-extraction.hxx b/xsd/examples/cxx/tree/binary/boost/boost-archive-extraction.hxx index 7711b28..8a1c1ef 100644 --- a/xsd/examples/cxx/tree/binary/boost/boost-archive-extraction.hxx +++ b/xsd/examples/cxx/tree/binary/boost/boost-archive-extraction.hxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/binary/boost/boost-archive-insertion.cxx -// author : Boris Kolpackov // copyright : not copyrighted - public domain #ifndef BOOST_ARCHIVE_EXTRACTION_HXX @@ -180,6 +179,7 @@ namespace xsd s.impl () >> size; x.size (size); s.impl ().load_binary (x.data (), size); + return s; } } } diff --git a/xsd/examples/cxx/tree/binary/boost/boost-archive-insertion.hxx b/xsd/examples/cxx/tree/binary/boost/boost-archive-insertion.hxx index 7a00ef8..4c89104 100644 --- a/xsd/examples/cxx/tree/binary/boost/boost-archive-insertion.hxx +++ b/xsd/examples/cxx/tree/binary/boost/boost-archive-insertion.hxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/binary/boost/boost-archive-insertion.cxx -// author : Boris Kolpackov // copyright : not copyrighted - public domain #ifndef BOOST_ARCHIVE_INSERTION_HXX @@ -169,6 +168,7 @@ namespace xsd std::size_t size (x.size()); s.impl () << size; s.impl ().save_binary (x.data (), x.size ()); + return s; } } } diff --git a/xsd/examples/cxx/tree/binary/boost/driver.cxx b/xsd/examples/cxx/tree/binary/boost/driver.cxx index 9490d13..df053b6 100644 --- a/xsd/examples/cxx/tree/binary/boost/driver.cxx +++ b/xsd/examples/cxx/tree/binary/boost/driver.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/binary/boost/driver.cxx -// author : Boris Kolpackov // copyright : not copyrighted - public domain #include // std::auto_ptr diff --git a/xsd/examples/cxx/tree/binary/boost/library.xml b/xsd/examples/cxx/tree/binary/boost/library.xml index da2bee6..ceb4443 100644 --- a/xsd/examples/cxx/tree/binary/boost/library.xml +++ b/xsd/examples/cxx/tree/binary/boost/library.xml @@ -3,7 +3,6 @@ diff --git a/xsd/examples/cxx/tree/binary/boost/library.xsd b/xsd/examples/cxx/tree/binary/boost/library.xsd index 9f35d4a..4bfdd1e 100644 --- a/xsd/examples/cxx/tree/binary/boost/library.xsd +++ b/xsd/examples/cxx/tree/binary/boost/library.xsd @@ -3,7 +3,6 @@ diff --git a/xsd/examples/cxx/tree/binary/boost/makefile b/xsd/examples/cxx/tree/binary/boost/makefile index 7044539..1ed7e41 100644 --- a/xsd/examples/cxx/tree/binary/boost/makefile +++ b/xsd/examples/cxx/tree/binary/boost/makefile @@ -1,6 +1,5 @@ # file : examples/cxx/tree/binary/boost/makefile -# author : Boris Kolpackov -# 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 @@ -35,7 +34,7 @@ endif # $(driver): $(obj) $(xerces_c.l) $(boost_serialization.l) -$(obj) $(dep): cpp_options := -I$(src_root)/libxsd -I$(src_root) +$(obj) $(dep): cpp_options := -I$(out_base) -I$(src_base) -I$(src_root)/libxsd $(obj) $(dep): $(xerces_c.l.cpp-options) $(boost_serialization.l.cpp-options) genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) @@ -43,14 +42,14 @@ 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 $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # @@ -83,9 +82,16 @@ $(dist-common): $(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,,unix2dos $(dist_prefix)/$(path)/README.txt) + $(call message,,todos $(dist_prefix)/$(path)/README.txt) + $(call meta-vc8sln,$(src_root)/dist/template-vc8.sln,boost-vc8.sln) + $(call meta-vc9sln,$(src_root)/dist/template-vc9.sln,boost-vc9.sln) + $(call meta-vc10sln,$(src_root)/dist/template-vc10.sln,boost-vc10.sln) + $(call meta-vc11sln,$(src_root)/dist/template-vc11.sln,boost-vc11.sln) + $(call meta-vc12sln,$(src_root)/dist/template-vc12.sln,boost-vc12.sln) + # Clean. # @@ -111,9 +117,16 @@ endif $(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,$(bld_root)/install.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/binary/cdr/driver.cxx b/xsd/examples/cxx/tree/binary/cdr/driver.cxx index 08ec0d5..ec1ff32 100644 --- a/xsd/examples/cxx/tree/binary/cdr/driver.cxx +++ b/xsd/examples/cxx/tree/binary/cdr/driver.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/binary/cdr/driver.cxx -// author : Boris Kolpackov // copyright : not copyrighted - public domain #include // std::auto_ptr diff --git a/xsd/examples/cxx/tree/binary/cdr/library.xml b/xsd/examples/cxx/tree/binary/cdr/library.xml index e7ccb3f..941c03f 100644 --- a/xsd/examples/cxx/tree/binary/cdr/library.xml +++ b/xsd/examples/cxx/tree/binary/cdr/library.xml @@ -3,7 +3,6 @@ diff --git a/xsd/examples/cxx/tree/binary/cdr/library.xsd b/xsd/examples/cxx/tree/binary/cdr/library.xsd index 92d44d1..5659e1b 100644 --- a/xsd/examples/cxx/tree/binary/cdr/library.xsd +++ b/xsd/examples/cxx/tree/binary/cdr/library.xsd @@ -3,7 +3,6 @@ diff --git a/xsd/examples/cxx/tree/binary/cdr/makefile b/xsd/examples/cxx/tree/binary/cdr/makefile index 72bdae7..b349ba2 100644 --- a/xsd/examples/cxx/tree/binary/cdr/makefile +++ b/xsd/examples/cxx/tree/binary/cdr/makefile @@ -1,6 +1,5 @@ # file : examples/cxx/tree/binary/cdr/makefile -# author : Boris Kolpackov -# 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 @@ -35,18 +34,18 @@ endif # $(driver): $(obj) $(xerces_c.l) $(ace.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) $(ace.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 := --generate-ostream \ +$(gen): xsd_options += --generate-ostream \ --generate-insertion ACE_OutputCDR --generate-extraction ACE_InputCDR $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # @@ -73,9 +72,15 @@ $(dist-common): $(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,,unix2dos $(dist_prefix)/$(path)/README.txt) + $(call message,,todos $(dist_prefix)/$(path)/README.txt) + $(call meta-vc8sln,$(src_root)/dist/template-vc8.sln,cdr-vc8.sln) + $(call meta-vc9sln,$(src_root)/dist/template-vc9.sln,cdr-vc9.sln) + $(call meta-vc10sln,$(src_root)/dist/template-vc10.sln,cdr-vc10.sln) + $(call meta-vc11sln,$(src_root)/dist/template-vc11.sln,cdr-vc11.sln) + $(call meta-vc12sln,$(src_root)/dist/template-vc12.sln,cdr-vc12.sln) # Clean. # @@ -101,9 +106,15 @@ endif $(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,$(bld_root)/install.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/binary/makefile b/xsd/examples/cxx/tree/binary/makefile index fbdfbe4..eb4b312 100644 --- a/xsd/examples/cxx/tree/binary/makefile +++ b/xsd/examples/cxx/tree/binary/makefile @@ -1,6 +1,5 @@ # file : examples/cxx/tree/binary/makefile -# author : Boris Kolpackov -# copyright : Copyright (c) 2006-2010 Code Synthesis Tools CC +# copyright : Copyright (c) 2006-2014 Code Synthesis Tools CC # license : GNU GPL v2 + exceptions; see accompanying LICENSE file include $(dir $(lastword $(MAKEFILE_LIST)))../../../../build/bootstrap.make @@ -42,7 +41,7 @@ $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_examples))) $(dist-win): $(addprefix $(out_base)/,$(addsuffix /.dist-win,$(all_examples))) $(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/binary/xdr/driver.cxx b/xsd/examples/cxx/tree/binary/xdr/driver.cxx index 495eafc..d109322 100644 --- a/xsd/examples/cxx/tree/binary/xdr/driver.cxx +++ b/xsd/examples/cxx/tree/binary/xdr/driver.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/binary/xdr/driver.cxx -// author : Boris Kolpackov // copyright : not copyrighted - public domain #include // std::auto_ptr diff --git a/xsd/examples/cxx/tree/binary/xdr/library.xml b/xsd/examples/cxx/tree/binary/xdr/library.xml index 9ddcd5a..dab6afb 100644 --- a/xsd/examples/cxx/tree/binary/xdr/library.xml +++ b/xsd/examples/cxx/tree/binary/xdr/library.xml @@ -3,7 +3,6 @@ diff --git a/xsd/examples/cxx/tree/binary/xdr/library.xsd b/xsd/examples/cxx/tree/binary/xdr/library.xsd index 9999e72..7513e3b 100644 --- a/xsd/examples/cxx/tree/binary/xdr/library.xsd +++ b/xsd/examples/cxx/tree/binary/xdr/library.xsd @@ -3,7 +3,6 @@ diff --git a/xsd/examples/cxx/tree/binary/xdr/makefile b/xsd/examples/cxx/tree/binary/xdr/makefile index 092cdc7..7939b29 100644 --- a/xsd/examples/cxx/tree/binary/xdr/makefile +++ b/xsd/examples/cxx/tree/binary/xdr/makefile @@ -1,6 +1,5 @@ # file : examples/cxx/tree/binary/xdr/makefile -# author : Boris Kolpackov -# 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 @@ -27,18 +26,18 @@ $(call import,\ # $(driver): $(obj) $(xerces_c.l) -lnsl -$(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 := --generate-ostream \ +$(gen): xsd_options += --generate-ostream \ --generate-insertion XDR --generate-extraction XDR $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # @@ -65,9 +64,16 @@ $(dist-common): $(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,,unix2dos $(dist_prefix)/$(path)/README.txt) + $(call message,,todos $(dist_prefix)/$(path)/README.txt) + $(call meta-vc8sln,$(src_root)/dist/template-vc8.sln,xdr-vc8.sln) + $(call meta-vc9sln,$(src_root)/dist/template-vc9.sln,xdr-vc9.sln) + $(call meta-vc10sln,$(src_root)/dist/template-vc10.sln,xdr-vc10.sln) + $(call meta-vc11sln,$(src_root)/dist/template-vc11.sln,xdr-vc11.sln) + $(call meta-vc12sln,$(src_root)/dist/template-vc12.sln,xdr-vc12.sln) + # Clean. # @@ -93,9 +99,16 @@ endif $(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,$(bld_root)/install.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) -- cgit v1.2.3