Delta Between Two Patch Sets: meson.build
Issue 29527808:
Noissue - Use meson to build the C++ code (Closed)
Base URL: https://hg.adblockplus.org/adblockpluscore/
Left Patch Set: Pin meson version. Deprecate compile
Created Dec. 13, 2017, 5:09 p.m.
Right Patch Set: Removed compile. meson > 0.40.0
Created Dec. 15, 2017, 5:37 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« compile ('k')
|
meson_options.txt » ('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 |
|---|---|
| 1 project('adblockpluscore', license: ['GPL3'], meson_version: '0.43.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() |
| 11 message('Emscripten config file: ' + emscripten_config) | 11 message('Emscripten config file: ' + emscripten_config) |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 158 build_by_default: true, | 158 build_by_default: true, |
| 159 input: core_objects + shared_objects, | 159 input: core_objects + shared_objects, |
| 160 output: COMPILER_OUTPUT, | 160 output: COMPILER_OUTPUT, |
| 161 depend_files: [ JS_LIBRARY ], | 161 depend_files: [ JS_LIBRARY ], |
| 162 command: [ | 162 command: [ |
| 163 emcc, '-o', output_file, | 163 emcc, '-o', output_file, |
| 164 '--post-js', bindings_output, | 164 '--post-js', bindings_output, |
| 165 '--js-library', JS_LIBRARY, | 165 '--js-library', JS_LIBRARY, |
| 166 '@INPUT@' | 166 '@INPUT@' |
| 167 ] + compiler_args + optional_args) | 167 ] + compiler_args + optional_args) |
| LEFT | RIGHT |
« compile ('k')
|
meson_options.txt » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
