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

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

Issue 11266051: Add PNaCl support for VS addin. (Closed) Base URL: http://nativeclient-sdk.googlecode.com/svn/trunk/src
Patch Set: fix nits and tests 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
OLDNEW
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 10 matching lines...) Expand all
21 Condition="'@(ClCompile)' != ''" 21 Condition="'@(ClCompile)' != ''"
22 DependsOnTargets="SelectClCompile"> 22 DependsOnTargets="SelectClCompile">
23 23
24 <NaClCompile Condition="'%(ClCompile.ExcludedFromBuild)'!='true'" 24 <NaClCompile Condition="'%(ClCompile.ExcludedFromBuild)'!='true'"
25 BuildingInIDE ="$(BuildingInsideVisualStud io)" 25 BuildingInIDE ="$(BuildingInsideVisualStud io)"
26 Sources ="@(ClCompile)" 26 Sources ="@(ClCompile)"
27 OutputCommandLine ="%(ClCompile.OutputCommandL ine)" 27 OutputCommandLine ="%(ClCompile.OutputCommandL ine)"
28 ProcessorNumber ="%(ClCompile.ProcessorNumbe r)" 28 ProcessorNumber ="%(ClCompile.ProcessorNumbe r)"
29 MultiProcessorCompilation ="%(ClCompile.MultiProcessor Compilation)" 29 MultiProcessorCompilation ="%(ClCompile.MultiProcessor Compilation)"
30 MinimalRebuildFromTracking ="%(ClCompile.MinimalRebuild FromTracking)" 30 MinimalRebuildFromTracking ="%(ClCompile.MinimalRebuild FromTracking)"
31 NaCLCompilerPath ="$(VSNaClSDKRoot)\toolchain \win_x86_$(ToolchainName)\bin\$(TargetArchitecture)-nacl-gcc.exe" 31 NaCLCompilerPath ="$(VSNaClSDKRoot)toolchain\ win_x86_$(ToolchainName)\bin\$(TargetArchitecture)-nacl-gcc.exe"
32 PropertiesFile ="$(VCTargetsPath)\NaCl\Prop s\nacl_compile.xml" 32 PropertiesFile ="$(VCTargetsPath)\NaCl\Prop s\nacl_compile.xml"
33 TLogReadFiles ="@(CLTLogReadFiles)" 33 TLogReadFiles ="@(CLTLogReadFiles)"
34 TLogWriteFiles ="@(CLTLogWriteFiles)" 34 TLogWriteFiles ="@(CLTLogWriteFiles)"
35 ToolExe ="$(CLToolExe)" 35 Platform ="$(Platform)"
36 ToolPath ="$(CLToolPath)"
37 TrackFileAccess ="$(TrackFileAccess)" 36 TrackFileAccess ="$(TrackFileAccess)"
38 TrackerLogDirectory ="%(ClCompile.TrackerLogDire ctory)"> 37 TrackerLogDirectory ="%(ClCompile.TrackerLogDire ctory)">
39 </NaClCompile> 38 </NaClCompile>
40 </Target> 39 </Target>
41 40
42 <!-- ************************************************************************* ****************** 41 <!-- ************************************************************************* ******************
43 Link 42 Link
44 ************************************************************************* ****************** --> 43 ************************************************************************* ****************** -->
45 44
46 <Target Name="Link" 45 <Target Name="Link"
47 Condition="'@(Link)' != ''"> 46 Condition="'@(Link)' != ''">
48 47
49 <PropertyGroup> 48 <PropertyGroup>
50 <Link_MinimalRebuildFromTracking Condition="'@(Link->AnyHaveMetadataValue( 'MinimalRebuildFromTracking', 'false'))' == 'true'">false</Link_MinimalRebuildFr omTracking> 49 <Link_MinimalRebuildFromTracking Condition="'@(Link->AnyHaveMetadataValue( 'MinimalRebuildFromTracking', 'false'))' == 'true'">false</Link_MinimalRebuildFr omTracking>
51 <Link_MinimalRebuildFromTracking Condition="'$(BuildType)' != 'Build' or ' $(ForceRebuild)' == 'true'" >false</Link_MinimalRebuildFromTracking> 50 <Link_MinimalRebuildFromTracking Condition="'$(BuildType)' != 'Build' or ' $(ForceRebuild)' == 'true'" >false</Link_MinimalRebuildFromTracking>
52 <Link_MinimalRebuildFromTracking Condition="'$(Link_MinimalRebuildFromTrac king)' == ''">true</Link_MinimalRebuildFromTracking> 51 <Link_MinimalRebuildFromTracking Condition="'$(Link_MinimalRebuildFromTrac king)' == ''">true</Link_MinimalRebuildFromTracking>
53 </PropertyGroup> 52 </PropertyGroup>
54 53
55 <NaClLink BuildingInIDE ="$(BuildingInsideVisualStudio)" 54 <NaClLink BuildingInIDE ="$(BuildingInsideVisualStudio)"
56 Sources ="@(Link)" 55 Sources ="@(Link)"
57 OutputCommandLine ="%(Link.OutputCommandLine)" 56 OutputCommandLine ="%(Link.OutputCommandLine)"
58 NaClLinkerPath ="$(VSNaClSDKRoot)\toolchain\win_x8 6_$(ToolchainName)\bin\$(TargetArchitecture)-nacl-g++.exe" 57 NaClLinkerPath ="$(VSNaClSDKRoot)\toolchain\win_x8 6_$(ToolchainName)\bin\$(TargetArchitecture)-nacl-g++.exe"
59 MinimalRebuildFromTracking ="$(Link_MinimalRebuildFromTracking )" 58 MinimalRebuildFromTracking ="$(Link_MinimalRebuildFromTracking )"
60 OutputFile ="%(Link.OutputFile)" 59 OutputFile ="%(Link.OutputFile)"
61 PropertiesFile ="$(VCTargetsPath)\NaCl\Props\nacl_ link.xml" 60 PropertiesFile ="$(VCTargetsPath)\NaCl\Props\nacl_ link.xml"
62 TLogReadFiles ="@(LinkTLogReadFiles)" 61 TLogReadFiles ="@(LinkTLogReadFiles)"
63 TLogWriteFiles ="@(LinkTLogWriteFiles)" 62 TLogWriteFiles ="@(LinkTLogWriteFiles)"
64 ToolExe ="$(LinkToolExe)" 63 Platform ="$(Platform)"
65 ToolPath ="$(LinkToolPath)" 64 TrackFileAccess ="$(TrackFileAccess)"
66 TrackerLogDirectory ="%(Link.TrackerLogDirectory)" 65 TrackerLogDirectory ="%(Link.TrackerLogDirectory)"
67 TrackFileAccess ="$(TrackFileAccess)"
68 ConfigurationType ="$(ConfigurationType)"> 66 ConfigurationType ="$(ConfigurationType)">
69 <Output TaskParameter="SkippedExecution" PropertyName="LinkSkippedExecutio n" /> 67 <Output TaskParameter="SkippedExecution" PropertyName="LinkSkippedExecutio n" />
70 </NaClLink> 68 </NaClLink>
71 69
72 <Message Condition="'$(LinkSkippedExecution)' == 'false'" Text="$(MSBuildPro jectFile) -&gt; $(TargetPath)" Importance="High" /> 70 <Message Condition="'$(LinkSkippedExecution)' == 'false'" Text="$(MSBuildPro jectFile) -&gt; $(TargetPath)" Importance="High" />
73 71
74 </Target> 72 </Target>
75 73
76 74
77 <!-- ************************************************************************* ****************** 75 <!-- ************************************************************************* ******************
78 Lib 76 Lib
79 ************************************************************************* ****************** --> 77 ************************************************************************* ****************** -->
80 78
81 <!-- Lib script based on: MSBuild\Microsoft.Cpp\v4.0\Microsoft.CppCommon.targe ts --> 79 <!-- Lib script based on: MSBuild\Microsoft.Cpp\v4.0\Microsoft.CppCommon.targe ts -->
82 80
83 <Target Name="Lib" 81 <Target Name="Lib"
84 Condition="'@(Lib)' != ''"> 82 Condition="'@(Lib)' != ''">
85 83
86 <ItemGroup> 84 <ItemGroup>
87 <Lib> 85 <Lib>
88 <MinimalRebuildFromTracking Condition="'%(Lib.MinimalRebuildFromTracking )' == '' and '$(BuildType)' == 'Build' and '$(ForceRebuild)' != 'true'">true</Mi nimalRebuildFromTracking> 86 <MinimalRebuildFromTracking Condition="'%(Lib.MinimalRebuildFromTracking )' == '' and '$(BuildType)' == 'Build' and '$(ForceRebuild)' != 'true'">true</Mi nimalRebuildFromTracking>
89 </Lib> 87 </Lib>
90 </ItemGroup> 88 </ItemGroup>
91 89
92 <NaClLib BuildingInIDE ="$(BuildingInsideVisualStudio)" 90 <NaClLib BuildingInIDE ="$(BuildingInsideVisualStudio)"
93 Sources ="@(Lib)" 91 Sources ="@(Lib)"
94 OutputCommandLine ="%(Lib.OutputCommandLine)" 92 OutputCommandLine ="%(Lib.OutputCommandLine)"
95 LibrarianToolPath ="$(VSNaClSDKRoot)\toolchain\win_x86 _$(ToolchainName)\bin\$(TargetArchitecture)-nacl-ar.exe" 93 LibrarianToolPath ="$(VSNaClSDKRoot)toolchain\win_x86_ $(ToolchainName)\bin\$(TargetArchitecture)-nacl-ar.exe"
96 MinimalRebuildFromTracking ="%(Lib.MinimalRebuildFromTracking)" 94 MinimalRebuildFromTracking ="%(Lib.MinimalRebuildFromTracking)"
97 OutputFile ="%(Lib.OutputFile)" 95 OutputFile ="%(Lib.OutputFile)"
98 PropertiesFile ="$(VCTargetsPath)\NaCl\Props\nacl_l ib.xml" 96 PropertiesFile ="$(VCTargetsPath)\NaCl\Props\nacl_l ib.xml"
99 TrackerLogDirectory ="%(Lib.TrackerLogDirectory)" 97 TrackerLogDirectory ="%(Lib.TrackerLogDirectory)"
100 TLogReadFiles ="@(LIBTLogReadFiles)" 98 TLogReadFiles ="@(LIBTLogReadFiles)"
101 TLogWriteFiles ="@(LIBTLogWriteFiles)" 99 TLogWriteFiles ="@(LIBTLogWriteFiles)"
102 ToolExe ="$(LIBToolExe)" 100 Platform ="$(Platform)"
103 ToolPath ="$(LIBToolPath)"
104 TrackFileAccess ="$(TrackFileAccess)"> 101 TrackFileAccess ="$(TrackFileAccess)">
105 <Output TaskParameter="SkippedExecution" PropertyName="LibSkippedExecuti on" /> 102 <Output TaskParameter="SkippedExecution" PropertyName="LibSkippedExecuti on" />
106 </NaClLib> 103 </NaClLib>
107 104
108 <Message Condition="'$(LibSkippedExecution)' == 'false'" Text="$(MSBuildProj ectFile) -&gt; $(TargetPath)" Importance="High" /> 105 <Message Condition="'$(LibSkippedExecution)' == 'false'" Text="$(MSBuildProj ectFile) -&gt; $(TargetPath)" Importance="High" />
109 106
110 </Target> 107 </Target>
111 108
112 <!-- Imports --> 109 <!-- Imports -->
113 <Import Project="$(VCTargetsPath)\NaCl\NaCl.CppBuild.targets" /> 110 <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="'$(ToolchainName)' == 'newlib' AN D (exists('$(VCTargetsPath)\NaCl\PlatformToolsets\win_x86_newlib\Microsoft.Cpp.N aCl.win_x86_newlib.targets'))" /> 111 <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'))" />
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'))" /> 112 <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 113
117 </Project> 114 </Project>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698