Make SCONS_LIB_DIR actually work

git-svn-id: http://scons.tigris.org/svn/scons/trunk@160 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 487719df2b586ae4efa115c82db643d50e57ac71..23a7da7bd16dd3ed199845acdfdc3a5b093383b5 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -21,6 +21,8 @@ RELEASE 0.02 -
 
   - Documented CXXFLAGS, CXXCOM, and CPPPATH (courtesy Anthony Roach).
 
+  - Fixed SCONS_LIB_DIR to work as documented (courtesy Anthony Roach).
+
 
 
 RELEASE 0.01 - Thu Dec 13 19:25:23 CST 2001

diff --git a/src/script/scons.py b/src/script/scons.py
index 0f4eb0b18018c2c0ca96b42deee339ab8a05e523..9929c8f2b66cf61cb4f569fd472dd5ca82e5081c 100644 (file)
--- a/src/script/scons.py
+++ b/src/script/scons.py
@@ -40,7 +40,7 @@ import os
 libs = []
 
 if os.environ.has_key("SCONS_LIB_DIR"):
-    libs.append = os.environ["SCONS_LIB_DIR"]
+    libs.append(os.environ["SCONS_LIB_DIR"])
 
 if sys.platform == 'win32':
     libs.extend([ os.path.join(sys.prefix, 'SCons-__VERSION__'),

diff --git a/test/SCONS_LIB_DIR.py b/test/SCONS_LIB_DIR.py
new file mode 100644 (file)
index 0000000..7bc8322
--- /dev/null
+++ b/test/SCONS_LIB_DIR.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2001 Steven Knight
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "test/SCONS_LIB_DIR.py __REVISION__ __DATE__ __DEVELOPER__"
+
+import TestSCons
+import os
+import string
+
+test = TestSCons.TestSCons()
+
+test.subdir('SCons')
+test.write(['SCons','Script.py'], """
+def main ():
+    print "SCons.Script"
+""")
+
+test.write(['SCons','__init__.py'], """
+""")
+
+
+expect = "SCons.Script\n"
+
+os.environ['SCONS_LIB_DIR'] = test.workpath()
+
+test.run(stdout = expect)
+
+test.pass_test()
+