Side by Side Diff: meson.build
Issue 29587914:
Issue 5142 - Convert Element Hiding to C++ (Closed)
Base URL: https://hg.adblockplus.org/adblockpluscore/
Patch Set: Rebased on master.
Created Dec. 5, 2017, 6:01 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« compiled/bindings/main.cpp ('K')
|
« lib/elemHide.js ('k')
|
test/elemHideEmulation.js » ('j')
|
no next file with comments »
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', license: ['GPL3'], meson_version: '>0.40.0') | 1 project('adblockpluscore', license: ['GPL3'], meson_version: '>0.40.0') |
| 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/ElemHideException.cpp', | 65 'compiled/filter/ElemHideException.cpp', |
| 66 'compiled/filter/ElemHideFilter.cpp', | 66 'compiled/filter/ElemHideFilter.cpp', |
| 67 'compiled/filter/Filter.cpp', | 67 'compiled/filter/Filter.cpp', |
| 68 'compiled/filter/InvalidFilter.cpp', | 68 'compiled/filter/InvalidFilter.cpp', |
| 69 'compiled/filter/RegExpFilter.cpp', | 69 'compiled/filter/RegExpFilter.cpp', |
| 70 'compiled/filter/WhitelistFilter.cpp', | 70 'compiled/filter/WhitelistFilter.cpp', |
| 71 'compiled/storage/FilterStorage.cpp', | 71 'compiled/storage/FilterStorage.cpp', |
| 72 'compiled/subscription/DownloadableSubscription.cpp', | 72 'compiled/subscription/DownloadableSubscription.cpp', |
| 73 'compiled/subscription/Subscription.cpp', | 73 'compiled/subscription/Subscription.cpp', |
| 74 'compiled/subscription/UserDefinedSubscription.cpp', | 74 'compiled/subscription/UserDefinedSubscription.cpp', |
| 75 'compiled/ElemHide.cpp', | |
| 75 ] | 76 ] |
| 76 # sources specific to core | 77 # sources specific to core |
| 77 core_sources = [ | 78 core_sources = [ |
| 78 'compiled/traceInit.cpp', | 79 'compiled/traceInit.cpp', |
| 79 ] | 80 ] |
| 80 # sources for the bindings generator | 81 # sources for the bindings generator |
| 81 bindings_sources = [ | 82 bindings_sources = [ |
| 82 'compiled/bindings/generator.cpp', | 83 'compiled/bindings/generator.cpp', |
| 83 'compiled/bindings/main.cpp', | 84 'compiled/bindings/main.cpp', |
| 84 ] | 85 ] |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 158 build_by_default: true, | 159 build_by_default: true, |
| 159 input: core_objects + shared_objects, | 160 input: core_objects + shared_objects, |
| 160 output: COMPILER_OUTPUT, | 161 output: COMPILER_OUTPUT, |
| 161 depend_files: [ JS_LIBRARY ], | 162 depend_files: [ JS_LIBRARY ], |
| 162 command: [ | 163 command: [ |
| 163 emcc, '-o', output_file, | 164 emcc, '-o', output_file, |
| 164 '--post-js', bindings_output, | 165 '--post-js', bindings_output, |
| 165 '--js-library', JS_LIBRARY, | 166 '--js-library', JS_LIBRARY, |
| 166 '@INPUT@' | 167 '@INPUT@' |
| 167 ] + compiler_args + optional_args) | 168 ] + compiler_args + optional_args) |
| OLD | NEW |
« compiled/bindings/main.cpp ('K')
|
« lib/elemHide.js ('k')
|
test/elemHideEmulation.js » ('j')
|
no next file with comments »
