From: stevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Mon, 17 Sep 2001 14:21:15 +0000 (+0000)
Subject: Add automatic substitution on filename lines.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=deac0d262e1150c95730ca552848d07782702a6e;p=scons.git

Add automatic substitution on filename lines.


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

diff --git a/Construct b/Construct
index a7e6a77e..558eb3c1 100644
--- a/Construct
+++ b/Construct
@@ -100,6 +100,7 @@ $env = new cons( ENV => {
 				   # changes don't cause rebuilds.
 		 SEDFLAGS	=> " %( -e 's+__DATE__+%DATE+' %)" .
 				   " -e 's+__DEVELOPER__+%DEVELOPER+'" .
+				   " -e 's+__FILE__+%<+'" .
 				   " -e 's+__REVISION__+%REVISION+'" .
 				   " -e 's+__VERSION__+%VERSION+'",
 		 SEDCOM		=> "%SED %SEDFLAGS %< > %>",
diff --git a/etc/Conscript b/etc/Conscript
index c1a79424..3f030a75 100644
--- a/etc/Conscript
+++ b/etc/Conscript
@@ -8,4 +8,7 @@ Import qw( env );
 
 @modules = qw(TestCmd.py TestSCons.py unittest.py);
 
-$env->Install($env->{TEST_LIB_DIR}, @modules);
+foreach $module (@modules) {
+    $env->Command(File::Spec->catfile($env->{TEST_LIB_DIR}, $module),
+		  $module, "%SEDCOM");
+}
diff --git a/etc/TestSCons.py b/etc/TestSCons.py
index dcd462a0..41a0ef0e 100644
--- a/etc/TestSCons.py
+++ b/etc/TestSCons.py
@@ -13,7 +13,7 @@ or attributes defined in this subclass.
 
 # Copyright 2001 Steven Knight
 
-__revision__ = "TestSCons.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import TestCmd
diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py
index f1ab1007..6dda645d 100644
--- a/src/engine/SCons/Builder.py
+++ b/src/engine/SCons/Builder.py
@@ -4,7 +4,7 @@ XXX
 
 """
 
-__revision__ = "Builder.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 
 
diff --git a/src/engine/SCons/BuilderTests.py b/src/engine/SCons/BuilderTests.py
index 67435bc0..e19b389b 100644
--- a/src/engine/SCons/BuilderTests.py
+++ b/src/engine/SCons/BuilderTests.py
@@ -1,4 +1,4 @@
-__revision__ = "BuilderTests.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import sys
 import unittest
diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py
index 56a15f75..7b5e83da 100644
--- a/src/engine/SCons/Defaults.py
+++ b/src/engine/SCons/Defaults.py
@@ -6,7 +6,7 @@ installation procedure or use something like qmconf.
 
 """
 
-__revision__ = "local.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 
 
diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py
index a3fe27a4..a7e02a24 100644
--- a/src/engine/SCons/Environment.py
+++ b/src/engine/SCons/Environment.py
@@ -4,7 +4,7 @@ XXX
 
 """
 
-__revision__ = "Environment.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 
 
diff --git a/src/engine/SCons/EnvironmentTests.py b/src/engine/SCons/EnvironmentTests.py
index 6ac4cb72..885e3654 100644
--- a/src/engine/SCons/EnvironmentTests.py
+++ b/src/engine/SCons/EnvironmentTests.py
@@ -1,4 +1,4 @@
-__revision__ = "EnvironmentTests.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import sys
 import unittest
diff --git a/src/engine/SCons/Errors.py b/src/engine/SCons/Errors.py
index 52facf76..ac438375 100644
--- a/src/engine/SCons/Errors.py
+++ b/src/engine/SCons/Errors.py
@@ -5,7 +5,7 @@ and user errors in SCons.
 
 """
 
-__revision__ = "Errors.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 
 
diff --git a/src/engine/SCons/ErrorsTests.py b/src/engine/SCons/ErrorsTests.py
index 911b11b9..d39a2870 100644
--- a/src/engine/SCons/ErrorsTests.py
+++ b/src/engine/SCons/ErrorsTests.py
@@ -1,4 +1,4 @@
-__revision__ = "ErrorsTests.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import sys
 import unittest
diff --git a/src/engine/SCons/Job.py b/src/engine/SCons/Job.py
index aa9d92a4..26031ff1 100644
--- a/src/engine/SCons/Job.py
+++ b/src/engine/SCons/Job.py
@@ -6,7 +6,7 @@ stop, and wait on jobs.
 
 """
 
-__revision__ = "Job.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 class Jobs:
     """An instance of this class initializes N jobs, and provides
diff --git a/src/engine/SCons/JobTests.py b/src/engine/SCons/JobTests.py
index ec4c46d5..f2189eba 100644
--- a/src/engine/SCons/JobTests.py
+++ b/src/engine/SCons/JobTests.py
@@ -1,4 +1,4 @@
-__revision__ = "JobTests.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import unittest
 import random
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index e7956c2d..2d1c8ea7 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -4,7 +4,7 @@ File system nodes.
 
 """
 
-__revision__ = "Node/FS.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 
 
diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py
index aa8cf2a5..24785dac 100644
--- a/src/engine/SCons/Node/FSTests.py
+++ b/src/engine/SCons/Node/FSTests.py
@@ -1,4 +1,4 @@
-__revision__ = "Node/FSTests.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import sys
diff --git a/src/engine/SCons/Node/NodeTests.py b/src/engine/SCons/Node/NodeTests.py
index 2249a963..7e5afb03 100644
--- a/src/engine/SCons/Node/NodeTests.py
+++ b/src/engine/SCons/Node/NodeTests.py
@@ -1,4 +1,4 @@
-__revision__ = "Node/NodeTests.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os
 import sys
diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py
index fb77c652..6da15b6a 100644
--- a/src/engine/SCons/Node/__init__.py
+++ b/src/engine/SCons/Node/__init__.py
@@ -4,7 +4,7 @@ The Node package for the SCons software construction utility.
 
 """
 
-__revision__ = "Node/__init__.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 
 
diff --git a/src/engine/SCons/Scanner/C.py b/src/engine/SCons/Scanner/C.py
index ce6f9c62..5afecc2c 100644
--- a/src/engine/SCons/Scanner/C.py
+++ b/src/engine/SCons/Scanner/C.py
@@ -4,7 +4,7 @@ This module implements the depenency scanner for C/C++ code.
 
 """
 
-__revision__ = "Scanner/C.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 
 import SCons.Scanner
diff --git a/src/engine/SCons/Scanner/CTests.py b/src/engine/SCons/Scanner/CTests.py
index 6a851206..7623362f 100644
--- a/src/engine/SCons/Scanner/CTests.py
+++ b/src/engine/SCons/Scanner/CTests.py
@@ -1,4 +1,4 @@
-__revision__ = "Scanner/CTests.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestCmd
 import SCons.Scanner.C
diff --git a/src/engine/SCons/Scanner/ScannerTests.py b/src/engine/SCons/Scanner/ScannerTests.py
index 9c7163dc..64b169e0 100644
--- a/src/engine/SCons/Scanner/ScannerTests.py
+++ b/src/engine/SCons/Scanner/ScannerTests.py
@@ -1,4 +1,4 @@
-__revision__ = "Scanner/ScannerTests.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import unittest
 import SCons.Scanner
diff --git a/src/engine/SCons/Scanner/__init__.py b/src/engine/SCons/Scanner/__init__.py
index 225c7f3f..0edbaff6 100644
--- a/src/engine/SCons/Scanner/__init__.py
+++ b/src/engine/SCons/Scanner/__init__.py
@@ -4,7 +4,7 @@ The Scanner package for the SCons software construction utility.
 
 """
 
-__revision__ = "Scanner/__init__.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 __version__ = "__VERSION__"
 
diff --git a/src/engine/SCons/Sig/MD5.py b/src/engine/SCons/Sig/MD5.py
index 9d461d96..10927e0c 100644
--- a/src/engine/SCons/Sig/MD5.py
+++ b/src/engine/SCons/Sig/MD5.py
@@ -5,7 +5,7 @@ utility.
 
 """
 
-__revision__ = "Sig/MD5.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import md5
 import string
diff --git a/src/engine/SCons/Sig/MD5Tests.py b/src/engine/SCons/Sig/MD5Tests.py
index ac67f1d7..63134753 100644
--- a/src/engine/SCons/Sig/MD5Tests.py
+++ b/src/engine/SCons/Sig/MD5Tests.py
@@ -1,4 +1,4 @@
-__revision__ = "Sig/MD5Tests.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import sys
 import unittest
diff --git a/src/engine/SCons/Sig/TimeStamp.py b/src/engine/SCons/Sig/TimeStamp.py
index b8217424..f66810d5 100644
--- a/src/engine/SCons/Sig/TimeStamp.py
+++ b/src/engine/SCons/Sig/TimeStamp.py
@@ -5,7 +5,7 @@ utility.
 
 """
 
-__revision__ = "Sig/TimeStamp.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 def _init():
     pass	# XXX
diff --git a/src/engine/SCons/Sig/TimeStampTests.py b/src/engine/SCons/Sig/TimeStampTests.py
index 4cc72e4d..2dddff8c 100644
--- a/src/engine/SCons/Sig/TimeStampTests.py
+++ b/src/engine/SCons/Sig/TimeStampTests.py
@@ -1,4 +1,4 @@
-__revision__ = "Sig/TimeStampTests.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import sys
 import unittest
diff --git a/src/engine/SCons/Sig/__init__.py b/src/engine/SCons/Sig/__init__.py
index c3b06ed8..ba485d88 100644
--- a/src/engine/SCons/Sig/__init__.py
+++ b/src/engine/SCons/Sig/__init__.py
@@ -4,4 +4,4 @@ The Signature package for the SCons software construction utility.
 
 """
 
-__revision__ = "Sig/__init__.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
diff --git a/src/engine/SCons/__init__.py b/src/engine/SCons/__init__.py
index 56c5fade..16022c15 100644
--- a/src/engine/SCons/__init__.py
+++ b/src/engine/SCons/__init__.py
@@ -4,6 +4,6 @@ The main package for the SCons software construction utility.
 
 """
 
-__revision__ = "__init__.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 __version__ = "__VERSION__"
diff --git a/src/engine/SCons/exitfuncs.py b/src/engine/SCons/exitfuncs.py
index 86d19907..d088c11f 100644
--- a/src/engine/SCons/exitfuncs.py
+++ b/src/engine/SCons/exitfuncs.py
@@ -4,7 +4,7 @@ Register functions which are executed when SCons exits for any reason.
 
 """
 
-__revision__ = "exitfuncs.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 
 
diff --git a/src/engine/setup.py b/src/engine/setup.py
index 10fbef5b..d926a035 100644
--- a/src/engine/setup.py
+++ b/src/engine/setup.py
@@ -1,4 +1,4 @@
-__revision__ = "setup.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 from string import join, split
 
diff --git a/src/script/scons.py b/src/script/scons.py
index d4337732..c981737e 100644
--- a/src/script/scons.py
+++ b/src/script/scons.py
@@ -3,7 +3,7 @@
 # SCons
 #
 
-__revision__ = "scons.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import getopt
 import os.path
diff --git a/src/script/setup.py b/src/script/setup.py
index 8732e3b9..7fe48185 100644
--- a/src/script/setup.py
+++ b/src/script/setup.py
@@ -1,4 +1,4 @@
-__revision__ = "setup.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 from string import join, split
 
diff --git a/test/Help.py b/test/Help.py
index 69db8722..d57f245d 100644
--- a/test/Help.py
+++ b/test/Help.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/Help.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
diff --git a/test/Program-j.py b/test/Program-j.py
index 4a4fee79..41d32cba 100644
--- a/test/Program-j.py
+++ b/test/Program-j.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/Program-j.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
diff --git a/test/Program.py b/test/Program.py
index 6a0a517c..06562dc6 100644
--- a/test/Program.py
+++ b/test/Program.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/Program.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
diff --git a/test/SConscript.py b/test/SConscript.py
index 7cb55d52..41957fc0 100644
--- a/test/SConscript.py
+++ b/test/SConscript.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/SConscript.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
diff --git a/test/SConstruct.py b/test/SConstruct.py
index 8b586d28..34710a32 100644
--- a/test/SConstruct.py
+++ b/test/SConstruct.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/SConstruct.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
diff --git a/test/errors.py b/test/errors.py
index cff80870..8399958c 100644
--- a/test/errors.py
+++ b/test/errors.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/errors.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 
diff --git a/test/exitfns.py b/test/exitfns.py
index d9a1019f..49afa932 100644
--- a/test/exitfns.py
+++ b/test/exitfns.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/exitfns.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestCmd
 import TestSCons
diff --git a/test/option--.py b/test/option--.py
index 1529c467..51f880e9 100644
--- a/test/option--.py
+++ b/test/option--.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option--.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import os.path
diff --git a/test/option--C.py b/test/option--C.py
index 8af879a0..4d489b12 100644
--- a/test/option--C.py
+++ b/test/option--C.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option--C.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option--H.py b/test/option--H.py
index a02120cf..c2e906b3 100644
--- a/test/option--H.py
+++ b/test/option--H.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option--H.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option--I.py b/test/option--I.py
index 7ca471d3..d39cf85a 100644
--- a/test/option--I.py
+++ b/test/option--I.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option--I.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option--R.py b/test/option--R.py
index db7815b9..952a82c1 100644
--- a/test/option--R.py
+++ b/test/option--R.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option--R.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option--S.py b/test/option--S.py
index c7b04d60..b4438343 100644
--- a/test/option--S.py
+++ b/test/option--S.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option--S.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option--W.py b/test/option--W.py
index a062d269..020dbf4a 100644
--- a/test/option--W.py
+++ b/test/option--W.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option--W.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option--Y.py b/test/option--Y.py
index 9b5f72a5..7565163e 100644
--- a/test/option--Y.py
+++ b/test/option--Y.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option--Y.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option--cd.py b/test/option--cd.py
index af3d170e..ef1f82da 100644
--- a/test/option--cd.py
+++ b/test/option--cd.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option--cd.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option--cf.py b/test/option--cf.py
index 4c106fc7..76b58a41 100644
--- a/test/option--cf.py
+++ b/test/option--cf.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option--cf.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option--cs.py b/test/option--cs.py
index 39f19d91..77d95468 100644
--- a/test/option--cs.py
+++ b/test/option--cs.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option--cs.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option--la.py b/test/option--la.py
index 2ebd95eb..87118c55 100644
--- a/test/option--la.py
+++ b/test/option--la.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option--la.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option--ld.py b/test/option--ld.py
index 66ce38d9..19c937da 100644
--- a/test/option--ld.py
+++ b/test/option--ld.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option--ld.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option--lw.py b/test/option--lw.py
index 65c8acfd..d4d618c5 100644
--- a/test/option--lw.py
+++ b/test/option--lw.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option--lw.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option--npd.py b/test/option--npd.py
index 02c4d19a..32b71075 100644
--- a/test/option--npd.py
+++ b/test/option--npd.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option--npd.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option--override.py b/test/option--override.py
index 3b1bd820..9a93f12a 100644
--- a/test/option--override.py
+++ b/test/option--override.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option--override.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option--random.py b/test/option--random.py
index 12f88bc0..5e2ec8c5 100644
--- a/test/option--random.py
+++ b/test/option--random.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option--random.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option--wf.py b/test/option--wf.py
index 0b75b7af..dc0e4709 100644
--- a/test/option--wf.py
+++ b/test/option--wf.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option--wf.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option--wuv.py b/test/option--wuv.py
index 72b4557a..c143dc94 100644
--- a/test/option--wuv.py
+++ b/test/option--wuv.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option--wuv.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option-b.py b/test/option-b.py
index b2a95bbd..ad25f58a 100644
--- a/test/option-b.py
+++ b/test/option-b.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option-b.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option-c.py b/test/option-c.py
index 406e438a..ac84d05e 100644
--- a/test/option-c.py
+++ b/test/option-c.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option-c.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option-d.py b/test/option-d.py
index b6844906..a9bc1e87 100644
--- a/test/option-d.py
+++ b/test/option-d.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option-d.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option-e.py b/test/option-e.py
index 0fdf50e5..4914db37 100644
--- a/test/option-e.py
+++ b/test/option-e.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option-e.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option-f.py b/test/option-f.py
index ddd91b40..90aa4428 100644
--- a/test/option-f.py
+++ b/test/option-f.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option-f.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import os.path
diff --git a/test/option-h.py b/test/option-h.py
index e8369163..937f4462 100644
--- a/test/option-h.py
+++ b/test/option-h.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option-h.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option-i.py b/test/option-i.py
index f3aa4eb4..c7ad4958 100644
--- a/test/option-i.py
+++ b/test/option-i.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option-i.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option-j.py b/test/option-j.py
index d52ab4bd..90d036d5 100644
--- a/test/option-j.py
+++ b/test/option-j.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option-j.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option-k.py b/test/option-k.py
index bf4b5791..fb53b570 100644
--- a/test/option-k.py
+++ b/test/option-k.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option-k.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option-l.py b/test/option-l.py
index 1a14638c..49d61233 100644
--- a/test/option-l.py
+++ b/test/option-l.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option-l.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option-m.py b/test/option-m.py
index d8f1310f..5a4693a9 100644
--- a/test/option-m.py
+++ b/test/option-m.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option-m.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option-n.py b/test/option-n.py
index 122a38b6..39d5f34b 100644
--- a/test/option-n.py
+++ b/test/option-n.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option-n.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import os.path
diff --git a/test/option-o.py b/test/option-o.py
index 63453d37..274e8afd 100644
--- a/test/option-o.py
+++ b/test/option-o.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option-o.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option-p.py b/test/option-p.py
index f760b9a2..4bae24ad 100644
--- a/test/option-p.py
+++ b/test/option-p.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option-p.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option-q.py b/test/option-q.py
index 3cceab2a..4d720041 100644
--- a/test/option-q.py
+++ b/test/option-q.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option-q.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option-r.py b/test/option-r.py
index 7d475d80..0d329853 100644
--- a/test/option-r.py
+++ b/test/option-r.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option-r.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option-s.py b/test/option-s.py
index 8df64af0..f331d3c4 100644
--- a/test/option-s.py
+++ b/test/option-s.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option-s.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import os.path
diff --git a/test/option-t.py b/test/option-t.py
index 86577329..c36d51cb 100644
--- a/test/option-t.py
+++ b/test/option-t.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option-t.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option-u.py b/test/option-u.py
index 9c8fdf59..089b8dd7 100644
--- a/test/option-u.py
+++ b/test/option-u.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option-u.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option-v.py b/test/option-v.py
index d674aa4f..b65e4d05 100644
--- a/test/option-v.py
+++ b/test/option-v.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option-v.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string
diff --git a/test/option-w.py b/test/option-w.py
index d27c52f4..234e6e62 100644
--- a/test/option-w.py
+++ b/test/option-w.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-__revision__ = "test/option-w.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import string