visual_studio/NativeClientVSAddIn/InstallerResources/PNaCl/Microsoft.Cpp.PNaCl.targets - Issue 11348050: [VS Addin] Add automatic nmf creation

Side by Side Diff: visual_studio/NativeClientVSAddIn/InstallerResources/PNaCl/Microsoft.Cpp.PNaCl.targets

Issue 11348050: [VS Addin] Add automatic nmf creation (Closed) Base URL: http://nativeclient-sdk.googlecode.com/svn/trunk/src

Patch Set: Created 8 years, 1 month 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

« no previous file with comments | « visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.targets ('k') | visual_studio/NativeClientVSAddIn/InstallerResources/examples/hello_nacl/hello_nacl/hello_nacl.vcxproj » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbui ld/2003">	1 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbui ld/2003">

2 <Import Project="$(VCTargetsPath)\NaCl\ImportBefore\*.targets" Condition="Exis ts('$(VCTargetsPath)\NaCl\ImportBefore')" />	2 <Import Project="$(VCTargetsPath)\NaCl\ImportBefore\*.targets" Condition="Exis ts('$(VCTargetsPath)\NaCl\ImportBefore')" />

3 <Import Project="$(VCTargetsPath)\Microsoft.CppCommon.targets" />	3 <Import Project="$(VCTargetsPath)\Microsoft.CppCommon.targets" />

4	4

5 <UsingTask TaskName="NaClCompile" AssemblyFile="$(VCTargetsPath)\NaCl\NaCl.Bui ld.CPPTasks.dll" />	5 <UsingTask TaskName="NaClCompile" AssemblyFile="$(VCTargetsPath)\NaCl\NaCl.Bui ld.CPPTasks.dll" />

6 <UsingTask TaskName="NaClLink" AssemblyFile="$(VCTargetsPath)\NaCl\NaCl.Build. CPPTasks.dll" />	6 <UsingTask TaskName="NaClLink" AssemblyFile="$(VCTargetsPath)\NaCl\NaCl.Build. CPPTasks.dll" />

7 <UsingTask TaskName="NaClLib" AssemblyFile="$(VCTargetsPath)\NaCl\NaCl.Build.C PPTasks.dll" />	7 <UsingTask TaskName="NaClLib" AssemblyFile="$(VCTargetsPath)\NaCl\NaCl.Build.C PPTasks.dll" />

8 <UsingTask TaskName="VCMessage" AssemblyName="Microsoft.Build.CppTasks.Common, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />	8 <UsingTask TaskName="VCMessage" AssemblyName="Microsoft.Build.CppTasks.Common, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

9	9

10	10

(...skipping 42 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
53	53

54 <NaClLink BuildingInIDE ="$(BuildingInsideVisualStudio)"	54 <NaClLink BuildingInIDE ="$(BuildingInsideVisualStudio)"

55 Sources ="@(Link)"	55 Sources ="@(Link)"

56 OutputCommandLine ="%(Link.OutputCommandLine)"	56 OutputCommandLine ="%(Link.OutputCommandLine)"

57 NaClLinkerPath ="$(VSNaClSDKRoot)toolchain\win_x86 _pnacl\newlib\bin\pnacl-clang++.bat"	57 NaClLinkerPath ="$(VSNaClSDKRoot)toolchain\win_x86 _pnacl\newlib\bin\pnacl-clang++.bat"

58 MinimalRebuildFromTracking ="$(Link_MinimalRebuildFromTracking )"	58 MinimalRebuildFromTracking ="$(Link_MinimalRebuildFromTracking )"

59 OutputFile ="%(Link.OutputFile)"	59 OutputFile ="%(Link.OutputFile)"

60 PropertiesFile ="$(VCTargetsPath)\NaCl\Props\pnacl _link.xml"	60 PropertiesFile ="$(VCTargetsPath)\NaCl\Props\pnacl _link.xml"

61 TLogReadFiles ="@(LinkTLogReadFiles)"	61 TLogReadFiles ="@(LinkTLogReadFiles)"

62 TLogWriteFiles ="@(LinkTLogWriteFiles)"	62 TLogWriteFiles ="@(LinkTLogWriteFiles)"

	63 ToolchainName ="$(ToolchainName)"

63 Platform ="$(Platform)"	64 Platform ="$(Platform)"

64 TranslateX86 ="%(Link.TranslateX86)"	65 TranslateX86 ="%(Link.TranslateX86)"

65 TranslateX64 ="%(Link.TranslateX64)"	66 TranslateX64 ="%(Link.TranslateX64)"

66 TranslateARM ="%(Link.TranslateARM)"	67 TranslateARM ="%(Link.TranslateARM)"

67 TrackFileAccess ="$(TrackFileAccess)"	68 TrackFileAccess ="$(TrackFileAccess)"

68 TrackerLogDirectory ="%(Link.TrackerLogDirectory)"	69 TrackerLogDirectory ="%(Link.TrackerLogDirectory)"

69 ConfigurationType ="$(ConfigurationType)">	70 ConfigurationType ="$(ConfigurationType)">

70 <Output TaskParameter="SkippedExecution" PropertyName="LinkSkippedExecutio n" />	71 <Output TaskParameter="SkippedExecution" PropertyName="LinkSkippedExecutio n" />

71 </NaClLink>	72 </NaClLink>

72	73

(...skipping 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
108 <Message Condition="'$(LibSkippedExecution)' == 'false'" Text="$(MSBuildProj ectFile) -> $(TargetPath)" Importance="High" />	109 <Message Condition="'$(LibSkippedExecution)' == 'false'" Text="$(MSBuildProj ectFile) -> $(TargetPath)" Importance="High" />

109	110

110 </Target>	111 </Target>

111	112

112 <!-- Imports -->	113 <!-- Imports -->

113 <Import Project="$(VCTargetsPath)\NaCl\NaCl.CppBuild.targets" />	114 <Import Project="$(VCTargetsPath)\NaCl\NaCl.CppBuild.targets" />

114 <Import Project="$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_newlib\Microso ft.Cpp.NaCl.win_x86_newlib.targets" Condition="'pnacl' == 'newlib' AND (exists(' $(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_newlib\Microsoft.Cpp.NaCl.win_x86 _newlib.targets'))" />	115 <Import Project="$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_newlib\Microso ft.Cpp.NaCl.win_x86_newlib.targets" Condition="'pnacl' == 'newlib' AND (exists(' $(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_newlib\Microsoft.Cpp.NaCl.win_x86 _newlib.targets'))" />

115 <Import Project="$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_glibc\Microsof t.Cpp.NaCl.win_x86_glibc.targets" Condition="'$(ToolchainName)' == 'glibc' AND ( exists('$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_glibc\Microsoft.Cpp.NaCl. win_x86_glibc.targets'))" />	116 <Import Project="$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_glibc\Microsof t.Cpp.NaCl.win_x86_glibc.targets" Condition="'$(ToolchainName)' == 'glibc' AND ( exists('$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_glibc\Microsoft.Cpp.NaCl. win_x86_glibc.targets'))" />

116	117

117 </Project>	118 </Project>

OLD	NEW