From b92b7168d43cd0a72eceb877254bdd7ec4218b96 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 6 Jun 2019 21:23:13 +0200 Subject: Print friendly error message when waflib submodule is missing --- waf | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'waf') diff --git a/waf b/waf index e22930a..887215c 100755 --- a/waf +++ b/waf @@ -2,15 +2,26 @@ # Minimal waf script for projects that include waflib directly -from waflib import Context, Scripting - +import sys import inspect import os +try: + from waflib import Context, Scripting +except Exception as e: + sys.stderr.write('error: Failed to import waf (%s)\n' % e) + if os.path.exists('.git'): + sys.stderr.write("Are submodules up to date? " + "Try 'git submodule update --init --recursive'\n") + + sys.exit(1) + + def main(): script_path = os.path.abspath(inspect.getfile(inspect.getmodule(main))) project_path = os.path.dirname(script_path) Scripting.waf_entry_point(os.getcwd(), Context.WAFVERSION, project_path) + if __name__ == '__main__': main() -- cgit v1.2.1