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

Delta Between Two Patch Sets: adblockplus.gyp

Issue 6567422169448448: Issue 119 - Switch to injecting CSS for element hiding (Closed)
Left Patch Set: rebase Created Dec. 1, 2015, 3:45 p.m.
Right Patch Set: rename OnQuit Created Sept. 30, 2016, 3:25 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 | « no previous file | dependencies » ('j') | 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 29 matching lines...) Expand all
40 'common', 40 'common',
41 ], 41 ],
42 'sources': [ 42 'sources': [
43 'src/shared/AutoHandle.cpp', 43 'src/shared/AutoHandle.cpp',
44 'src/shared/AutoHandle.h', 44 'src/shared/AutoHandle.h',
45 'src/shared/Communication.cpp', 45 'src/shared/Communication.cpp',
46 'src/shared/Communication.h', 46 'src/shared/Communication.h',
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/EventWithSetter.cpp',
51 'src/shared/EventWithSetter.h',
50 'src/shared/Utils.cpp', 52 'src/shared/Utils.cpp',
51 'src/shared/Utils.h', 53 'src/shared/Utils.h',
52 'src/shared/Version.h', 54 'src/shared/Version.h',
53 'src/shared/MsHTMLUtils.cpp', 55 'src/shared/MsHTMLUtils.cpp',
54 'src/shared/MsHTMLUtils.h', 56 'src/shared/MsHTMLUtils.h',
55 ] 57 ],
58 'include_dirs': [
59 '$(ADBLOCKPLUS_ATL)/include',
60 ],
56 }, 61 },
57 62
58 { 63 {
59 'target_name': 'AdblockPlusEngine', 64 'target_name': 'AdblockPlusEngine',
60 'type': 'executable', 65 'type': 'executable',
61 'dependencies': [ 66 'dependencies': [
62 'shared', 67 'shared',
63 'libadblockplus/libadblockplus.gyp:libadblockplus', 68 'libadblockplus/libadblockplus.gyp:libadblockplus',
64 ], 69 ],
65 'sources': [ 70 'sources': [
66 'src/engine/Main.cpp', 71 'src/engine/Main.cpp',
67 'src/engine/NotificationWindow.cpp', 72 'src/engine/NotificationWindow.cpp',
68 'src/engine/NotificationWindow.h', 73 'src/engine/NotificationWindow.h',
69 'src/engine/Debug.cpp', 74 'src/engine/Debug.cpp',
70 'src/engine/UpdateInstallDialog.cpp', 75 'src/engine/UpdateInstallDialog.cpp',
71 'src/engine/Updater.cpp', 76 'src/engine/Updater.cpp',
72 'src/engine/engine.rc', 77 'src/engine/engine.rc',
73 ], 78 ],
79 'include_dirs': [
80 '$(ADBLOCKPLUS_ATL)/include',
81 ],
74 'libraries': [ 82 'libraries': [
75 '-ladvapi32', 83 '-ladvapi32',
76 '-lole32', 84 '-lole32',
77 '-luser32', 85 '-luser32',
78 '-lshell32', 86 '-lshell32',
79 '-lshlwapi', 87 '-lshlwapi',
80 ], 88 ],
81 'msbuild_toolset': 'v110_xp', 89 'msbuild_toolset': 'v110_xp',
82 'msvs_settings': { 90 'msvs_settings': {
83 'VCLinkerTool': { 91 'VCLinkerTool': {
84 'DelayLoadDLLs': ['Shell32.dll'], 92 'DelayLoadDLLs': ['Shell32.dll'],
93 'conditions': [[
94 'target_arch=="ia32"', {
95 'AdditionalLibraryDirectories': [
96 '$(ADBLOCKPLUS_ATL)/lib',
97 ],
98 }, {
99 'AdditionalLibraryDirectories': [
100 '$(ADBLOCKPLUS_ATL)/lib/amd64',
101 ],
102 }
103 ]],
85 }, 104 },
86 }, 105 },
87 }, 106 },
88 107
89 { 108 {
90 'target_name': 'AdblockPlus', 109 'target_name': 'AdblockPlus',
91 'type': 'shared_library', 110 'type': 'shared_library',
92 'dependencies': [ 111 'dependencies': [
93 'shared', 112 'shared',
94 'libadblockplus/libadblockplus.gyp:libadblockplus', 113 'libadblockplus/libadblockplus.gyp:libadblockplus',
95 ], 114 ],
96 'sources': [ 115 'sources': [
97 'src/plugin/AdblockPlus.def', 116 'src/plugin/AdblockPlus.def',
98 'src/plugin/AdblockPlus.idl', 117 'src/plugin/AdblockPlus.idl',
99 'src/plugin/AdblockPlus.rc', 118 'src/plugin/AdblockPlus.rc',
100 'src/plugin/AdblockPlus.rgs', 119 'src/plugin/AdblockPlus.rgs',
101 'src/plugin/AdblockPlusClient.cpp', 120 'src/plugin/AdblockPlusClient.cpp',
102 'src/plugin/AdblockPlusClient.h', 121 'src/plugin/AdblockPlusClient.h',
103 'src/plugin/AdblockPlusDomTraverser.cpp', 122 'src/plugin/AdblockPlusDomTraverser.cpp',
104 'src/plugin/AdblockPlusDomTraverser.h', 123 'src/plugin/AdblockPlusDomTraverser.h',
105 'src/plugin/AdblockPlusGuids.h', 124 'src/plugin/AdblockPlusGuids.h',
106 'src/plugin/ATL_Deprecate.cpp', 125 'src/plugin/ATL_Deprecate.cpp',
107 'src/plugin/ATL_Deprecate.h', 126 'src/plugin/ATL_Deprecate.h',
108 'src/plugin/Config.h', 127 'src/plugin/Config.h',
109 'src/plugin/Console.h',
110 'src/plugin/NotificationMessage.cpp', 128 'src/plugin/NotificationMessage.cpp',
111 'src/plugin/NotificationMessage.h', 129 'src/plugin/NotificationMessage.h',
112 'src/plugin/Plugin.cpp', 130 'src/plugin/Plugin.cpp',
113 'src/plugin/Plugin.h', 131 'src/plugin/Plugin.h',
114 'src/plugin/PluginClass.cpp', 132 'src/plugin/PluginClass.cpp',
115 'src/plugin/PluginClass.h', 133 'src/plugin/PluginClass.h',
116 'src/plugin/PluginClientBase.cpp', 134 'src/plugin/PluginClientBase.cpp',
117 'src/plugin/PluginClientBase.h', 135 'src/plugin/PluginClientBase.h',
118 'src/plugin/PluginClientFactory.cpp', 136 'src/plugin/PluginClientFactory.cpp',
119 'src/plugin/PluginClientFactory.h', 137 'src/plugin/PluginClientFactory.h',
(...skipping 15 matching lines...) Expand all
135 'src/plugin/PluginSystem.h', 153 'src/plugin/PluginSystem.h',
136 'src/plugin/PluginTabBase.cpp', 154 'src/plugin/PluginTabBase.cpp',
137 'src/plugin/PluginTabBase.h', 155 'src/plugin/PluginTabBase.h',
138 'src/plugin/PluginUserSettings.cpp', 156 'src/plugin/PluginUserSettings.cpp',
139 'src/plugin/PluginUserSettings.h', 157 'src/plugin/PluginUserSettings.h',
140 'src/plugin/PluginUtil.cpp', 158 'src/plugin/PluginUtil.cpp',
141 'src/plugin/PluginUtil.h', 159 'src/plugin/PluginUtil.h',
142 'src/plugin/PluginWbPassThrough.cpp', 160 'src/plugin/PluginWbPassThrough.cpp',
143 'src/plugin/PluginWbPassThrough.h', 161 'src/plugin/PluginWbPassThrough.h',
144 'src/plugin/Resource.h', 162 'src/plugin/Resource.h',
163 'src/plugin/WebBrowserEventsListener.h',
164 'src/plugin/WebBrowserEventsListener.cpp',
145 'src/plugin/passthroughapp/PassthroughObject.h', 165 'src/plugin/passthroughapp/PassthroughObject.h',
146 'src/plugin/passthroughapp/ProtocolCF.h', 166 'src/plugin/passthroughapp/ProtocolCF.h',
147 'src/plugin/passthroughapp/ProtocolCF.inl', 167 'src/plugin/passthroughapp/ProtocolCF.inl',
148 'src/plugin/passthroughapp/ProtocolImpl.h', 168 'src/plugin/passthroughapp/ProtocolImpl.h',
149 'src/plugin/passthroughapp/ProtocolImpl.inl', 169 'src/plugin/passthroughapp/ProtocolImpl.inl',
150 'src/plugin/passthroughapp/SinkPolicy.h', 170 'src/plugin/passthroughapp/SinkPolicy.h',
151 'src/plugin/passthroughapp/SinkPolicy.inl', 171 'src/plugin/passthroughapp/SinkPolicy.inl',
152 'src/plugin/WebBrowserEventsListener.h', 172 ],
153 'src/plugin/WebBrowserEventsListener.cpp', 173 'include_dirs': [
Eric 2015/12/02 17:00:13 All the files in the passthrough directory come af
sergei 2016/02/25 17:48:26 These two lines are moved before passthroughapp.
154 ], 174 '$(ADBLOCKPLUS_ATL)/include',
155 'include_dirs': [
156 '$(WindowsSDK_IncludePath)',
157 '$(VCInstallDir)atlmfc/include',
158 '$(WINDDKDIR)/inc/atl71',
159 ], 175 ],
160 # See "Adding Visual Style Support to an Extension, Plug-in, MMC Snap-in or a DLL 176 # See "Adding Visual Style Support to an Extension, Plug-in, MMC Snap-in or a DLL
161 # That Is Brought into a Process" on the link here: 177 # That Is Brought into a Process" on the link here:
162 # http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175%28v=vs.85 %29.aspx#using_manifests 178 # http://msdn.microsoft.com/en-us/library/windows/desktop/bb773175%28v=vs.85 %29.aspx#using_manifests
163 'defines': ['ISOLATION_AWARE_ENABLED'], 179 'defines': ['ISOLATION_AWARE_ENABLED'],
164 'libraries': [ 180 'libraries': [
165 '-lwinhttp', 181 '-lwinhttp',
166 '-lshell32', 182 '-lshell32',
167 '-lComctl32', 183 '-lComctl32',
168 '-lGdi32', 184 '-lGdi32',
169 ], 185 ],
170 'configurations': {
171 # 'libraries' is not allowed under 'configurations' :-(
172 'Debug': {
173 'msvs_settings': {
174 'VCLinkerTool': {
175 'AdditionalDependencies': ['atlsd.lib'],
176 },
177 },
178 },
179 'Release': {
180 'msvs_settings': {
181 'VCLinkerTool': {
182 'AdditionalDependencies': ['atls.lib'],
183 },
184 },
185 },
186 },
187 'msvs_settings': { 186 'msvs_settings': {
188 'VCLinkerTool': { 187 'VCLinkerTool': {
189 'conditions': [[ 188 'conditions': [[
190 'target_arch=="ia32"', { 189 'target_arch=="ia32"', {
191 'AdditionalLibraryDirectories': [ 190 'AdditionalLibraryDirectories': [
192 '$(VCInstallDir)atlmfc/lib', 191 '$(ADBLOCKPLUS_ATL)/lib',
193 '$(WindowsSDK_LibraryPath_x86)',
194 '$(WINDDKDIR)/lib/ATL/i386',
195 ], 192 ],
196 }, { 193 }, {
197 'AdditionalLibraryDirectories': [ 194 'AdditionalLibraryDirectories': [
198 '$(VCInstallDir)atlmfc/lib/amd64', 195 '$(ADBLOCKPLUS_ATL)/lib/amd64',
199 '$(WindowsSDK_LibraryPath_x64)',
200 '$(WINDDKDIR)/lib/ATL/amd64',
201 ], 196 ],
202 } 197 }
203 ]], 198 ]],
204 'DelayLoadDLLs': ['Shell32.dll'], 199 'DelayLoadDLLs': ['Shell32.dll'],
205 }, 200 },
206 }, 201 },
207 }, 202 },
208 203
209 { 204 {
210 'target_name': 'tests', 205 'target_name': 'tests',
211 'type': 'executable', 206 'type': 'executable',
212 'dependencies': [ 207 'dependencies': [
213 'shared', 208 'shared',
214 'libadblockplus/third_party/googletest.gyp:googletest_main', 209 'libadblockplus/third_party/googletest.gyp:googletest_main',
215 ], 210 ],
216 'sources': [ 211 'sources': [
217 'test/CommunicationTest.cpp', 212 'test/CommunicationTest.cpp',
218 'test/DictionaryTest.cpp', 213 'test/DictionaryTest.cpp',
219 'test/UtilTest.cpp', 214 'test/UtilTest.cpp',
220 'test/UtilGetQueryStringTest.cpp', 215 'test/UtilGetQueryStringTest.cpp',
221 'test/UtilGetSchemeAndHierarchicalPartTest.cpp', 216 'test/UtilGetSchemeAndHierarchicalPartTest.cpp',
222 ], 217 ],
223 'defines': ['WINVER=0x0501'], 218 'defines': ['WINVER=0x0501'],
224 'link_settings': { 219 'link_settings': {
225 'libraries': ['-ladvapi32', '-lshell32', '-lole32'], 220 'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-loleaut32'],
226 }, 221 },
227 'msvs_settings': { 222 'msvs_settings': {
228 'VCLinkerTool': { 223 'VCLinkerTool': {
229 'SubSystem': '1', # Console 224 'SubSystem': '1', # Console
230 'EntryPointSymbol': 'mainCRTStartup', 225 'EntryPointSymbol': 'mainCRTStartup',
231 }, 226 },
232 }, 227 },
233 }, 228 },
234 229
235 { 230 {
236 'target_name': 'tests_plugin', 231 'target_name': 'tests_plugin',
237 'type': 'executable', 232 'type': 'executable',
238 'dependencies': [ 233 'dependencies': [
239 'shared', 234 'shared',
240 'libadblockplus/libadblockplus.gyp:libadblockplus', 235 'libadblockplus/libadblockplus.gyp:libadblockplus',
241 'libadblockplus/third_party/googletest.gyp:googletest_main', 236 'libadblockplus/third_party/googletest.gyp:googletest_main',
242 ], 237 ],
243 'sources': [ 238 'sources': [
239 'src/plugin/PluginDebug.cpp',
240 'test/plugin/DebugTest.cpp',
244 'src/plugin/PluginUserSettings.cpp', 241 'src/plugin/PluginUserSettings.cpp',
245 'src/plugin/PluginUserSettings.h', 242 'src/plugin/PluginUserSettings.h',
246 'test/plugin/UserSettingsTest.cpp', 243 'test/plugin/UserSettingsTest.cpp',
247 'src/plugin/PluginUtil.h', 244 'src/plugin/PluginUtil.h',
248 'test/plugin/UtilTest.cpp', 245 'test/plugin/UtilTest.cpp',
249 # 246 #
250 # required only for linking 247 # required only for linking
251 # 248 #
252 'src/plugin/AdblockPlusClient.cpp', 249 'src/plugin/AdblockPlusClient.cpp',
253 'src/plugin/AdblockPlusDomTraverser.cpp', 250 'src/plugin/AdblockPlusDomTraverser.cpp',
254 'src/plugin/ATL_Deprecate.cpp', 251 'src/plugin/ATL_Deprecate.cpp',
255 'src/plugin/NotificationMessage.cpp', 252 'src/plugin/NotificationMessage.cpp',
256 'src/plugin/Plugin.cpp', 253 'src/plugin/Plugin.cpp',
257 'src/plugin/PluginClientBase.cpp', 254 'src/plugin/PluginClientBase.cpp',
258 'src/plugin/PluginClientFactory.cpp', 255 'src/plugin/PluginClientFactory.cpp',
259 'src/plugin/PluginClass.cpp', 256 'src/plugin/PluginClass.cpp',
260 'src/plugin/PluginDebug.cpp',
261 'src/plugin/PluginFilter.cpp', 257 'src/plugin/PluginFilter.cpp',
262 'src/plugin/PluginMimeFilterClient.cpp', 258 'src/plugin/PluginMimeFilterClient.cpp',
263 'src/plugin/PluginMutex.cpp', 259 'src/plugin/PluginMutex.cpp',
264 'src/plugin/PluginSettings.cpp', 260 'src/plugin/PluginSettings.cpp',
265 'src/plugin/PluginSystem.cpp', 261 'src/plugin/PluginSystem.cpp',
266 'src/plugin/PluginTabBase.cpp', 262 'src/plugin/PluginTabBase.cpp',
267 'src/plugin/PluginUtil.cpp', 263 'src/plugin/PluginUtil.cpp',
268 'src/plugin/PluginWbPassthrough.cpp', 264 'src/plugin/PluginWbPassthrough.cpp',
269 'src/plugin/WebBrowserEventsListener.h', 265 'src/plugin/WebBrowserEventsListener.h',
270 'src/plugin/WebBrowserEventsListener.cpp', 266 'src/plugin/WebBrowserEventsListener.cpp',
271 ], 267 ],
272 'include_dirs': [ 268 'include_dirs': [
273 '$(WINDDKDIR)/inc/atl71', 269 '$(ADBLOCKPLUS_ATL)/include',
274 ], 270 ],
275 'defines': [ 271 'defines': [
276 'WINVER=0x0501', 272 'WINVER=0x0501',
277 'PRODUCT_ADBLOCKPLUS' 273 'PRODUCT_ADBLOCKPLUS'
278 ], 274 ],
279 'link_settings': { 275 'link_settings': {
280 'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32 '], 276 'libraries': ['-ladvapi32', '-lshell32', '-lole32', '-lComctl32', '-lGdi32 '],
281 }, 277 },
282 'msvs_settings': { 278 'msvs_settings': {
283 'VCLinkerTool': { 279 'VCLinkerTool': {
284 'SubSystem': '1', # Console 280 'SubSystem': '1', # Console
285 'EntryPointSymbol': 'mainCRTStartup', 281 'EntryPointSymbol': 'mainCRTStartup',
286 'conditions': [[ 282 'conditions': [[
287 'target_arch=="ia32"', { 283 'target_arch=="ia32"', {
288 'AdditionalLibraryDirectories': [ 284 'AdditionalLibraryDirectories': [
289 '$(VCInstallDir)atlmfc/lib', 285 '$(ADBLOCKPLUS_ATL)/lib',
290 '$(WindowsSDK_LibraryPath_x86)',
291 '$(WINDDKDIR)/lib/ATL/i386',
292 ], 286 ],
293 }, { 287 }, {
294 'AdditionalLibraryDirectories': [ 288 'AdditionalLibraryDirectories': [
295 '$(VCInstallDir)atlmfc/lib/amd64', 289 '$(ADBLOCKPLUS_ATL)/lib/amd64',
296 '$(WindowsSDK_LibraryPath_x64)',
297 '$(WINDDKDIR)/lib/ATL/amd64',
298 ], 290 ],
299 } 291 }
300 ]], 292 ]],
301 }, 293 },
302 }, 294 },
303 'configurations': {
304 # 'libraries' is not allowed under 'configurations' :-(
305 'Debug': {
306 'msvs_settings': {
307 'VCLinkerTool': {
308 'AdditionalDependencies': ['atlsd.lib'],
309 },
310 },
311 },
312 'Release': {
313 'msvs_settings': {
314 'VCLinkerTool': {
315 'AdditionalDependencies': ['atls.lib'],
316 },
317 },
318 },
319 },
320 }] 295 }]
321 } 296 }
LEFTRIGHT
« no previous file | dependencies » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld