Commits

garyo  committed 66f8b71 Merge

Merge pull request #51 from Anatoly Techtonik; allow running scripts/scons.py from source dir

  • Participants
  • Parent commits fa90e7f, a917420

Comments (0)

Files changed (2)

File src/CHANGES.txt

 
 RELEASE 2.X.X - 
 
+  From Anatoly Techtonik:
+    - Added ability to run scripts/scons.py directly from source checkout
+
   From Juan Lang:
     - Fix WiX Tool to use .wixobj rather than .wxiobj for compiler output
 

File src/script/scons.py

 ##############################################################################
 
 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()