Side by Side Diff: meson.build
Issue 29581602:
Issue 5141 - [emscripten] Convert filter matcher to C++
Base URL: https://hg.adblockplus.org/adblockpluscore
Patch Set:
Created Oct. 17, 2017, 12:31 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« lib/matcher.js ('K')
|
« lib/matcher.js ('k')
|
test/matcher.js » ('j')
|
test/matcher.js » ('J')
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')
| OLD | NEW |
|---|---|
| 1 project('adblockpluscore', 'cpp', license: ['GPL3']) | 1 project('adblockpluscore', 'cpp', license: ['GPL3']) |
| 2 | 2 |
| 3 # locate emscripten-config | 3 # locate emscripten-config |
| 4 python = import('python3').find_python() | 4 python = import('python3').find_python() |
| 5 emscripten_config = get_option('emscripten-config') | 5 emscripten_config = get_option('emscripten-config') |
| 6 command = run_command(python, '-c', 'import os.path, sys;print(os.path.expanduse r(sys.argv[1]))', emscripten_config) | 6 command = run_command(python, '-c', 'import os.path, sys;print(os.path.expanduse r(sys.argv[1]))', emscripten_config) |
| 7 if command.returncode() != 0 | 7 if command.returncode() != 0 |
| 8 error(command.stderr().strip()) | 8 error(command.stderr().strip()) |
| 9 endif | 9 endif |
| 10 emscripten_config = command.stdout().strip() | 10 emscripten_config = command.stdout().strip() |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 65 'compiled/filter/BlockingFilter.cpp', | 65 'compiled/filter/BlockingFilter.cpp', |
| 66 'compiled/filter/CommentFilter.cpp', | 66 'compiled/filter/CommentFilter.cpp', |
| 67 'compiled/filter/ElemHideBase.cpp', | 67 'compiled/filter/ElemHideBase.cpp', |
| 68 'compiled/filter/ElemHideEmulationFilter.cpp', | 68 'compiled/filter/ElemHideEmulationFilter.cpp', |
| 69 'compiled/filter/ElemHideException.cpp', | 69 'compiled/filter/ElemHideException.cpp', |
| 70 'compiled/filter/ElemHideFilter.cpp', | 70 'compiled/filter/ElemHideFilter.cpp', |
| 71 'compiled/filter/Filter.cpp', | 71 'compiled/filter/Filter.cpp', |
| 72 'compiled/filter/InvalidFilter.cpp', | 72 'compiled/filter/InvalidFilter.cpp', |
| 73 'compiled/filter/RegExpFilter.cpp', | 73 'compiled/filter/RegExpFilter.cpp', |
| 74 'compiled/filter/WhitelistFilter.cpp', | 74 'compiled/filter/WhitelistFilter.cpp', |
| 75 'compiled/matcher/Matcher.cpp', | |
| 75 'compiled/storage/FilterStorage.cpp', | 76 'compiled/storage/FilterStorage.cpp', |
| 76 'compiled/subscription/DownloadableSubscription.cpp', | 77 'compiled/subscription/DownloadableSubscription.cpp', |
| 77 'compiled/subscription/Subscription.cpp', | 78 'compiled/subscription/Subscription.cpp', |
| 78 'compiled/subscription/UserDefinedSubscription.cpp', | 79 'compiled/subscription/UserDefinedSubscription.cpp', |
| 79 ] | 80 ] |
| 80 | 81 |
| 81 defines_args = [] | 82 defines_args = [] |
| 82 foreach define : DEFINES | 83 foreach define : DEFINES |
| 83 defines_args += '-D' + define | 84 defines_args += '-D' + define |
| 84 endforeach | 85 endforeach |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 154 output_file = join_paths(meson.source_root(), 'lib', COMPILER_OUTPUT) | 155 output_file = join_paths(meson.source_root(), 'lib', COMPILER_OUTPUT) |
| 155 compiler_output = custom_target('compiled.js', | 156 compiler_output = custom_target('compiled.js', |
| 156 build_by_default: true, | 157 build_by_default: true, |
| 157 input: core_objects + shared_objects, | 158 input: core_objects + shared_objects, |
| 158 output: COMPILER_OUTPUT, | 159 output: COMPILER_OUTPUT, |
| 159 command: [ | 160 command: [ |
| 160 emcc, '-o', output_file, | 161 emcc, '-o', output_file, |
| 161 '--post-js', bindings_output, | 162 '--post-js', bindings_output, |
| 162 '@INPUT@' | 163 '@INPUT@' |
| 163 ] + compiler_args) | 164 ] + compiler_args) |
| OLD | NEW |
