Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1363655 - part 1 - clarify the required values for stylo bindgen options; r=rillian

Browse Source 
--with-libclang-path is supposed to be a directory, and
--with-clang-path is supposed to be a file, but it was easy to pass a
directory for the latter, and it was easy to misinterpret the
documentation for --with-libclang-path as pointing to one of the
libraries themselves.  Clearer documentation and additional checks
should help with this situation.
This commit is contained in:
Nathan Froyd 2017-06-21 13:28:37 -04:00
parent b28fcc5c4b
commit dbd4e424b9
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
toolkit/moz.configure
View File

@ -659,9 +659,9 @@ option('--disable-stylo-build-bindgen',
help='Enable build-time bindgen for Stylo')
option('--with-libclang-path', nargs=1,
help='Absolute path to Clang/LLVM libraries for Stylo (version 3.9.x')
help='Absolute path to a directory containing Clang/LLVM libraries for Stylo (version 3.9.x or above)')
option('--with-clang-path', nargs=1,
help='Absolute path to a Clang binary for Stylo bindgen (version 3.9.x)')
help='Absolute path to a Clang binary for Stylo bindgen (version 3.9.x or above)')
def invoke_llvm_config(llvm_config, *options):
'''Invoke llvm_config with the given options and return the first line of
@ -687,6 +687,7 @@ def check_minimum_llvm_config_version(llvm_config):
@depends(stylo_config, '--enable-stylo-build-bindgen',
llvm_config, '--with-libclang-path', '--with-clang-path',
host)
@imports('os.path')
@imports(_from='textwrap', _import='dedent')
def bindgen_config_paths(stylo_config, bindgen_enabled,
llvm_config, libclang_path, clang_path,
@ -717,6 +718,18 @@ def bindgen_config_paths(stylo_config, bindgen_enabled,
You must provide both of --with-libclang-path and --with-clang-path
or neither of them.'''))
if not os.path.exists(libclang_path) or \
not os.path.isdir(libclang_path):
die(dedent('''\
The argument to --with-libclang-path is not a directory: {}
'''.format(libclang_path)))
if not os.path.exists(clang_path) or \
not os.path.isfile(clang_path):
die(dedent('''\
The argument to --with-clang-path is not a file: {}
'''.format(clang_path)))
return namespace(
libclang_path=libclang_path[0],
clang_path=clang_path[0],