aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2014-07-17 08:19:22 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2014-07-17 08:19:22 +0200
commit179f9d1db56d8b81235e6f85734fcc08e2f33fcc (patch)
tree8e66795e069d1541373b4668c1c00d1856b3a995
parentefe91bff6078fe98f902eece8cca1e0e0803f15f (diff)
Update VC custom build rules with new command line options
-rw-r--r--dist/etc/vc-1x.0/xsd-cxx-parser.props (renamed from dist/etc/vc-10.0/xsd-cxx-parser.props)0
-rw-r--r--dist/etc/vc-1x.0/xsd-cxx-parser.targets (renamed from dist/etc/vc-10.0/xsd-cxx-parser.targets)0
-rw-r--r--dist/etc/vc-1x.0/xsd-cxx-parser.xml (renamed from dist/etc/vc-10.0/xsd-cxx-parser.xml)0
-rw-r--r--dist/etc/vc-1x.0/xsd-cxx-tree.props (renamed from dist/etc/vc-10.0/xsd-cxx-tree.props)4
-rw-r--r--dist/etc/vc-1x.0/xsd-cxx-tree.targets (renamed from dist/etc/vc-10.0/xsd-cxx-tree.targets)4
-rw-r--r--dist/etc/vc-1x.0/xsd-cxx-tree.xml (renamed from dist/etc/vc-10.0/xsd-cxx-tree.xml)23
6 files changed, 28 insertions, 3 deletions
diff --git a/dist/etc/vc-10.0/xsd-cxx-parser.props b/dist/etc/vc-1x.0/xsd-cxx-parser.props
index b167a38..b167a38 100644
--- a/dist/etc/vc-10.0/xsd-cxx-parser.props
+++ b/dist/etc/vc-1x.0/xsd-cxx-parser.props
diff --git a/dist/etc/vc-10.0/xsd-cxx-parser.targets b/dist/etc/vc-1x.0/xsd-cxx-parser.targets
index 62ad2b2..62ad2b2 100644
--- a/dist/etc/vc-10.0/xsd-cxx-parser.targets
+++ b/dist/etc/vc-1x.0/xsd-cxx-parser.targets
diff --git a/dist/etc/vc-10.0/xsd-cxx-parser.xml b/dist/etc/vc-1x.0/xsd-cxx-parser.xml
index 37202c6..37202c6 100644
--- a/dist/etc/vc-10.0/xsd-cxx-parser.xml
+++ b/dist/etc/vc-1x.0/xsd-cxx-parser.xml
diff --git a/dist/etc/vc-10.0/xsd-cxx-tree.props b/dist/etc/vc-1x.0/xsd-cxx-tree.props
index 3d66166..fc81c9b 100644
--- a/dist/etc/vc-10.0/xsd-cxx-tree.props
+++ b/dist/etc/vc-1x.0/xsd-cxx-tree.props
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup
Condition="'$(CXX_Tree_Mapping_RuleBeforeTargets)' == '' and '$(CXX_Tree_Mapping_RuleAfterTargets)' == '' and '$(ConfigurationType)' != 'Makefile'">
@@ -12,6 +12,7 @@
<ItemDefinitionGroup>
<CXX_Tree_Mapping_Rule>
<ProprietaryLicense>False</ProprietaryLicense>
+ <CxxStd>0</CxxStd>
<GenInline>False</GenInline>
<GenForward>False</GenForward>
<GenSerialization>False</GenSerialization>
@@ -25,6 +26,7 @@
<GenFromBaseCtor>False</GenFromBaseCtor>
<GenDetach>False</GenDetach>
<GenWildcard>False</GenWildcard>
+ <GenAnyType>False</GenAnyType>
<GenElementType>False</GenElementType>
<GenElementMap>False</GenElementMap>
<GenIntellisense>False</GenIntellisense>
diff --git a/dist/etc/vc-10.0/xsd-cxx-tree.targets b/dist/etc/vc-1x.0/xsd-cxx-tree.targets
index a65b559..6156ec2 100644
--- a/dist/etc/vc-10.0/xsd-cxx-tree.targets
+++ b/dist/etc/vc-1x.0/xsd-cxx-tree.targets
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PropertyPageSchema
@@ -46,6 +46,7 @@
Condition="'@(CXX_Tree_Mapping_Rule)' != '' and '%(CXX_Tree_Mapping_Rule.ExcludedFromBuild)' != 'true'"
CommandLineTemplate="%(CXX_Tree_Mapping_Rule.CommandLineTemplate)"
ProprietaryLicense="%(CXX_Tree_Mapping_Rule.ProprietaryLicense)"
+ CxxStd="%(CXX_Tree_Mapping_Rule.CxxStd)"
GenInline="%(CXX_Tree_Mapping_Rule.GenInline)"
GenForward="%(CXX_Tree_Mapping_Rule.GenForward)"
GenSerialization="%(CXX_Tree_Mapping_Rule.GenSerialization)"
@@ -59,6 +60,7 @@
GenFromBaseCtor="%(CXX_Tree_Mapping_Rule.GenFromBaseCtor)"
GenDetach="%(CXX_Tree_Mapping_Rule.GenDetach)"
GenWildcard="%(CXX_Tree_Mapping_Rule.GenWildcard)"
+ GenAnyType="%(CXX_Tree_Mapping_Rule.GenAnyType)"
GenElementType="%(CXX_Tree_Mapping_Rule.GenElementType)"
GenElementMap="%(CXX_Tree_Mapping_Rule.GenElementMap)"
GenIntellisense="%(CXX_Tree_Mapping_Rule.GenIntellisense)"
diff --git a/dist/etc/vc-10.0/xsd-cxx-tree.xml b/dist/etc/vc-1x.0/xsd-cxx-tree.xml
index 12393ee..e37eb1c 100644
--- a/dist/etc/vc-10.0/xsd-cxx-tree.xml
+++ b/dist/etc/vc-1x.0/xsd-cxx-tree.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:transformCallback="Microsoft.Cpp.Dev10.ConvertPropertyCallback">
<Rule
Name="CXX_Tree_Mapping_Rule"
@@ -44,6 +44,20 @@
DisplayName="Proprietary License"
Description="Indicate that the generated code is licensed under a proprietary license instead of the GPL."
Switch="--proprietary-license" />
+ <EnumProperty
+ Name="CxxStd"
+ Category="Code Generation"
+ HelpContext="0"
+ DisplayName="C++ Standard"
+ Description="C++ Standard the generated code should conform to.">
+ <EnumValue
+ Name="0"
+ DisplayName="c++98" />
+ <EnumValue
+ Name="1"
+ DisplayName="c++11"
+ Switch="--std c++11" />
+ </EnumProperty>
<BoolProperty
Name="GenInline"
Category="Code Generation"
@@ -136,6 +150,13 @@
Description="Generate accessors and modifiers as well as parsing and serialization code for XML Schema wildcards (any and anyAttribute)."
Switch="--generate-wildcard" />
<BoolProperty
+ Name="GenAnyType"
+ Category="Code Generation"
+ HelpContext="0"
+ DisplayName="Generate anyType"
+ Description="Extract and store content of the XML Schema anyType type as a DOM fragment."
+ Switch="--generate-any-type" />
+ <BoolProperty
Name="GenElementType"
Category="Code Generation"
HelpContext="0"