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

Side by Side Diff: adblockplus.gyp

Issue 29323611: Issue #1234, #2058 - Rewrite log facility, improving thread implementation
Patch Set: rebase to current tip Created Jan. 5, 2016, 2:52 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | src/plugin/ActiveQueue.h » ('j') | src/plugin/ActiveQueue.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 }, 104 },
105 105
106 { 106 {
107 'target_name': 'AdblockPlus', 107 'target_name': 'AdblockPlus',
108 'type': 'shared_library', 108 'type': 'shared_library',
109 'dependencies': [ 109 'dependencies': [
110 'shared', 110 'shared',
111 'libadblockplus/libadblockplus.gyp:libadblockplus', 111 'libadblockplus/libadblockplus.gyp:libadblockplus',
112 ], 112 ],
113 'sources': [ 113 'sources': [
114 'src/plugin/ActiveQueue.h',
114 'src/plugin/AdblockPlus.def', 115 'src/plugin/AdblockPlus.def',
115 'src/plugin/AdblockPlus.idl', 116 'src/plugin/AdblockPlus.idl',
116 'src/plugin/AdblockPlus.rc', 117 'src/plugin/AdblockPlus.rc',
117 'src/plugin/AdblockPlus.rgs', 118 'src/plugin/AdblockPlus.rgs',
118 'src/plugin/AdblockPlusClient.cpp', 119 'src/plugin/AdblockPlusClient.cpp',
119 'src/plugin/AdblockPlusClient.h', 120 'src/plugin/AdblockPlusClient.h',
120 'src/plugin/AdblockPlusDomTraverser.cpp', 121 'src/plugin/AdblockPlusDomTraverser.cpp',
121 'src/plugin/AdblockPlusDomTraverser.h', 122 'src/plugin/AdblockPlusDomTraverser.h',
122 'src/plugin/AdblockPlusGuids.h', 123 'src/plugin/AdblockPlusGuids.h',
123 'src/plugin/ATL_Deprecate.cpp', 124 'src/plugin/ATL_Deprecate.cpp',
124 'src/plugin/ATL_Deprecate.h', 125 'src/plugin/ATL_Deprecate.h',
125 'src/plugin/Config.h', 126 'src/plugin/Config.h',
126 'src/plugin/NotificationMessage.cpp', 127 'src/plugin/NotificationMessage.cpp',
127 'src/plugin/NotificationMessage.h', 128 'src/plugin/NotificationMessage.h',
129 'src/plugin/Placeholder.h',
128 'src/plugin/Plugin.cpp', 130 'src/plugin/Plugin.cpp',
129 'src/plugin/Plugin.h', 131 'src/plugin/Plugin.h',
130 'src/plugin/PluginClass.cpp', 132 'src/plugin/PluginClass.cpp',
131 'src/plugin/PluginClass.h', 133 'src/plugin/PluginClass.h',
132 'src/plugin/PluginClientBase.cpp',
133 'src/plugin/PluginClientBase.h',
134 'src/plugin/PluginClientFactory.cpp', 134 'src/plugin/PluginClientFactory.cpp',
135 'src/plugin/PluginClientFactory.h', 135 'src/plugin/PluginClientFactory.h',
136 'src/plugin/PluginDebug.cpp', 136 'src/plugin/PluginDebug.cpp',
137 'src/plugin/PluginDebug.h', 137 'src/plugin/PluginDebug.h',
138 'src/plugin/PluginDomTraverserBase.h', 138 'src/plugin/PluginDomTraverserBase.h',
139 'src/plugin/PluginErrorCodes.h', 139 'src/plugin/PluginErrorCodes.h',
140 'src/plugin/PluginFilter.cpp', 140 'src/plugin/PluginFilter.cpp',
141 'src/plugin/PluginFilter.h', 141 'src/plugin/PluginFilter.h',
142 'src/plugin/PluginMimeFilterClient.cpp', 142 'src/plugin/PluginMimeFilterClient.cpp',
143 'src/plugin/PluginMimeFilterClient.h', 143 'src/plugin/PluginMimeFilterClient.h',
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 'src/plugin/PluginUtil.h', 240 'src/plugin/PluginUtil.h',
241 'test/plugin/UtilTest.cpp', 241 'test/plugin/UtilTest.cpp',
242 # 242 #
243 # required only for linking 243 # required only for linking
244 # 244 #
245 'src/plugin/AdblockPlusClient.cpp', 245 'src/plugin/AdblockPlusClient.cpp',
246 'src/plugin/AdblockPlusDomTraverser.cpp', 246 'src/plugin/AdblockPlusDomTraverser.cpp',
247 'src/plugin/ATL_Deprecate.cpp', 247 'src/plugin/ATL_Deprecate.cpp',
248 'src/plugin/NotificationMessage.cpp', 248 'src/plugin/NotificationMessage.cpp',
249 'src/plugin/Plugin.cpp', 249 'src/plugin/Plugin.cpp',
250 'src/plugin/PluginClientBase.cpp',
251 'src/plugin/PluginClientFactory.cpp', 250 'src/plugin/PluginClientFactory.cpp',
252 'src/plugin/PluginClass.cpp', 251 'src/plugin/PluginClass.cpp',
253 'src/plugin/PluginFilter.cpp', 252 'src/plugin/PluginFilter.cpp',
254 'src/plugin/PluginMimeFilterClient.cpp', 253 'src/plugin/PluginMimeFilterClient.cpp',
255 'src/plugin/PluginMutex.cpp', 254 'src/plugin/PluginMutex.cpp',
256 'src/plugin/PluginSettings.cpp', 255 'src/plugin/PluginSettings.cpp',
257 'src/plugin/PluginSystem.cpp', 256 'src/plugin/PluginSystem.cpp',
258 'src/plugin/PluginTabBase.cpp', 257 'src/plugin/PluginTabBase.cpp',
259 'src/plugin/PluginUtil.cpp', 258 'src/plugin/PluginUtil.cpp',
260 'src/plugin/PluginWbPassthrough.cpp', 259 'src/plugin/PluginWbPassthrough.cpp',
(...skipping 18 matching lines...) Expand all
279 '$(ADBLOCKPLUS_ATL)/lib', 278 '$(ADBLOCKPLUS_ATL)/lib',
280 ], 279 ],
281 }, { 280 }, {
282 'AdditionalLibraryDirectories': [ 281 'AdditionalLibraryDirectories': [
283 '$(ADBLOCKPLUS_ATL)/lib/amd64', 282 '$(ADBLOCKPLUS_ATL)/lib/amd64',
284 ], 283 ],
285 } 284 }
286 ]], 285 ]],
287 }, 286 },
288 }, 287 },
289 }] 288 },
289
290 {
291 'target_name': 'tests_plugin_2',
292 'type': 'executable',
293 'dependencies': [
294 'libadblockplus/third_party/googletest.gyp:googletest_main',
295 ],
296 'sources': [
297 'src/plugin/ActiveQueue.h',
298 'src/plugin/Placeholder.h',
299 'test/plugin/ActiveQueueTest.cpp',
300 'test/plugin/PlaceholderTest.cpp',
301 ],
302 'defines': [
303 ],
304 'link_settings': {
305 'libraries': [],
306 },
307 #'msbuild_toolset': 'v140',
Oleksandr 2016/01/28 10:15:33 Nit: Is this some test code commented out? Looks c
Eric 2016/02/04 21:01:43 Not so much test code as needed during development
308 'msvs_settings': {
309 'VCLinkerTool': {
310 'SubSystem': '1', # Console
311 'EntryPointSymbol': 'mainCRTStartup',
312 },
313 },
314 },
315
316 ]
290 } 317 }
OLDNEW
« no previous file with comments | « no previous file | src/plugin/ActiveQueue.h » ('j') | src/plugin/ActiveQueue.h » ('J')

Powered by Google App Engine
This is Rietveld