Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: adblockplus.gyp

Issue 29324576: Issue 2599, 2940 - Fix the presence of correct ATL version (Closed)
Left Patch Set: Created Aug. 25, 2015, 1:11 p.m.
Right Patch Set: address comment, precise python version Created Dec. 2, 2015, 9:11 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
« no previous file with change/comment | « README.md ('k') | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 { 1 {
2 'includes': [ 2 'includes': [
3 'defaults.gypi', 3 'defaults.gypi',
4 'common/common.gypi', 4 'common/common.gypi',
5 ], 5 ],
6 6
7 'variables': { 7 'variables': {
8 'build_type%': 'devbuild', 8 'build_type%': 'devbuild',
9 'build_version%': '', 9 'build_version%': '',
10 }, 10 },
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 'src/shared/CriticalSection.h', 47 'src/shared/CriticalSection.h',
48 'src/shared/Dictionary.cpp', 48 'src/shared/Dictionary.cpp',
49 'src/shared/Dictionary.h', 49 'src/shared/Dictionary.h',
50 'src/shared/Utils.cpp', 50 'src/shared/Utils.cpp',
51 'src/shared/Utils.h', 51 'src/shared/Utils.h',
52 'src/shared/Version.h', 52 'src/shared/Version.h',
53 'src/shared/MsHTMLUtils.cpp', 53 'src/shared/MsHTMLUtils.cpp',
54 'src/shared/MsHTMLUtils.h', 54 'src/shared/MsHTMLUtils.h',
55 ], 55 ],
56 'include_dirs': [ 56 'include_dirs': [
57 '$(WindowsSDK_IncludePath)', 57 '$(ADBLOCKPLUS_ATL)/include',
58 '$(VCInstallDir_120)/atlmfc/include',
Eric 2015/08/26 18:25:35 Nope. Visual Studio 2013 Community does not have
59 ], 58 ],
60 }, 59 },
61 60
62 { 61 {
63 'target_name': 'AdblockPlusEngine', 62 'target_name': 'AdblockPlusEngine',
64 'type': 'executable', 63 'type': 'executable',
65 'dependencies': [ 64 'dependencies': [
66 'shared', 65 'shared',
67 'libadblockplus/libadblockplus.gyp:libadblockplus', 66 'libadblockplus/libadblockplus.gyp:libadblockplus',
68 ], 67 ],
69 'sources': [ 68 'sources': [
70 'src/engine/Main.cpp', 69 'src/engine/Main.cpp',
71 'src/engine/NotificationWindow.cpp', 70 'src/engine/NotificationWindow.cpp',
72 'src/engine/NotificationWindow.h', 71 'src/engine/NotificationWindow.h',
73 'src/engine/Debug.cpp', 72 'src/engine/Debug.cpp',
74 'src/engine/UpdateInstallDialog.cpp', 73 'src/engine/UpdateInstallDialog.cpp',
75 'src/engine/Updater.cpp', 74 'src/engine/Updater.cpp',
76 'src/engine/engine.rc', 75 'src/engine/engine.rc',
77 ], 76 ],
78 'include_dirs': [ 77 'include_dirs': [
79 '$(WindowsSDK_IncludePath)', 78 '$(ADBLOCKPLUS_ATL)/include',
80 '$(VCInstallDir_120)/atlmfc/include',
81 ], 79 ],
82 'libraries': [ 80 'libraries': [
83 '-ladvapi32', 81 '-ladvapi32',
84 '-lole32', 82 '-lole32',
85 '-luser32', 83 '-luser32',
86 '-lshell32', 84 '-lshell32',
87 '-lshlwapi', 85 '-lshlwapi',
88 ], 86 ],
89 'msbuild_toolset': 'v110_xp', 87 'msbuild_toolset': 'v110_xp',
90 'msvs_settings': { 88 'msvs_settings': {
91 'VCLinkerTool': { 89 'VCLinkerTool': {
92 'DelayLoadDLLs': ['Shell32.dll'], 90 'DelayLoadDLLs': ['Shell32.dll'],
93 'conditions': [[ 91 'conditions': [[
94 'target_arch=="ia32"', { 92 'target_arch=="ia32"', {
95 'AdditionalLibraryDirectories': [ 93 'AdditionalLibraryDirectories': [
96 '$(WindowsSDK_LibraryPath_x86)', 94 '$(ADBLOCKPLUS_ATL)/lib',
97 '$(VCInstallDir_120)/atlmfc/lib',
98 ], 95 ],
99 }, { 96 }, {
100 'AdditionalLibraryDirectories': [ 97 'AdditionalLibraryDirectories': [
101 '$(WindowsSDK_LibraryPath_x64)', 98 '$(ADBLOCKPLUS_ATL)/lib/amd64',
102 '$(VCInstallDir_120)/atlmfc/lib/amd64',
103 ], 99 ],
104 } 100 }
105 ]], 101 ]],
106 'DelayLoadDLLs': ['Shell32.dll'],
107 }, 102 },
108 }, 103 },
109 }, 104 },
110 105
111 { 106 {
112 'target_name': 'AdblockPlus', 107 'target_name': 'AdblockPlus',
113 'type': 'shared_library', 108 'type': 'shared_library',
114 'dependencies': [ 109 'dependencies': [
115 'shared', 110 'shared',
116 'libadblockplus/libadblockplus.gyp:libadblockplus', 111 'libadblockplus/libadblockplus.gyp:libadblockplus',
(...skipping 25 matching lines...) Expand all
142 'src/plugin/PluginDebug.cpp', 137 'src/plugin/PluginDebug.cpp',
143 'src/plugin/PluginDebug.h', 138 'src/plugin/PluginDebug.h',
144 'src/plugin/PluginDomTraverserBase.h', 139 'src/plugin/PluginDomTraverserBase.h',
145 'src/plugin/PluginErrorCodes.h', 140 'src/plugin/PluginErrorCodes.h',
146 'src/plugin/PluginFilter.cpp', 141 'src/plugin/PluginFilter.cpp',
147 'src/plugin/PluginFilter.h', 142 'src/plugin/PluginFilter.h',
148 'src/plugin/PluginMimeFilterClient.cpp', 143 'src/plugin/PluginMimeFilterClient.cpp',
149 'src/plugin/PluginMimeFilterClient.h', 144 'src/plugin/PluginMimeFilterClient.h',
150 'src/plugin/PluginMutex.cpp', 145 'src/plugin/PluginMutex.cpp',
151 'src/plugin/PluginMutex.h', 146 'src/plugin/PluginMutex.h',
152 'src/plugin/PluginPassthroughObject.h',
153 'src/plugin/PluginSettings.cpp', 147 'src/plugin/PluginSettings.cpp',
154 'src/plugin/PluginSettings.h', 148 'src/plugin/PluginSettings.h',
155 'src/plugin/PluginStdAfx.cpp', 149 'src/plugin/PluginStdAfx.cpp',
156 'src/plugin/PluginStdAfx.h', 150 'src/plugin/PluginStdAfx.h',
157 'src/plugin/PluginSystem.cpp', 151 'src/plugin/PluginSystem.cpp',
158 'src/plugin/PluginSystem.h', 152 'src/plugin/PluginSystem.h',
159 'src/plugin/PluginTabBase.cpp', 153 'src/plugin/PluginTabBase.cpp',
160 'src/plugin/PluginTabBase.h', 154 'src/plugin/PluginTabBase.h',
161 'src/plugin/PluginUserSettings.cpp', 155 'src/plugin/PluginUserSettings.cpp',
162 'src/plugin/PluginUserSettings.h', 156 'src/plugin/PluginUserSettings.h',
163 'src/plugin/PluginUtil.cpp', 157 'src/plugin/PluginUtil.cpp',
164 'src/plugin/PluginUtil.h', 158 'src/plugin/PluginUtil.h',
165 'src/plugin/PluginWbPassThrough.cpp', 159 'src/plugin/PluginWbPassThrough.cpp',
166 'src/plugin/PluginWbPassThrough.h', 160 'src/plugin/PluginWbPassThrough.h',
167 'src/plugin/ProtocolCF.h',
168 'src/plugin/ProtocolCF.inl',
169 'src/plugin/ProtocolImpl.h',
170 'src/plugin/ProtocolImpl.inl',
171 'src/plugin/Resource.h', 161 'src/plugin/Resource.h',
172 'src/plugin/SinkPolicy.h', 162 'src/plugin/passthroughapp/PassthroughObject.h',
173 'src/plugin/SinkPolicy.inl', 163 'src/plugin/passthroughapp/ProtocolCF.h',
174 ], 164 'src/plugin/passthroughapp/ProtocolCF.inl',
175 'include_dirs': [ 165 'src/plugin/passthroughapp/ProtocolImpl.h',
176 '$(WindowsSDK_IncludePath)', 166 'src/plugin/passthroughapp/ProtocolImpl.inl',
177 '$(VCInstallDir_120)/atlmfc/include', 167 'src/plugin/passthroughapp/SinkPolicy.h',
168 'src/plugin/passthroughapp/SinkPolicy.inl',
169 ],
170 'include_dirs': [
171 '$(ADBLOCKPLUS_ATL)/include',
178 ], 172 ],
179 # See "Adding Visual Style Support to an Extension, Plug-in, MMC Snap-in or a DLL 173 # See "Adding Visual Style Support to an Extension, Plug-in, MMC Snap-in or a DLL
180 # That Is Brought into a Process" on the link here: 174 # That Is Brought into a Process" on the link here:
181 # http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175%28v=vs.85 %29.aspx#using_manifests 175 # http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175%28v=vs.85 %29.aspx#using_manifests
182 'defines': ['ISOLATION_AWARE_ENABLED'], 176 'defines': ['ISOLATION_AWARE_ENABLED'],
183 'libraries': [ 177 'libraries': [
184 '-lwinhttp', 178 '-lwinhttp',
185 '-lshell32', 179 '-lshell32',
186 '-lComctl32', 180 '-lComctl32',
187 '-lGdi32', 181 '-lGdi32',
188 ], 182 ],
189 'msvs_settings': { 183 'msvs_settings': {
190 'VCLinkerTool': { 184 'VCLinkerTool': {
191 'conditions': [[ 185 'conditions': [[
192 'target_arch=="ia32"', { 186 'target_arch=="ia32"', {
193 'AdditionalLibraryDirectories': [ 187 'AdditionalLibraryDirectories': [
194 '$(WindowsSDK_LibraryPath_x86)', 188 '$(ADBLOCKPLUS_ATL)/lib',
195 '$(VCInstallDir_120)/atlmfc/lib',
196 ], 189 ],
197 }, { 190 }, {
198 'AdditionalLibraryDirectories': [ 191 'AdditionalLibraryDirectories': [
199 '$(WindowsSDK_LibraryPath_x64)', 192 '$(ADBLOCKPLUS_ATL)/lib/amd64',
200 '$(VCInstallDir_120)/atlmfc/lib/amd64',
201 ], 193 ],
202 } 194 }
203 ]], 195 ]],
204 'DelayLoadDLLs': ['Shell32.dll'], 196 'DelayLoadDLLs': ['Shell32.dll'],
205 }, 197 },
206 }, 198 },
207 }, 199 },
208 200
209 { 201 {
210 'target_name': 'tests', 202 'target_name': 'tests',
(...skipping 26 matching lines...) Expand all
237 'type': 'executable', 229 'type': 'executable',
238 'dependencies': [ 230 'dependencies': [
239 'shared', 231 'shared',
240 'libadblockplus/libadblockplus.gyp:libadblockplus', 232 'libadblockplus/libadblockplus.gyp:libadblockplus',
241 'libadblockplus/third_party/googletest.gyp:googletest_main', 233 'libadblockplus/third_party/googletest.gyp:googletest_main',
242 ], 234 ],
243 'sources': [ 235 'sources': [
244 'src/plugin/PluginUserSettings.cpp', 236 'src/plugin/PluginUserSettings.cpp',
245 'src/plugin/PluginUserSettings.h', 237 'src/plugin/PluginUserSettings.h',
246 'test/plugin/UserSettingsTest.cpp', 238 'test/plugin/UserSettingsTest.cpp',
239 'src/plugin/PluginUtil.h',
240 'test/plugin/UtilTest.cpp',
247 # 241 #
248 # required only for linking 242 # required only for linking
249 # 243 #
250 'src/plugin/AdblockPlusClient.cpp', 244 'src/plugin/AdblockPlusClient.cpp',
251 'src/plugin/AdblockPlusDomTraverser.cpp', 245 'src/plugin/AdblockPlusDomTraverser.cpp',
252 'src/plugin/ATL_Deprecate.cpp', 246 'src/plugin/ATL_Deprecate.cpp',
253 'src/plugin/NotificationMessage.cpp', 247 'src/plugin/NotificationMessage.cpp',
254 'src/plugin/Plugin.cpp', 248 'src/plugin/Plugin.cpp',
255 'src/plugin/PluginClientBase.cpp', 249 'src/plugin/PluginClientBase.cpp',
256 'src/plugin/PluginClientFactory.cpp', 250 'src/plugin/PluginClientFactory.cpp',
257 'src/plugin/PluginClass.cpp', 251 'src/plugin/PluginClass.cpp',
258 'src/plugin/PluginDebug.cpp', 252 'src/plugin/PluginDebug.cpp',
259 'src/plugin/PluginFilter.cpp', 253 'src/plugin/PluginFilter.cpp',
260 'src/plugin/PluginMimeFilterClient.cpp', 254 'src/plugin/PluginMimeFilterClient.cpp',
261 'src/plugin/PluginMutex.cpp', 255 'src/plugin/PluginMutex.cpp',
262 'src/plugin/PluginSettings.cpp', 256 'src/plugin/PluginSettings.cpp',
263 'src/plugin/PluginSystem.cpp', 257 'src/plugin/PluginSystem.cpp',
264 'src/plugin/PluginTabBase.cpp', 258 'src/plugin/PluginTabBase.cpp',
265 'src/plugin/PluginUtil.cpp', 259 'src/plugin/PluginUtil.cpp',
266 'src/plugin/PluginWbPassthrough.cpp', 260 'src/plugin/PluginWbPassthrough.cpp',
267 ], 261 ],
268 'include_dirs': [ 262 'include_dirs': [
269 '$(WindowsSDK_IncludePath)', 263 '$(ADBLOCKPLUS_ATL)/include',
270 '$(VCInstallDir_120)/atlmfc/include',
271 ], 264 ],
272 'defines': [ 265 'defines': [
273 'WINVER=0x0501', 266 'WINVER=0x0501',
274 'PRODUCT_ADBLOCKPLUS' 267 'PRODUCT_ADBLOCKPLUS'
275 ], 268 ],
276 'link_settings': { 269 'link_settings': {
277 'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32 '], 270 'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32 '],
278 }, 271 },
279 'msvs_settings': { 272 'msvs_settings': {
280 'VCLinkerTool': { 273 'VCLinkerTool': {
281 'SubSystem': '1', # Console 274 'SubSystem': '1', # Console
282 'EntryPointSymbol': 'mainCRTStartup', 275 'EntryPointSymbol': 'mainCRTStartup',
283 'conditions': [[ 276 'conditions': [[
284 'target_arch=="ia32"', { 277 'target_arch=="ia32"', {
285 'AdditionalLibraryDirectories': [ 278 'AdditionalLibraryDirectories': [
286 '$(WindowsSDK_LibraryPath_x86)', 279 '$(ADBLOCKPLUS_ATL)/lib',
287 '$(VCInstallDir_120)/atlmfc/lib',
288 ], 280 ],
289 }, { 281 }, {
290 'AdditionalLibraryDirectories': [ 282 'AdditionalLibraryDirectories': [
291 '$(WindowsSDK_LibraryPath_x64)', 283 '$(ADBLOCKPLUS_ATL)/lib/amd64',
292 '$(VCInstallDir_120)/atlmfc/lib/amd64',
293 ], 284 ],
294 } 285 }
295 ]], 286 ]],
296 }, 287 },
297 }, 288 },
298 }] 289 }]
299 } 290 }
LEFTRIGHT
« README.md ('k') | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld