diff options
-rw-r--r-- | .gitattributes | 1 | ||||
-rwxr-xr-x | waf | 15 | ||||
m--------- | waflib | 0 |
3 files changed, 13 insertions, 3 deletions
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 @@ -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() diff --git a/waflib b/waflib -Subproject 2314e236ca6e7d94a26c3c17091da0f25f5867f +Subproject 2f22513494d9c5092254c428eb487510d81a785 |