From 4a2834255dc48166afc537e9e9dce80be457fa14 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 30 Sep 2009 19:14:56 +0200 Subject: New example showing handling of mixed content with type customization --- dist/examples/cxx/tree/custom/custom-7.1.sln | 8 + dist/examples/cxx/tree/custom/custom-8.0.sln | 10 + dist/examples/cxx/tree/custom/custom-9.0.sln | 10 + .../cxx/tree/custom/custom-xerces2-7.1.sln | 8 + .../cxx/tree/custom/custom-xerces2-8.0.sln | 10 + .../cxx/tree/custom/custom-xerces2-9.0.sln | 10 + dist/examples/cxx/tree/custom/makefile | 2 +- dist/examples/cxx/tree/custom/mixed/makefile | 33 ++ .../cxx/tree/custom/mixed/mixed-7.1.vcproj | 177 +++++++++ .../cxx/tree/custom/mixed/mixed-8.0.vcproj | 440 +++++++++++++++++++++ .../cxx/tree/custom/mixed/mixed-9.0.vcproj | 437 ++++++++++++++++++++ .../cxx/tree/custom/mixed/mixed-xerces2-7.1.vcproj | 177 +++++++++ .../cxx/tree/custom/mixed/mixed-xerces2-8.0.vcproj | 440 +++++++++++++++++++++ .../cxx/tree/custom/mixed/mixed-xerces2-9.0.vcproj | 437 ++++++++++++++++++++ 14 files changed, 2198 insertions(+), 1 deletion(-) create mode 100644 dist/examples/cxx/tree/custom/mixed/makefile create mode 100644 dist/examples/cxx/tree/custom/mixed/mixed-7.1.vcproj create mode 100644 dist/examples/cxx/tree/custom/mixed/mixed-8.0.vcproj create mode 100644 dist/examples/cxx/tree/custom/mixed/mixed-9.0.vcproj create mode 100644 dist/examples/cxx/tree/custom/mixed/mixed-xerces2-7.1.vcproj create mode 100644 dist/examples/cxx/tree/custom/mixed/mixed-xerces2-8.0.vcproj create mode 100644 dist/examples/cxx/tree/custom/mixed/mixed-xerces2-9.0.vcproj (limited to 'dist/examples') diff --git a/dist/examples/cxx/tree/custom/custom-7.1.sln b/dist/examples/cxx/tree/custom/custom-7.1.sln index 926c6a7..86f7196 100644 --- a/dist/examples/cxx/tree/custom/custom-7.1.sln +++ b/dist/examples/cxx/tree/custom/custom-7.1.sln @@ -19,6 +19,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "double", "double\double-7.1 ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mixed", "mixed\mixed-7.1.vcproj", "{26CE0C08-7621-403A-88A7-206E64F32C66}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject Global GlobalSection(SolutionConfiguration) = preSolution Debug = Debug @@ -45,6 +49,10 @@ Global {CCE6AE91-39AC-49B6-8763-742B65FCD92E}.Debug.Build.0 = Debug|Win32 {CCE6AE91-39AC-49B6-8763-742B65FCD92E}.Release.ActiveCfg = Release|Win32 {CCE6AE91-39AC-49B6-8763-742B65FCD92E}.Release.Build.0 = Release|Win32 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Debug.ActiveCfg = Debug|Win32 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Debug.Build.0 = Debug|Win32 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Release.ActiveCfg = Release|Win32 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/dist/examples/cxx/tree/custom/custom-8.0.sln b/dist/examples/cxx/tree/custom/custom-8.0.sln index a14b163..7faee8d 100644 --- a/dist/examples/cxx/tree/custom/custom-8.0.sln +++ b/dist/examples/cxx/tree/custom/custom-8.0.sln @@ -10,6 +10,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "comments", "comments\commen EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "double", "double\double-8.0.vcproj", "{CCE6AE91-39AC-49B6-8763-742B65FCD92E}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mixed", "mixed\mixed-8.0.vcproj", "{26CE0C08-7621-403A-88A7-206E64F32C66}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -58,6 +60,14 @@ Global {CCE6AE91-39AC-49B6-8763-742B65FCD92E}.Release|Win32.Build.0 = Release|Win32 {CCE6AE91-39AC-49B6-8763-742B65FCD92E}.Release|x64.ActiveCfg = Release|x64 {CCE6AE91-39AC-49B6-8763-742B65FCD92E}.Release|x64.Build.0 = Release|x64 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Debug|Win32.ActiveCfg = Debug|Win32 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Debug|Win32.Build.0 = Debug|Win32 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Debug|x64.ActiveCfg = Debug|x64 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Debug|x64.Build.0 = Debug|x64 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Release|Win32.ActiveCfg = Release|Win32 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Release|Win32.Build.0 = Release|Win32 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Release|x64.ActiveCfg = Release|x64 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/dist/examples/cxx/tree/custom/custom-9.0.sln b/dist/examples/cxx/tree/custom/custom-9.0.sln index 0b46c92..2def79a 100644 --- a/dist/examples/cxx/tree/custom/custom-9.0.sln +++ b/dist/examples/cxx/tree/custom/custom-9.0.sln @@ -10,6 +10,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "comments", "comments\commen EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "double", "double\double-9.0.vcproj", "{CCE6AE91-39AC-49B6-8763-742B65FCD92E}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mixed", "mixed\mixed-9.0.vcproj", "{26CE0C08-7621-403A-88A7-206E64F32C66}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -58,6 +60,14 @@ Global {CCE6AE91-39AC-49B6-8763-742B65FCD92E}.Release|Win32.Build.0 = Release|Win32 {CCE6AE91-39AC-49B6-8763-742B65FCD92E}.Release|x64.ActiveCfg = Release|x64 {CCE6AE91-39AC-49B6-8763-742B65FCD92E}.Release|x64.Build.0 = Release|x64 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Debug|Win32.ActiveCfg = Debug|Win32 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Debug|Win32.Build.0 = Debug|Win32 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Debug|x64.ActiveCfg = Debug|x64 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Debug|x64.Build.0 = Debug|x64 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Release|Win32.ActiveCfg = Release|Win32 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Release|Win32.Build.0 = Release|Win32 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Release|x64.ActiveCfg = Release|x64 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/dist/examples/cxx/tree/custom/custom-xerces2-7.1.sln b/dist/examples/cxx/tree/custom/custom-xerces2-7.1.sln index 43394ba..f5ace2f 100644 --- a/dist/examples/cxx/tree/custom/custom-xerces2-7.1.sln +++ b/dist/examples/cxx/tree/custom/custom-xerces2-7.1.sln @@ -19,6 +19,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "double", "double\double-xer ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mixed", "mixed\mixed-xerces2-7.1.vcproj", "{26CE0C08-7621-403A-88A7-206E64F32C66}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject Global GlobalSection(SolutionConfiguration) = preSolution Debug = Debug @@ -45,6 +49,10 @@ Global {CCE6AE91-39AC-49B6-8763-742B65FCD92E}.Debug.Build.0 = Debug|Win32 {CCE6AE91-39AC-49B6-8763-742B65FCD92E}.Release.ActiveCfg = Release|Win32 {CCE6AE91-39AC-49B6-8763-742B65FCD92E}.Release.Build.0 = Release|Win32 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Debug.ActiveCfg = Debug|Win32 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Debug.Build.0 = Debug|Win32 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Release.ActiveCfg = Release|Win32 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/dist/examples/cxx/tree/custom/custom-xerces2-8.0.sln b/dist/examples/cxx/tree/custom/custom-xerces2-8.0.sln index 08855e7..b3e013c 100644 --- a/dist/examples/cxx/tree/custom/custom-xerces2-8.0.sln +++ b/dist/examples/cxx/tree/custom/custom-xerces2-8.0.sln @@ -10,6 +10,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "comments", "comments\commen EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "double", "double\double-xerces2-8.0.vcproj", "{CCE6AE91-39AC-49B6-8763-742B65FCD92E}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mixed", "mixed\mixed-xerces2-8.0.vcproj", "{26CE0C08-7621-403A-88A7-206E64F32C66}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -58,6 +60,14 @@ Global {CCE6AE91-39AC-49B6-8763-742B65FCD92E}.Release|Win32.Build.0 = Release|Win32 {CCE6AE91-39AC-49B6-8763-742B65FCD92E}.Release|x64.ActiveCfg = Release|x64 {CCE6AE91-39AC-49B6-8763-742B65FCD92E}.Release|x64.Build.0 = Release|x64 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Debug|Win32.ActiveCfg = Debug|Win32 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Debug|Win32.Build.0 = Debug|Win32 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Debug|x64.ActiveCfg = Debug|x64 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Debug|x64.Build.0 = Debug|x64 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Release|Win32.ActiveCfg = Release|Win32 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Release|Win32.Build.0 = Release|Win32 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Release|x64.ActiveCfg = Release|x64 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/dist/examples/cxx/tree/custom/custom-xerces2-9.0.sln b/dist/examples/cxx/tree/custom/custom-xerces2-9.0.sln index 3929a5b..ec151cc 100644 --- a/dist/examples/cxx/tree/custom/custom-xerces2-9.0.sln +++ b/dist/examples/cxx/tree/custom/custom-xerces2-9.0.sln @@ -10,6 +10,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "comments", "comments\commen EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "double", "double\double-xerces2-9.0.vcproj", "{CCE6AE91-39AC-49B6-8763-742B65FCD92E}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mixed", "mixed\mixed-xerces2-9.0.vcproj", "{26CE0C08-7621-403A-88A7-206E64F32C66}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -58,6 +60,14 @@ Global {CCE6AE91-39AC-49B6-8763-742B65FCD92E}.Release|Win32.Build.0 = Release|Win32 {CCE6AE91-39AC-49B6-8763-742B65FCD92E}.Release|x64.ActiveCfg = Release|x64 {CCE6AE91-39AC-49B6-8763-742B65FCD92E}.Release|x64.Build.0 = Release|x64 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Debug|Win32.ActiveCfg = Debug|Win32 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Debug|Win32.Build.0 = Debug|Win32 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Debug|x64.ActiveCfg = Debug|x64 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Debug|x64.Build.0 = Debug|x64 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Release|Win32.ActiveCfg = Release|Win32 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Release|Win32.Build.0 = Release|Win32 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Release|x64.ActiveCfg = Release|x64 + {26CE0C08-7621-403A-88A7-206E64F32C66}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/dist/examples/cxx/tree/custom/makefile b/dist/examples/cxx/tree/custom/makefile index 350d0ab..584f599 100644 --- a/dist/examples/cxx/tree/custom/makefile +++ b/dist/examples/cxx/tree/custom/makefile @@ -1,4 +1,4 @@ -dirs := comments contacts double taxonomy wildcard +dirs := comments contacts double mixed taxonomy wildcard ifeq ($(WITH_BOOST),1) dirs += calendar diff --git a/dist/examples/cxx/tree/custom/mixed/makefile b/dist/examples/cxx/tree/custom/mixed/makefile new file mode 100644 index 0000000..a5ea87e --- /dev/null +++ b/dist/examples/cxx/tree/custom/mixed/makefile @@ -0,0 +1,33 @@ +root := ../../../.. + +include $(root)/build/cxx/rules.make +include $(root)/build/xsd/tree-rules.make + + +override XSDFLAGS += --generate-inline --generate-serialization \ +--custom-type bio=/bio_base --hxx-epilogue '\#include "people-custom.hxx"' + + +# Build. +# +driver: driver.o people.o people-custom.o + +people.o: people.cxx people.ixx people.hxx people-custom.hxx +driver.o: driver.cxx people.ixx people.hxx people-custom.hxx +people-custom.o: people-custom.cxx people.ixx people.hxx people-custom.hxx + +people.cxx people.hxx people.ixx: people.xsd + + +# Test +# +.PHONY: test +test: driver people.xml + ./driver people.xml + + +# Clean. +# +.PHONY: clean +clean: + rm -f people-custom.o people.o people.?xx driver.o driver diff --git a/dist/examples/cxx/tree/custom/mixed/mixed-7.1.vcproj b/dist/examples/cxx/tree/custom/mixed/mixed-7.1.vcproj new file mode 100644 index 0000000..7f155fd --- /dev/null +++ b/dist/examples/cxx/tree/custom/mixed/mixed-7.1.vcproj @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dist/examples/cxx/tree/custom/mixed/mixed-8.0.vcproj b/dist/examples/cxx/tree/custom/mixed/mixed-8.0.vcproj new file mode 100644 index 0000000..ce238d4 --- /dev/null +++ b/dist/examples/cxx/tree/custom/mixed/mixed-8.0.vcproj @@ -0,0 +1,440 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dist/examples/cxx/tree/custom/mixed/mixed-9.0.vcproj b/dist/examples/cxx/tree/custom/mixed/mixed-9.0.vcproj new file mode 100644 index 0000000..5e3c6da --- /dev/null +++ b/dist/examples/cxx/tree/custom/mixed/mixed-9.0.vcproj @@ -0,0 +1,437 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dist/examples/cxx/tree/custom/mixed/mixed-xerces2-7.1.vcproj b/dist/examples/cxx/tree/custom/mixed/mixed-xerces2-7.1.vcproj new file mode 100644 index 0000000..148bc8f --- /dev/null +++ b/dist/examples/cxx/tree/custom/mixed/mixed-xerces2-7.1.vcproj @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dist/examples/cxx/tree/custom/mixed/mixed-xerces2-8.0.vcproj b/dist/examples/cxx/tree/custom/mixed/mixed-xerces2-8.0.vcproj new file mode 100644 index 0000000..94715cf --- /dev/null +++ b/dist/examples/cxx/tree/custom/mixed/mixed-xerces2-8.0.vcproj @@ -0,0 +1,440 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dist/examples/cxx/tree/custom/mixed/mixed-xerces2-9.0.vcproj b/dist/examples/cxx/tree/custom/mixed/mixed-xerces2-9.0.vcproj new file mode 100644 index 0000000..bee87ae --- /dev/null +++ b/dist/examples/cxx/tree/custom/mixed/mixed-xerces2-9.0.vcproj @@ -0,0 +1,437 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.1