AdblockPlusDeveloperInstall.vcxproj - Issue 10952045: Developer installation from within Visual Studio

Delta Between Two Patch Sets: AdblockPlusDeveloperInstall.vcxproj

Issue 10952045: Developer installation from within Visual Studio (Closed)

Left Patch Set: Created June 18, 2013, 12:10 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.

Jump to:

Left: Side by side diff | Download
Right: Side by side diff | Download

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 23 matching lines...) Expand all Loading...
34 <ProjectConfiguration Include="Release Test\|Win32">	34 <ProjectConfiguration Include="Release Test\|Win32">

35 <Configuration>Release Test</Configuration>	35 <Configuration>Release Test</Configuration>

36 <Platform>Win32</Platform>	36 <Platform>Win32</Platform>

37 </ProjectConfiguration>	37 </ProjectConfiguration>

38 <ProjectConfiguration Include="Release Test\|x64">	38 <ProjectConfiguration Include="Release Test\|x64">

39 <Configuration>Release Test</Configuration>	39 <Configuration>Release Test</Configuration>

40 <Platform>x64</Platform>	40 <Platform>x64</Platform>

41 </ProjectConfiguration>	41 </ProjectConfiguration>

42 </ItemGroup>	42 </ItemGroup>

43 <ItemGroup>	43 <ItemGroup>

	44 <None Include="BHO_add.reg" />

	45 <None Include="BHO_remove.reg" />

44 <None Include="Makefile.DevInstall" />	46 <None Include="Makefile.DevInstall" />

45 </ItemGroup>	47 </ItemGroup>

46 <PropertyGroup Label="Globals">	48 <PropertyGroup Label="Globals">

47 <ProjectGuid>{58274382-2D89-40F5-A132-E4311747D2B5}</ProjectGuid>	49 <ProjectGuid>{58274382-2D89-40F5-A132-E4311747D2B5}</ProjectGuid>

48 <Keyword>MakeFileProj</Keyword>	50 <Keyword>MakeFileProj</Keyword>

49 <ProjectName>Developer Install</ProjectName>	51 <ProjectName>Developer Install</ProjectName>

50 </PropertyGroup>	52 </PropertyGroup>

51 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />	53 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

52 <PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug Production\|Wi n32'" Label="Configuration">	54 <PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug Production\|Wi n32'" Label="Configuration">

53 <ConfigurationType>Makefile</ConfigurationType>	55 <ConfigurationType>Makefile</ConfigurationType>

(...skipping 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
95 <PropertyGroup Label="UserMacros" />	97 <PropertyGroup Label="UserMacros" />

96 <PropertyGroup>	98 <PropertyGroup>

97 <NMakeMacros>ProjectDir="$(ProjectDir)\"</NMakeMacros>	99 <NMakeMacros>ProjectDir="$(ProjectDir)\"</NMakeMacros>

98 </PropertyGroup>	100 </PropertyGroup>

99 <PropertyGroup Condition="'$(Platform)'=='Win32'">	101 <PropertyGroup Condition="'$(Platform)'=='Win32'">

100 <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir>	102 <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir>

101 <NMakeMacros>$(NMakeMacros) OutDir="$(OutDir)\" DLL="$(OutDir)AdblockPlus.dl l"</NMakeMacros>	103 <NMakeMacros>$(NMakeMacros) OutDir="$(OutDir)\" DLL="$(OutDir)AdblockPlus.dl l"</NMakeMacros>

102 </PropertyGroup>	104 </PropertyGroup>

103 <PropertyGroup Condition="'$(Platform)'=='x64'">	105 <PropertyGroup Condition="'$(Platform)'=='x64'">

104 <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir>	106 <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir>

105 <OutDir32>$(ProjectDir)build\ia32\$(Configuration)\</OutDir32>	107 <NMakeMacros>$(NMakeMacros) OutDir="$(OutDir)\" DLL="$(OutDir)AdblockPlusx64 .dll"</NMakeMacros>

106 <NMakeMacros>$(NMakeMacros) OutDir="$(OutDir)\" DLL="$(OutDir)AdblockPlusx64 .dll" DLL32="$(OutDir32)AdblockPlus.dll"</NMakeMacros>
Wladimir Palant 2013/06/18 15:18:33 We should be registering the DLL that was built, n We should be registering the DLL that was built, not both of them. So if we build the x64 DLL then we should register it. If we build the x86 DLL then we register that one here. Eric 2013/06/18 16:00:19 On a 64-bit system, we have to register both DLL's On a 64-bit system, we have to register both DLL's. That's because 64-bit Windows comes with two versions of IE (both 32 and 64 bit) and each needs its own DLL. This mirrors the behavior of the installer, incidentally, which does the same thing. Wladimir Palant 2013/06/19 07:14:15 This is not the installer - it's our development e Show quoted text On 2013/06/18 16:00:19, Eric wrote: > On a 64-bit system, we have to register both DLL's. This is not the installer - it's our development environment. Developers usually don't compile all DLLs, as they only run one version of Internet Explorer for testing. So this code should register whichever DLL was compiled. Eric 2013/06/19 15:22:54 Point taken. Show quoted text On 2013/06/19 07:14:15, Wladimir Palant wrote: > This is not the installer - it's our development environment. Developers usually > don't compile all DLLs, as they only run one version of Internet Explorer for > testing. Point taken.
107 </PropertyGroup>	108 </PropertyGroup>

108 <PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug Production\|Wi n32'">	109 <PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug Production\|Wi n32'">

109 <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build $(NMakeMac ros)</NMakeBuildCommandLine>	110 <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build32 $(NMakeM acros)</NMakeBuildCommandLine>

110 <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean $(NMakeMac ros)</NMakeCleanCommandLine>	111 <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean32 $(NMakeM acros)</NMakeCleanCommandLine>

111 <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild $(NMak eMacros)</NMakeReBuildCommandLine>	112 <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild32 $(NM akeMacros)</NMakeReBuildCommandLine>

112 <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);_DEBUG</ NMakePreprocessorDefinitions>	113 <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);_DEBUG</ NMakePreprocessorDefinitions>

113 <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir>	114 <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir>

114 <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir>	115 <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir>

115 </PropertyGroup>	116 </PropertyGroup>

116 <PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug Production\|x6 4'">	117 <PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug Production\|x6 4'">

117 <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build $(NMakeMac ros)</NMakeBuildCommandLine>	118 <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build64 $(NMakeM acros)</NMakeBuildCommandLine>

118 <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean $(NMakeMac ros)</NMakeCleanCommandLine>	119 <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean64 $(NMakeM acros)</NMakeCleanCommandLine>

119 <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild $(NMak eMacros)</NMakeReBuildCommandLine>	120 <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild64 $(NM akeMacros)</NMakeReBuildCommandLine>

120 <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);_DEBUG</ NMakePreprocessorDefinitions>	121 <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);_DEBUG</ NMakePreprocessorDefinitions>

121 <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir>	122 <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir>

122 <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir>	123 <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir>

123 </PropertyGroup>	124 </PropertyGroup>

124 <PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug Test\|Win32'">	125 <PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug Test\|Win32'">

125 <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build $(NMakeMac ros)</NMakeBuildCommandLine>	126 <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build32 $(NMakeM acros)</NMakeBuildCommandLine>

126 <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean $(NMakeMac ros)</NMakeCleanCommandLine>	127 <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean32 $(NMakeM acros)</NMakeCleanCommandLine>

127 <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild $(NMak eMacros)</NMakeReBuildCommandLine>	128 <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild32 $(NM akeMacros)</NMakeReBuildCommandLine>

128 <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);_DEBUG</ NMakePreprocessorDefinitions>	129 <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);_DEBUG</ NMakePreprocessorDefinitions>

129 <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir>	130 <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir>

130 <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir>	131 <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir>

131 </PropertyGroup>	132 </PropertyGroup>

132 <PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug Test\|x64'">	133 <PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug Test\|x64'">

133 <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build $(NMakeMac ros)</NMakeBuildCommandLine>	134 <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build64 $(NMakeM acros)</NMakeBuildCommandLine>

134 <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean $(NMakeMac ros)</NMakeCleanCommandLine>	135 <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean64 $(NMakeM acros)</NMakeCleanCommandLine>

135 <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild $(NMak eMacros)</NMakeReBuildCommandLine>	136 <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild64 $(NM akeMacros)</NMakeReBuildCommandLine>

136 <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);_DEBUG</ NMakePreprocessorDefinitions>	137 <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);_DEBUG</ NMakePreprocessorDefinitions>

137 <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir>	138 <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir>

138 <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir>	139 <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir>

139 </PropertyGroup>	140 </PropertyGroup>

140 <PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Release Production\| Win32'">	141 <PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Release Production\| Win32'">

141 <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build $(NMakeMac ros)</NMakeBuildCommandLine>	142 <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build32 $(NMakeM acros)</NMakeBuildCommandLine>

142 <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean $(NMakeMac ros)</NMakeCleanCommandLine>	143 <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean32 $(NMakeM acros)</NMakeCleanCommandLine>

143 <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild $(NMak eMacros)</NMakeReBuildCommandLine>	144 <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild32 $(NM akeMacros)</NMakeReBuildCommandLine>

144 <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);NDEBUG</ NMakePreprocessorDefinitions>	145 <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);NDEBUG</ NMakePreprocessorDefinitions>

145 <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir>	146 <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir>

146 <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir>	147 <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir>

147 </PropertyGroup>	148 </PropertyGroup>

148 <PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Release Production\| x64'">	149 <PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Release Production\| x64'">

149 <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build $(NMakeMac ros)</NMakeBuildCommandLine>	150 <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build64 $(NMakeM acros)</NMakeBuildCommandLine>

150 <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean $(NMakeMac ros)</NMakeCleanCommandLine>	151 <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean64 $(NMakeM acros)</NMakeCleanCommandLine>

151 <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild $(NMak eMacros)</NMakeReBuildCommandLine>	152 <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild64 $(NM akeMacros)</NMakeReBuildCommandLine>

152 <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);NDEBUG</ NMakePreprocessorDefinitions>	153 <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);NDEBUG</ NMakePreprocessorDefinitions>

153 <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir>	154 <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir>

154 <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir>	155 <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir>

155 </PropertyGroup>	156 </PropertyGroup>

156 <PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Release Test\|Win32' ">	157 <PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Release Test\|Win32' ">

157 <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build $(NMakeMac ros)</NMakeBuildCommandLine>	158 <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build32 $(NMakeM acros)</NMakeBuildCommandLine>

158 <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean $(NMakeMac ros)</NMakeCleanCommandLine>	159 <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean32 $(NMakeM acros)</NMakeCleanCommandLine>

159 <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild $(NMak eMacros)</NMakeReBuildCommandLine>	160 <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild32$(NMa keMacros)</NMakeReBuildCommandLine>

160 <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);NDEBUG</ NMakePreprocessorDefinitions>	161 <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);NDEBUG</ NMakePreprocessorDefinitions>

161 <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir>	162 <OutDir>$(ProjectDir)build\ia32\$(Configuration)\</OutDir>

162 <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir>	163 <IntDir>$(ProjectDir)build\ia32\$(Configuration)\</IntDir>

163 </PropertyGroup>	164 </PropertyGroup>

164 <PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Release Test\|x64'">	165 <PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Release Test\|x64'">

165 <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build $(NMakeMac ros)</NMakeBuildCommandLine>	166 <NMakeBuildCommandLine>nmake -nologo -f Makefile.DevInstall build64 $(NMakeM acros)</NMakeBuildCommandLine>

166 <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean $(NMakeMac ros)</NMakeCleanCommandLine>	167 <NMakeCleanCommandLine>nmake -nologo -f Makefile.DevInstall clean64 $(NMakeM acros)</NMakeCleanCommandLine>

167 <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild $(NMak eMacros)</NMakeReBuildCommandLine>	168 <NMakeReBuildCommandLine>nmake -nologo -f Makefile.DevInstall rebuild64 $(NM akeMacros)</NMakeReBuildCommandLine>

168 <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);NDEBUG</ NMakePreprocessorDefinitions>	169 <NMakePreprocessorDefinitions>WIN32;$(NMakePreprocessorDefinitions);NDEBUG</ NMakePreprocessorDefinitions>

169 <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir>	170 <OutDir>$(ProjectDir)build\x64\$(Configuration)\</OutDir>

170 <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir>	171 <IntDir>$(ProjectDir)build\x64\$(Configuration)\</IntDir>

171 </PropertyGroup>	172 </PropertyGroup>

172 <ItemDefinitionGroup>	173 <ItemDefinitionGroup>

173 </ItemDefinitionGroup>	174 </ItemDefinitionGroup>

174 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />	175 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

175 <ImportGroup Label="ExtensionTargets">	176 <ImportGroup Label="ExtensionTargets">

176 </ImportGroup>	177 </ImportGroup>

177 </Project>	178 </Project>

LEFT	RIGHT