From d7aa5c73f0d99fb0701452b5a3b824ba7eac8ca6 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Fri, 7 Jun 2019 09:01:21 +0200
Subject: Update waf
---
.gitattributes | 1 -
waf | 15 +++++++++++++--
waflib | 2 +-
3 files changed, 14 insertions(+), 4 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()
diff --git a/waflib b/waflib
index 2314e236..2f225134 160000
--- a/waflib
+++ b/waflib
@@ -1 +1 @@
-Subproject commit 2314e236ca6e7d94a26c3c17091da0f25f5867f3
+Subproject commit 2f22513494d9c5092254c428eb487510d81a7857
--
cgit v1.2.1