Delta Between Two Patch Sets: AdblockPlusDeveloperInstall.vcxproj
Issue 10952045:
Developer installation from within Visual Studio (Closed)
Left Patch Set: Took UAC out of the build loop
Created June 19, 2013, 4:54 p.m.
Right Patch Set: Fixes addressing comments
Created June 20, 2013, 3:21 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« no previous file
|
Makefile.DevInstall » ('j')
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <!-- | 2 <!-- |
| 3 Warning: This file has been edited by hand with PropertyGroup Conditions tha t Visual Studio does not have UI for. | 3 Warning: This file has been edited by hand with PropertyGroup Conditions tha t Visual Studio does not have UI for. |
| 4 Please do not edit this file within Visual Studio. | 4 Please do not edit this file within Visual Studio. |
| 5 Simply loading it into Visual Studio will cause it to write some default ent ries, so that's where the extra cruft come from. | 5 Simply loading it into Visual Studio will cause it to write some default ent ries, so that's where the extra cruft come from. |
| 6 These conditions work fine with MSBUILD, which is all we care about. | 6 These conditions work fine with MSBUILD, which is all we care about. |
| 7 --> | 7 --> |
| 8 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microso ft.com/developer/msbuild/2003"> | 8 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microso ft.com/developer/msbuild/2003"> |
| 9 <ItemGroup Label="ProjectConfigurations"> | 9 <ItemGroup Label="ProjectConfigurations"> |
| 10 <ProjectConfiguration Include="Debug Production|Win32"> | 10 <ProjectConfiguration Include="Debug Production|Win32"> |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 150 <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build64 $(NMakeM acros)</NMakeBuildCommandLine> | 150 <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build64 $(NMakeM acros)</NMakeBuildCommandLine> |
| 151 <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean64 $(NMakeM acros)</NMakeCleanCommandLine> | 151 <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean64 $(NMakeM acros)</NMakeCleanCommandLine> |
| 152 <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild64 $(NM akeMacros)</NMakeReBuildCommandLine> | 152 <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild64 $(NM akeMacros)</NMakeReBuildCommandLine> |
| 153 <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);NDEBUG</ NMakePreprocessorDefinitions> | 153 <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);NDEBUG</ NMakePreprocessorDefinitions> |
| 154 <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir> | 154 <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir> |
| 155 <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir> | 155 <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir> |
| 156 </PropertyGroup> | 156 </PropertyGroup> |
| 157 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|Win32' "> | 157 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|Win32' "> |
| 158 <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build32 $(NMakeM acros)</NMakeBuildCommandLine> | 158 <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build32 $(NMakeM acros)</NMakeBuildCommandLine> |
| 159 <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean32 $(NMakeM acros)</NMakeCleanCommandLine> | 159 <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean32 $(NMakeM acros)</NMakeCleanCommandLine> |
| 160 <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild 32$(NM akeMacros)</NMakeReBuildCommandLine> | 160 <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild32$(NMa keMacros)</NMakeReBuildCommandLine> |
|
Wladimir Palant
2013/06/20 07:10:38
Space at the wrong place?
Eric
2013/06/20 14:13:47
Yes.
| |
| 161 <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);NDEBUG</ NMakePreprocessorDefinitions> | 161 <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);NDEBUG</ NMakePreprocessorDefinitions> |
| 162 <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir> | 162 <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir> |
| 163 <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir> | 163 <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir> |
| 164 </PropertyGroup> | 164 </PropertyGroup> |
| 165 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|x64'"> | 165 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Test|x64'"> |
| 166 <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build64 $(NMakeM acros)</NMakeBuildCommandLine> | 166 <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build64 $(NMakeM acros)</NMakeBuildCommandLine> |
| 167 <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean64 $(NMakeM acros)</NMakeCleanCommandLine> | 167 <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean64 $(NMakeM acros)</NMakeCleanCommandLine> |
| 168 <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild64 $(NM akeMacros)</NMakeReBuildCommandLine> | 168 <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild64 $(NM akeMacros)</NMakeReBuildCommandLine> |
| 169 <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);NDEBUG</ NMakePreprocessorDefinitions> | 169 <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);NDEBUG</ NMakePreprocessorDefinitions> |
| 170 <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir> | 170 <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir> |
| 171 <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir> | 171 <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir> |
| 172 </PropertyGroup> | 172 </PropertyGroup> |
| 173 <ItemDefinitionGroup> | 173 <ItemDefinitionGroup> |
| 174 </ItemDefinitionGroup> | 174 </ItemDefinitionGroup> |
| 175 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 175 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 176 <ImportGroup Label="ExtensionTargets"> | 176 <ImportGroup Label="ExtensionTargets"> |
| 177 </ImportGroup> | 177 </ImportGroup> |
| 178 </Project> | 178 </Project> |
| LEFT | RIGHT |
« no previous file
|
Makefile.DevInstall » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
