visual_studio/NativeClientVSAddIn/InstallerResources/NaCl64/Microsoft.Cpp.NaCl64.targets - Issue 11375004: [NaCl Addin] Fix to PNaCl lib creation from MSVS

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

Issue 11375004: [NaCl Addin] Fix to PNaCl lib creation from MSVS (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/NaCl/Props/nacl_lib.xml ('k') | visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/NaClCompile.cs » ('j') | visual_studio/NativeClientVSAddIn/NaCl.Build.CPPTasks/NaClCompile.cs » ('J')
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 81 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
92 </Lib>	92 </Lib>

93 </ItemGroup>	93 </ItemGroup>

94	94

95 <NaClLib BuildingInIDE ="$(BuildingInsideVisualStudio)"	95 <NaClLib BuildingInIDE ="$(BuildingInsideVisualStudio)"

96 Sources ="@(Lib)"	96 Sources ="@(Lib)"

97 OutputCommandLine ="%(Lib.OutputCommandLine)"	97 OutputCommandLine ="%(Lib.OutputCommandLine)"

98 LibrarianToolPath ="$(VSNaClSDKRoot)toolchain\win_x86_ $(ToolchainName)\bin\$(TargetArchitecture)-nacl-ar.exe"	98 LibrarianToolPath ="$(VSNaClSDKRoot)toolchain\win_x86_ $(ToolchainName)\bin\$(TargetArchitecture)-nacl-ar.exe"

99 MinimalRebuildFromTracking ="%(Lib.MinimalRebuildFromTracking)"	99 MinimalRebuildFromTracking ="%(Lib.MinimalRebuildFromTracking)"

100 OutputFile ="%(Lib.OutputFile)"	100 OutputFile ="%(Lib.OutputFile)"

101 PropertiesFile ="$(VCTargetsPath)\NaCl\Props\nacl_l ib.xml"	101 PropertiesFile ="$(VCTargetsPath)\NaCl\Props\nacl_l ib.xml"

	102 Platform ="$(Platform)"

102 TrackerLogDirectory ="%(Lib.TrackerLogDirectory)"	103 TrackerLogDirectory ="%(Lib.TrackerLogDirectory)"

103 TLogReadFiles ="@(LIBTLogReadFiles)"	104 TLogReadFiles ="@(LIBTLogReadFiles)"

104 TLogWriteFiles ="@(LIBTLogWriteFiles)"	105 TLogWriteFiles ="@(LIBTLogWriteFiles)"

105 TrackFileAccess ="$(TrackFileAccess)">	106 TrackFileAccess ="$(TrackFileAccess)">

106 <Output TaskParameter="SkippedExecution" PropertyName="LibSkippedExecuti on" />	107 <Output TaskParameter="SkippedExecution" PropertyName="LibSkippedExecuti on" />

107 </NaClLib>	108 </NaClLib>

108	109

109 <Message Condition="'$(LibSkippedExecution)' == 'false'" Text="$(MSBuildProj ectFile) -> $(TargetPath)" Importance="High" />	110 <Message Condition="'$(LibSkippedExecution)' == 'false'" Text="$(MSBuildProj ectFile) -> $(TargetPath)" Importance="High" />

110	111

111 </Target>	112 </Target>

112	113

113 <!-- Imports -->	114 <!-- Imports -->

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

115 <Import Project="$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_newlib\Microso ft.Cpp.NaCl.win_x86_newlib.targets" Condition="'$(ToolchainName)' == 'newlib' AN D (exists('$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_newlib\Microsoft.Cpp.N aCl.win_x86_newlib.targets'))" />	116 <Import Project="$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_newlib\Microso ft.Cpp.NaCl.win_x86_newlib.targets" Condition="'$(ToolchainName)' == 'newlib' AN D (exists('$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_newlib\Microsoft.Cpp.N aCl.win_x86_newlib.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'))" />	117 <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'))" />

117	118

118 </Project>	119 </Project>

OLD	NEW