Delta Between Two Patch Sets: meson.build
Issue 29548581:
Issue 4128, 5138 - Add Parser and Serializer implemented in C++
Base URL: https://github.com/adblockplus/adblockpluscore.git
Left Patch Set:
Created Sept. 18, 2017, 5:23 p.m.
Right Patch Set: rebase
Created March 7, 2018, 12:01 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« lib/filterStorage.js ('k')
|
test/_test-utils.js » ('j')
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| (no file at all) | |
| 1 project('adblockpluscore', 'cpp', license: ['GPL3'], meson_version: '>0.40.0') | 1 project('adblockpluscore', 'cpp', license: ['GPL3'], meson_version: '>0.40.0') |
| 2 | 2 |
| 3 native = get_option('native') | 3 native = get_option('native') |
| 4 if native | 4 if native |
| 5 target_type='native' | 5 target_type='native' |
| 6 else | 6 else |
| 7 target_type='js' | 7 target_type='js' |
| 8 endif | 8 endif |
| 9 asan = get_option('asan') | 9 asan = get_option('asan') |
| 10 | 10 |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 94 'compiled/filter/CommentFilter.cpp', | 94 'compiled/filter/CommentFilter.cpp', |
| 95 'compiled/filter/ElemHideBase.cpp', | 95 'compiled/filter/ElemHideBase.cpp', |
| 96 'compiled/filter/ElemHideEmulationFilter.cpp', | 96 'compiled/filter/ElemHideEmulationFilter.cpp', |
| 97 'compiled/filter/ElemHideException.cpp', | 97 'compiled/filter/ElemHideException.cpp', |
| 98 'compiled/filter/ElemHideFilter.cpp', | 98 'compiled/filter/ElemHideFilter.cpp', |
| 99 'compiled/filter/Filter.cpp', | 99 'compiled/filter/Filter.cpp', |
| 100 'compiled/filter/InvalidFilter.cpp', | 100 'compiled/filter/InvalidFilter.cpp', |
| 101 'compiled/filter/RegExpFilter.cpp', | 101 'compiled/filter/RegExpFilter.cpp', |
| 102 'compiled/filter/WhitelistFilter.cpp', | 102 'compiled/filter/WhitelistFilter.cpp', |
| 103 'compiled/storage/FilterStorage.cpp', | 103 'compiled/storage/FilterStorage.cpp', |
| 104 'compiled/storage/Parser.cpp', | |
| 105 'compiled/storage/Serializer.cpp', | |
| 104 'compiled/subscription/DownloadableSubscription.cpp', | 106 'compiled/subscription/DownloadableSubscription.cpp', |
| 105 'compiled/subscription/Subscription.cpp', | 107 'compiled/subscription/Subscription.cpp', |
| 106 'compiled/subscription/UserDefinedSubscription.cpp', | 108 'compiled/subscription/UserDefinedSubscription.cpp', |
| 107 'compiled/ElemHide.cpp', | 109 'compiled/ElemHide.cpp', |
| 108 'compiled/ElemHideEmulation.cpp', | 110 'compiled/ElemHideEmulation.cpp', |
| 109 ] | 111 ] |
| 110 # sources specific to core | 112 # sources specific to core |
| 111 core_sources = [ | 113 core_sources = [ |
| 112 'compiled/traceInit.cpp', | 114 'compiled/traceInit.cpp', |
| 113 ] | 115 ] |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 244 ], | 246 ], |
| 245 cpp_args: GTEST_PARAMS) | 247 cpp_args: GTEST_PARAMS) |
| 246 abptest = executable('abptest', test_sources, | 248 abptest = executable('abptest', test_sources, |
| 247 cpp_args: compiler_args + ['-DINSIDE_TESTS'], | 249 cpp_args: compiler_args + ['-DINSIDE_TESTS'], |
| 248 include_directories: include_directories(join_paths(GTEST _DIR, 'include')), | 250 include_directories: include_directories(join_paths(GTEST _DIR, 'include')), |
| 249 link_args: LINK_PARAMS, | 251 link_args: LINK_PARAMS, |
| 250 link_with: [ adblockpluscore, gtest ]) | 252 link_with: [ adblockpluscore, gtest ]) |
| 251 test('abptest', abptest) | 253 test('abptest', abptest) |
| 252 endif | 254 endif |
| 253 | 255 |
| LEFT | RIGHT |
« lib/filterStorage.js ('k')
|
test/_test-utils.js » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
