Add more properties to the VS property sheets file
for the NaCl target.
It was reported by one of our users that property
sheets could not be used with the NaCl platform.
BUG=153805
Review URL: https://codereview.chromium.org/10983016
git-svn-id: https://nativeclient-sdk.googlecode.com/svn/trunk/src@1458 050acbb0-2703-11df-ab0a-9f3f633ae91d
diff --git a/InstallerResources/NaCl/Props/nacl_general_ps.xml b/InstallerResources/NaCl/Props/nacl_general_ps.xml
index 53540a8..605331a 100644
--- a/InstallerResources/NaCl/Props/nacl_general_ps.xml
+++ b/InstallerResources/NaCl/Props/nacl_general_ps.xml
@@ -8,8 +8,108 @@
xmlns="http://schemas.microsoft.com/build/2009/properties">
<Rule.Categories>
<Category Name="General" DisplayName="General" Description="General" />
+ <Category Name="NativeClient" DisplayName="Native Client" Description="Native Client General Properties" />
</Rule.Categories>
<Rule.DataSource>
<DataSource Persistence="ProjectFile" Label="Configuration" />
</Rule.DataSource>
+
+ <StringProperty Name="NaClAddInVersion" Visible="false"
+ Category="NativeClient" Default="">
+ <StringProperty.DataSource>
+ <DataSource Persistence="ProjectFile" Label=""/>
+ </StringProperty.DataSource>
+ </StringProperty>
+
+ <StringProperty Name="VSNaClSDKRoot" DisplayName="NaCl SDK Root"
+ Description="Specifies the path to the Native Client SDK root directory."
+ Category="NativeClient" Default=""
+ Subtype="folder" F1Keyword="VC.Project.VCConfiguration.NaClSDKRoot">
+ <StringProperty.DataSource>
+ <DataSource Persistence="ProjectFile" Label="" />
+ </StringProperty.DataSource>
+ </StringProperty>
+
+ <StringProperty Name="NaClManifestPath" DisplayName="Manifest File Path"
+ Description="Specifies the path to the .nmf file for this project configuration."
+ Category="NativeClient" Default=""
+ Subtype="file" F1Keyword="VC.Project.VCConfiguration.NaClManifestPath">
+ <StringProperty.DataSource>
+ <DataSource Persistence="ProjectFile" Label="" />
+ </StringProperty.DataSource>
+ </StringProperty>
+
+ <StringProperty Name="NaClWebServerPort" DisplayName="Web Server Port"
+ Description="Specifies the port number to use while hosting the nexe"
+ Category="NativeClient" Default=""
+ F1Keyword="VC.Project.VCConfiguration.NaClWebServerPort">
+ <StringProperty.DataSource>
+ <DataSource Persistence="ProjectFile" Label="" />
+ </StringProperty.DataSource>
+ </StringProperty>
+
+ <EnumProperty Name="ToolchainName" DisplayName="Toolchain" Category="NativeClient">
+ <EnumValue Name="newlib" DisplayName="newlib" />
+ <EnumValue Name="glibc" DisplayName="glibc" />
+ </EnumProperty>
+
+ <StringProperty Name="OutDir" DisplayName="Output Directory"
+ Description="Specifies a relative path to the output file directory; can include environment variables."
+ Category="General" Default="$(SolutionDir)\$(Platform)\$(Toolchain)\$(Configuration)\"
+ Subtype="folder"
+ F1Keyword="VC.Project.VCConfiguration.OutputDirectory">
+ <StringProperty.DataSource>
+ <DataSource Persistence="ProjectFile" Label="" />
+ </StringProperty.DataSource>
+ </StringProperty>
+
+ <StringProperty Name="IntDir" DisplayName="Intermediate Directory"
+ Description="Specifies a relative path to the intermediate file directory; can include environment variables."
+ Category="General" Default="$(Configuration)\"
+ Subtype="folder"
+ F1Keyword="VC.Project.VCConfiguration.IntermediateDirectory">
+ <StringProperty.DataSource>
+ <DataSource Persistence="ProjectFile" Label="" />
+ </StringProperty.DataSource>
+ </StringProperty>
+
+ <StringProperty Name="TargetName" DisplayName="Target Name"
+ Description="Specifies a file name that this project will generate."
+ F1Keyword="VC.Project.VCConfiguration.TargetName"
+ Category="General" Default="$(ProjectName)_$(PlatformArchitecture)"
+ >
+ <StringProperty.DataSource>
+ <DataSource Persistence="ProjectFile" Label="" />
+ </StringProperty.DataSource>
+ </StringProperty>
+
+ <StringProperty Name="TargetExt" DisplayName="Target Extension"
+ Description="Specifies a file extension that this project will generate. (Example: .exe or .dll)"
+ F1Keyword="VC.Project.VCConfiguration.TargetExt"
+ Category="General"
+ >
+ <StringProperty.DataSource>
+ <DataSource Persistence="ProjectFile" Label="" />
+ </StringProperty.DataSource>
+ </StringProperty>
+
+ <StringListProperty Name="ExtensionsToDeleteOnClean" DisplayName="Extensions to Delete on Clean"
+ Description="Semi-colon delimited wildcard specification for which files in the intermediate directory to delete on clean or rebuild."
+ Category="General" Separator=";"
+ F1Keyword="VC.Project.VCConfiguration.DeleteExtensionsOnClean">
+ <StringListProperty.DataSource>
+ <DataSource Persistence="ProjectFile" Label="" />
+ </StringListProperty.DataSource>
+ </StringListProperty>
+
+ <StringProperty Name="BuildLogFile" DisplayName="Build Log File"
+ Description="Specifies the build log file to write to when build logging is enabled."
+ F1Keyword="VC.Project.VCConfiguration.BuildLogFile"
+ Category="General" Default="$(ProjectDir)\$(MSBuildProjectName).log"
+ Subtype="file">
+ <StringProperty.DataSource>
+ <DataSource Persistence="ProjectFile" ItemType="BuildLog" PersistedName="Path" />
+ </StringProperty.DataSource>
+ </StringProperty>
+
</Rule>
diff --git a/InstallerResources/examples/hello_world_gles/hello_world_gles/hello_world_gles.vcxproj b/InstallerResources/examples/hello_world_gles/hello_world_gles/hello_world_gles.vcxproj
index c0716d4..3d8b028 100644
--- a/InstallerResources/examples/hello_world_gles/hello_world_gles/hello_world_gles.vcxproj
+++ b/InstallerResources/examples/hello_world_gles/hello_world_gles/hello_world_gles.vcxproj
@@ -32,18 +32,6 @@
<RootNamespace>hello_world_gles</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|NaCl64'">
- <ToolchainName>newlib</ToolchainName>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|NaCl32'" Label="Configuration">
- <ToolchainName>newlib</ToolchainName>
- </PropertyGroup>
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|NaCl64'">
- <ToolchainName>newlib</ToolchainName>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|NaCl32'" Label="Configuration">
- <ToolchainName>newlib</ToolchainName>
- </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
