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 --- xsd/examples/cxx/tree/custom/calendar/calendar.xml | 1 - xsd/examples/cxx/tree/custom/calendar/calendar.xsd | 1 - xsd/examples/cxx/tree/custom/calendar/driver.cxx | 1 - xsd/examples/cxx/tree/custom/calendar/makefile | 32 ++++++++++++++-------- .../cxx/tree/custom/calendar/xml-schema-custom.cxx | 1 - .../cxx/tree/custom/calendar/xml-schema-custom.hxx | 1 - 6 files changed, 20 insertions(+), 17 deletions(-) (limited to 'xsd/examples/cxx/tree/custom/calendar') diff --git a/xsd/examples/cxx/tree/custom/calendar/calendar.xml b/xsd/examples/cxx/tree/custom/calendar/calendar.xml index ae9e570..5cc898a 100644 --- a/xsd/examples/cxx/tree/custom/calendar/calendar.xml +++ b/xsd/examples/cxx/tree/custom/calendar/calendar.xml @@ -3,7 +3,6 @@ diff --git a/xsd/examples/cxx/tree/custom/calendar/calendar.xsd b/xsd/examples/cxx/tree/custom/calendar/calendar.xsd index fa612a7..04b3af1 100644 --- a/xsd/examples/cxx/tree/custom/calendar/calendar.xsd +++ b/xsd/examples/cxx/tree/custom/calendar/calendar.xsd @@ -3,7 +3,6 @@ diff --git a/xsd/examples/cxx/tree/custom/calendar/driver.cxx b/xsd/examples/cxx/tree/custom/calendar/driver.cxx index 02f1c27..a5b223e 100644 --- a/xsd/examples/cxx/tree/custom/calendar/driver.cxx +++ b/xsd/examples/cxx/tree/custom/calendar/driver.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/calendar/driver.cxx -// author : Boris Kolpackov // copyright : not copyrighted - public domain #include // std::auto_ptr diff --git a/xsd/examples/cxx/tree/custom/calendar/makefile b/xsd/examples/cxx/tree/custom/calendar/makefile index f4f4598..6998ffd 100644 --- a/xsd/examples/cxx/tree/custom/calendar/makefile +++ b/xsd/examples/cxx/tree/custom/calendar/makefile @@ -1,6 +1,5 @@ # file : examples/cxx/tree/custom/calendar/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 @@ -34,7 +33,7 @@ endif # $(driver): $(obj) $(xerces_c.l) $(boost_date_time.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) $(boost_date_time.l.cpp-options) # Header file for XML Schema namespace. @@ -43,7 +42,7 @@ $(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) +--hxx-epilogue '#include "xml-schema-custom.hxx"' xml-schema.xsd) # # @@ -51,17 +50,13 @@ genf := $(xsd:.xsd=.hxx) $(xsd:.xsd=.ixx) $(xsd:.xsd=.cxx) gen := $(addprefix $(out_base)/,$(genf)) $(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 \ --extern-xml-schema xml-schema.xsd $(gen): $(out_root)/xsd/xsd -$(call include-dep,$(dep)) +$(call include-dep,$(dep),$(obj),$(gen)) # Convenience alias for default target. # @@ -92,9 +87,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,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. # @@ -121,9 +123,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/custom/calendar/xml-schema-custom.cxx b/xsd/examples/cxx/tree/custom/calendar/xml-schema-custom.cxx index 440a407..645880b 100644 --- a/xsd/examples/cxx/tree/custom/calendar/xml-schema-custom.cxx +++ b/xsd/examples/cxx/tree/custom/calendar/xml-schema-custom.cxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/calendar/xml-schema-custom.cxx -// author : Boris Kolpackov // copyright : not copyrighted - public domain // Include xml-schema.hxx instead of xml-schema-custom.hxx here. diff --git a/xsd/examples/cxx/tree/custom/calendar/xml-schema-custom.hxx b/xsd/examples/cxx/tree/custom/calendar/xml-schema-custom.hxx index 2bab0b5..58f57e6 100644 --- a/xsd/examples/cxx/tree/custom/calendar/xml-schema-custom.hxx +++ b/xsd/examples/cxx/tree/custom/calendar/xml-schema-custom.hxx @@ -1,5 +1,4 @@ // file : examples/cxx/tree/custom/calendar/xml-schema-custom.hxx -// author : Boris Kolpackov // copyright : not copyrighted - public domain // Do not include this file directly, use xml-schema.hxx instead. This -- cgit v1.2.3