From 649f2dee6dcaaeb6897b1753ad0a6e14a22b0b9f Mon Sep 17 00:00:00 2001
From: anatoly techtonik <techtonik@gmail.com>
Date: Fri, 16 Nov 2012 16:58:03 +0300
Subject: Ability to run scripts/scons.py directly from source checkout.

---
 src/CHANGES.txt     |  3 +++
 src/script/scons.py | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 2c89d8d..2378ba0 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -6,6 +6,9 @@
 
 RELEASE 2.X.X - 
 
+  From anatoly techtonik:
+    + Ability to run scripts/scons.py directly from source checkout.
+
   From Alexey Klimkin:
     - Fix nested LIBPATH expansion by flattening sequences in subst_path.
 
diff --git a/src/script/scons.py b/src/script/scons.py
index 86d2562..cd8b432 100644
--- a/src/script/scons.py
+++ b/src/script/scons.py
@@ -184,7 +184,15 @@ sys.path = libs + sys.path
 ##############################################################################
 
 if __name__ == "__main__":
-    import SCons.Script
+    try:
+        import SCons.Script
+    except:
+        ROOT = os.path.join(os.path.abspath(os.path.dirname(__file__)), '..', 'engine')
+        if os.path.exists(ROOT):
+            sys.path += [ROOT]
+            print("SCons import failed. Trying to run from source directory")
+        import SCons.Script
+  
     # this does all the work, and calls sys.exit
     # with the proper exit status when done.
     SCons.Script.main()
-- 
cgit v0.12