Fill in the -v option.

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

diff --git a/src/scons.py b/src/scons.py
index 49f8deca23691e9fabacda02fa030cec6a10212e..7f86d1528b34d558014e7a95aceb770dbfab48be 100644 (file)
--- a/src/scons.py
+++ b/src/scons.py
@@ -1,4 +1,9 @@
 #! /usr/bin/env python
+#
+# SCons
+#
+
+__revision__ = "scons.py __REVISION__ __DATE__ __DEVELOPER__"
 
 import getopt
 import os.path
@@ -363,7 +368,12 @@ Option(func = opt_not_yet, future = 1,
        short = 'u', long = ['up', 'search-up'],
        help = "Search up directory tree for SConstruct.")
 
-Option(func = opt_not_yet,
+def option_v(opt, arg):
+    print "SCons version __VERSION__, by Steven Knight et al."
+    print "Copyright 2001 Steven Knight"
+    sys.exit(0)
+
+Option(func = option_v,
        short = 'v', long = ['version'],
        help = "Print the SCons version number and exit.")
 
@@ -483,6 +493,8 @@ def main():
 if __name__ == "__main__":
     try:
         main()
+    except SystemExit:
+        pass
     except KeyboardInterrupt:
         print "Build interrupted."
     except SyntaxError, e:

diff --git a/test/option-v.py b/test/option-v.py
index 6e7ca07e923f655eca055cc9c3ceb4d90f23cee2..02b8f2c81e3ea85fcb20345dac2f78413ac178b2 100644 (file)
--- a/test/option-v.py
+++ b/test/option-v.py
@@ -14,13 +14,17 @@ test.write('SConstruct', "")
 
 test.run(chdir = '.', arguments = '-v')
 
-test.fail_test(test.stderr() !=
-               "Warning:  the -v option is not yet implemented\n")
+expect = r"""SCons version \S+, by Steven Knight et al.
+Copyright 2001 Steven Knight
+"""
+
+test.fail_test(not test.match_re(test.stdout(), expect))
+test.fail_test(test.stderr() != "")
 
 test.run(chdir = '.', arguments = '--version')
 
-test.fail_test(test.stderr() !=
-               "Warning:  the --version option is not yet implemented\n")
+test.fail_test(not test.match_re(test.stdout(), expect))
+test.fail_test(test.stderr() != "")
 
 test.pass_test()