Imported Upstream version 4.0.0upstream/4.0.0

4 files changed, 18 insertions, 10 deletions

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 <boris@codesynthesis.com>
 // copyright : not copyrighted - public domain
 
 #include <memory>   // 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 @@
 <!--
 
 file      : examples/cxx/tree/binary/cdr/library.xml
-author    : Boris Kolpackov <boris@codesynthesis.com>
 copyright : not copyrighted - public domain
 
 -->
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 @@
 <!--
 
 file      : examples/cxx/tree/binary/cdr/library.xsd
-author    : Boris Kolpackov <boris@codesynthesis.com>
 copyright : not copyrighted - public domain
 
 -->
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 <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
@@ -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)