From da37dfb7a94bf4ed168bfe5cf55f40b09d8256da Mon Sep 17 00:00:00 2001
From: Adriano Scoditti <adriano.scoditti@arm.com>
Date: Wed, 26 Jun 2019 11:49:07 +0200
Subject: [PATCH] Adds script section to install waf-light bin and make it look
 for waflib in PYTHONPATH

---
 setup.py  |  1 +
 waf-light | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 83e94df3..510d448e 100644
--- a/setup.py
+++ b/setup.py
@@ -14,6 +14,7 @@ setuptools.setup(
     long_description_content_type="text/markdown",
     url="https://gitlab.com/ita1024/waf",
     packages=['waflib', 'waflib/Tools', 'waflib/extras'],
+    scripts=['waf-light'],
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: MIT License",
diff --git a/waf-light b/waf-light
index 8c50d0b1..1562d957 100755
--- a/waf-light
+++ b/waf-light
@@ -130,6 +130,15 @@ def test(dir):
 	except OSError:
 		pass
 
+def test_syspath():
+	for dir in sys.path:
+		try:
+			os.stat(join(dir, 'waflib'))
+			return True
+		except OSError:
+			pass
+	return False
+
 def find_lib():
 	src = os.path.abspath(inspect.getfile(inspect.getmodule(err)))
 	base, name = os.path.split(src)
@@ -142,6 +151,7 @@ def find_lib():
 	if name.endswith('waf-light'):
 		w = test(base)
 		if w: return w
+		if test_syspath(): return None
 		err('waf-light requires waflib -> export WAFDIR=/folder')
 
 	dirname = '%s-%s-%s' % (WAF, VERSION, REVISION)
@@ -159,7 +169,8 @@ def find_lib():
 	return dir
 
 wafdir = find_lib()
-sys.path.insert(0, wafdir)
+if wafdir is not None:
+	sys.path.insert(0, wafdir)
 
 if __name__ == '__main__':
 	#import waflib.extras.compat15#PRELUDE