Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Side by Side Diff: visual_studio/NativeClientVSAddIn/InstallerResources/NaCl/Properties/nacl_general.xml

Issue 10826232: NaCl VS Add-in User Changed Properties Fix (Closed) Base URL: https://nativeclient-sdk.googlecode.com/svn/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 2
3 <Rule 3 <Rule
4 Name="ConfigurationGeneral" 4 Name="ConfigurationGeneral"
5 DisplayName="General" 5 DisplayName="General"
6 PageTemplate="generic" 6 PageTemplate="generic"
7 Description="General" 7 Description="General"
8 xmlns="http://schemas.microsoft.com/build/2009/properties"> 8 xmlns="http://schemas.microsoft.com/build/2009/properties">
9 <Rule.Categories> 9 <Rule.Categories>
10 <Category Name="General" DisplayName="General" Description="General" /> 10 <Category Name="General" DisplayName="General" Description="General" />
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 <StringProperty.DataSource> 56 <StringProperty.DataSource>
57 <DataSource Persistence="ProjectFile" Label="" /> 57 <DataSource Persistence="ProjectFile" Label="" />
58 </StringProperty.DataSource> 58 </StringProperty.DataSource>
59 </StringProperty> 59 </StringProperty>
60 60
61 <EnumProperty Name="ToolchainName" DisplayName="Toolchain" Category="NativeCli ent"> 61 <EnumProperty Name="ToolchainName" DisplayName="Toolchain" Category="NativeCli ent">
62 <EnumValue Name="newlib" DisplayName="newlib" /> 62 <EnumValue Name="newlib" DisplayName="newlib" />
63 <EnumValue Name="glibc" DisplayName="glibc" /> 63 <EnumValue Name="glibc" DisplayName="glibc" />
64 </EnumProperty> 64 </EnumProperty>
65 65
66 <!-- PlatformToolset is constructed in Microsoft.Cpp.NaCl.default.props to be win_x86_$(ToolchainName) -->
67 <StringProperty Name="PlatformToolset" DisplayName="Platform Toolset" Visible= "false"
68 Description="The 'hidden' property which constructs the toolch ain name from current settings."
69 Category="NativeClient">
70 <StringProperty.DataSource>
71 <DataSource Persistence="ProjectFile" Label="" />
72 </StringProperty.DataSource>
73 </StringProperty>
74
75 <StringProperty Name="OutDir" DisplayName="Output Directory" 66 <StringProperty Name="OutDir" DisplayName="Output Directory"
76 Description="Specifies a relative path to the output file dire ctory; can include environment variables." 67 Description="Specifies a relative path to the output file dire ctory; can include environment variables."
77 Category="General" Default="$(SolutionDir)$(Configuration)\" 68 Category="General" Default="$(SolutionDir)$(Configuration)\"
78 Subtype="folder" 69 Subtype="folder"
79 F1Keyword="VC.Project.VCConfiguration.OutputDirectory"> 70 F1Keyword="VC.Project.VCConfiguration.OutputDirectory">
80 <StringProperty.DataSource> 71 <StringProperty.DataSource>
81 <DataSource Persistence="ProjectFile" Label="" /> 72 <DataSource Persistence="ProjectFile" Label="" />
82 </StringProperty.DataSource> 73 </StringProperty.DataSource>
83 </StringProperty> 74 </StringProperty>
84 75
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 Description="Common Language Runtime Support (/clr)"/> 145 Description="Common Language Runtime Support (/clr)"/>
155 <EnumValue Name="Pure" DisplayName="Pure MSIL Common Language Runtime Suppor t (/clr:pure)" 146 <EnumValue Name="Pure" DisplayName="Pure MSIL Common Language Runtime Suppor t (/clr:pure)"
156 Description="Pure MSIL Common Language Runtime Support (/clr:pure )" /> 147 Description="Pure MSIL Common Language Runtime Support (/clr:pure )" />
157 <EnumValue Name="Safe" DisplayName="Safe MSIL Common Language Runtime Suppor t (/clr:safe)" 148 <EnumValue Name="Safe" DisplayName="Safe MSIL Common Language Runtime Suppor t (/clr:safe)"
158 Description="Safe MSIL Common Language Runtime Support (/clr:safe )" /> 149 Description="Safe MSIL Common Language Runtime Support (/clr:safe )" />
159 <EnumValue Name="OldSyntax" DisplayName="Common Language Runtime Support, Ol d Syntax (/clr:oldSyntax)" 150 <EnumValue Name="OldSyntax" DisplayName="Common Language Runtime Support, Ol d Syntax (/clr:oldSyntax)"
160 Description="Common Language Runtime Support, Old Syntax (/clr:ol dSyntax)" /> 151 Description="Common Language Runtime Support, Old Syntax (/clr:ol dSyntax)" />
161 </EnumProperty> 152 </EnumProperty>
162 153
163 </Rule> 154 </Rule>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698