From 6ada17c4327a26a48c009bc04cc80fedb8384496 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 9 Apr 2020 12:43:21 +0200 Subject: Upgrade to waf 2.0.19 --- NEWS | 4 ++-- waf | 17 ++++++++++++++--- waflib | 2 +- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index 4abfd45..d426389 100644 --- a/NEWS +++ b/NEWS @@ -18,9 +18,9 @@ ganv (1.4.3) unstable; * Fix size of vertical flow modules. * Fix compilation with --no-fdgl (patch from Vlad Glagolev). * Fix crash when destroying canvas. - * Upgrade to waf 1.8.14 + * Upgrade to waf 2.0.19 - -- David Robillard Fri, 14 Oct 2016 18:55:26 -0400 + -- David Robillard Thu, 09 Apr 2020 12:42:58 +0200 ganv (1.4.2) stable; diff --git a/waf b/waf index e22930a..58d14c3 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) + project_path = os.path.dirname(os.path.realpath(script_path)) Scripting.waf_entry_point(os.getcwd(), Context.WAFVERSION, project_path) + if __name__ == '__main__': main() diff --git a/waflib b/waflib index de76b89..f0bc333 160000 --- a/waflib +++ b/waflib @@ -1 +1 @@ -Subproject commit de76b89dc1039e2f7d6c6b229a8950156b0e5c94 +Subproject commit f0bc33348b833b26697df5ba8cd1f9bf5dd9b3c4 -- cgit v1.2.1