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

Delta Between Two Patch Sets: adblockplus.gyp

Issue 5316782940225536: Issue 1557 - Update to the recent libadblockplus to reduce additional updates in the logic later. (Closed)
Left Patch Set: fix according to the comments Created Jan. 28, 2015, 1:22 p.m.
Right Patch Set: rebase and remove member of CFilter Created Feb. 4, 2015, 12:50 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 | « .hgsubstate ('k') | src/engine/Main.cpp » ('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': ['defaults.gypi'], 2 'includes': ['defaults.gypi'],
3 3
4 'variables': { 4 'variables': {
5 'build_type%': 'devbuild', 5 'build_type%': 'devbuild',
6 'build_version%': '', 6 'build_version%': '',
7 }, 7 },
8 8
9 'target_defaults': { 9 'target_defaults': {
10 'conditions': [ 10 'conditions': [
(...skipping 24 matching lines...) Expand all
35 'type': 'static_library', 35 'type': 'static_library',
36 'sources': [ 36 'sources': [
37 'src/shared/AutoHandle.cpp', 37 'src/shared/AutoHandle.cpp',
38 'src/shared/Communication.cpp', 38 'src/shared/Communication.cpp',
39 'src/shared/Dictionary.cpp', 39 'src/shared/Dictionary.cpp',
40 'src/shared/Utils.cpp', 40 'src/shared/Utils.cpp',
41 'src/shared/Registry.h', 41 'src/shared/Registry.h',
42 'src/shared/Registry.cpp', 42 'src/shared/Registry.cpp',
43 'src/shared/IE_version.h', 43 'src/shared/IE_version.h',
44 'src/shared/IE_version.cpp', 44 'src/shared/IE_version.cpp',
45 'src/shared/ContentType.h', 45 ]
46 'src/shared/ContentType.cpp',
47 ],
48 'include_dirs': [
49 'libadblockplus/include',
50 ],
51 'direct_dependent_settings':
52 {
53 'include_dirs': [
54 'libadblockplus/include',
55 ],
56 },
57 }, 46 },
58 47
59 { 48 {
60 'target_name': 'AdblockPlusEngine', 49 'target_name': 'AdblockPlusEngine',
61 'type': 'executable', 50 'type': 'executable',
62 'dependencies': [ 51 'dependencies': [
63 'shared', 52 'shared',
64 'libadblockplus/libadblockplus.gyp:libadblockplus', 53 'libadblockplus/libadblockplus.gyp:libadblockplus',
65 ], 54 ],
66 'sources': [ 55 'sources': [
(...skipping 15 matching lines...) Expand all
82 'VCLinkerTool': { 71 'VCLinkerTool': {
83 'DelayLoadDLLs': ['Shell32.dll'], 72 'DelayLoadDLLs': ['Shell32.dll'],
84 }, 73 },
85 }, 74 },
86 }, 75 },
87 76
88 { 77 {
89 'target_name': 'AdblockPlus', 78 'target_name': 'AdblockPlus',
90 'type': 'shared_library', 79 'type': 'shared_library',
91 'dependencies': [ 80 'dependencies': [
92 'shared' 81 'shared',
82 'libadblockplus/libadblockplus.gyp:libadblockplus',
93 ], 83 ],
94 'sources': [ 84 'sources': [
95 'src/plugin/abp.h', 85 'src/plugin/abp.h',
96 'src/plugin/AdblockPlus.def', 86 'src/plugin/AdblockPlus.def',
97 'src/plugin/AdblockPlus.idl', 87 'src/plugin/AdblockPlus.idl',
98 'src/plugin/AdblockPlus.rc', 88 'src/plugin/AdblockPlus.rc',
99 'src/plugin/AdblockPlus.rgs', 89 'src/plugin/AdblockPlus.rgs',
100 'src/plugin/AdblockPlusClient.cpp', 90 'src/plugin/AdblockPlusClient.cpp',
101 'src/plugin/AdblockPlusClient.h', 91 'src/plugin/AdblockPlusClient.h',
102 'src/plugin/AdblockPlusDomTraverser.cpp', 92 'src/plugin/AdblockPlusDomTraverser.cpp',
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 'target_name': 'tests', 204 'target_name': 'tests',
215 'type': 'executable', 205 'type': 'executable',
216 'dependencies': [ 206 'dependencies': [
217 'shared', 207 'shared',
218 'libadblockplus/third_party/googletest.gyp:googletest_main', 208 'libadblockplus/third_party/googletest.gyp:googletest_main',
219 ], 209 ],
220 'sources': [ 210 'sources': [
221 'test/CommunicationTest.cpp', 211 'test/CommunicationTest.cpp',
222 'test/DictionaryTest.cpp', 212 'test/DictionaryTest.cpp',
223 'test/RegistryTest.cpp', 213 'test/RegistryTest.cpp',
214 'test/UtilTest.cpp',
224 ], 215 ],
225 'defines': ['WINVER=0x0501'], 216 'defines': ['WINVER=0x0501'],
226 'link_settings': { 217 'link_settings': {
227 'libraries': ['-ladvapi32', '-lshell32', '-lole32'], 218 'libraries': ['-ladvapi32', '-lshell32', '-lole32'],
228 }, 219 },
229 'msvs_settings': { 220 'msvs_settings': {
230 'VCLinkerTool': { 221 'VCLinkerTool': {
231 'SubSystem': '1', # Console 222 'SubSystem': '1', # Console
232 'EntryPointSymbol': 'mainCRTStartup', 223 'EntryPointSymbol': 'mainCRTStartup',
233 }, 224 },
234 }, 225 },
235 }, 226 },
236 227
237 { 228 {
238 'target_name': 'tests_plugin', 229 'target_name': 'tests_plugin',
239 'type': 'executable', 230 'type': 'executable',
240 'dependencies': [ 231 'dependencies': [
241 'shared', 232 'shared',
233 'libadblockplus/libadblockplus.gyp:libadblockplus',
242 'libadblockplus/third_party/googletest.gyp:googletest_main', 234 'libadblockplus/third_party/googletest.gyp:googletest_main',
243 ], 235 ],
244 'sources': [ 236 'sources': [
245 'src/plugin/PluginUserSettings.cpp', 237 'src/plugin/PluginUserSettings.cpp',
246 'src/plugin/PluginUserSettings.h', 238 'src/plugin/PluginUserSettings.h',
247 'test/plugin/UserSettingsTest.cpp', 239 'test/plugin/UserSettingsTest.cpp',
248 # 240 #
249 # required only for linking 241 # required only for linking
250 # 242 #
251 'src/plugin/AdblockPlusClient.cpp', 243 'src/plugin/AdblockPlusClient.cpp',
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 'Release': { 302 'Release': {
311 'msvs_settings': { 303 'msvs_settings': {
312 'VCLinkerTool': { 304 'VCLinkerTool': {
313 'AdditionalDependencies': ['atls.lib'], 305 'AdditionalDependencies': ['atls.lib'],
314 }, 306 },
315 }, 307 },
316 }, 308 },
317 }, 309 },
318 }] 310 }]
319 } 311 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld