From 96840d3fc46ec6531a3c5b53eee1c0713723f9a7 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 9 Feb 2020 12:57:43 +0100 Subject: Update waf script to print an error when submodules are not set up --- .gitattributes | 1 - waf | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) delete mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index f063da37..00000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -waf binary \ No newline at end of file diff --git a/waf b/waf index e22930a6..887215c7 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