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: Updated from feedback. now require meson 0.40.0, but no default C++ compiler
Created Oct. 26, 2017, 4:13 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.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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 90 | 90 |
| 91 generation_args = [] | 91 generation_args = [] |
| 92 foreach param : GENERATION_PARAMS | 92 foreach param : GENERATION_PARAMS |
| 93 generation_args += '-s' | 93 generation_args += '-s' |
| 94 generation_args += param[0] + '=' + '@0@'.format(param[1]) | 94 generation_args += param[0] + '=' + '@0@'.format(param[1]) |
| 95 endforeach | 95 endforeach |
| 96 | 96 |
| 97 optional_args = [] | 97 optional_args = [] |
| 98 buildtype = get_option('buildtype') | 98 buildtype = get_option('buildtype') |
| 99 if buildtype.startswith('debug') | 99 if buildtype.startswith('debug') |
| 100 optional_args += '-DDEBUG' | |
| 100 optional_args += '-g3' | 101 optional_args += '-g3' |
| 101 endif | 102 endif |
| 102 tracing = get_option('tracing') | 103 tracing = get_option('tracing') |
| 103 if tracing | 104 if tracing |
| 104 optional_args += '--tracing' | 105 optional_args += '--tracing' |
| 105 endif | 106 endif |
| 106 | 107 |
| 107 compiler_args = defines_args + generation_args + ADDITIONAL_PARAMS | 108 compiler_args = defines_args + generation_args + ADDITIONAL_PARAMS |
| 108 | 109 |
| 109 # build objects. | 110 # build objects. |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 157 build_by_default: true, | 158 build_by_default: true, |
| 158 input: core_objects + shared_objects, | 159 input: core_objects + shared_objects, |
| 159 output: COMPILER_OUTPUT, | 160 output: COMPILER_OUTPUT, |
| 160 depend_files: [ JS_LIBRARY ], | 161 depend_files: [ JS_LIBRARY ], |
| 161 command: [ | 162 command: [ |
| 162 emcc, '-o', output_file, | 163 emcc, '-o', output_file, |
| 163 '--post-js', bindings_output, | 164 '--post-js', bindings_output, |
| 164 '--js-library', JS_LIBRARY, | 165 '--js-library', JS_LIBRARY, |
| 165 '@INPUT@' | 166 '@INPUT@' |
| 166 ] + 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')
