Correct __COPYRIGHT__ and __revision__ lines in files. Add missing copyright notices...

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

diff --git a/bin/restore.sh b/bin/restore.sh
new file mode 100644 (file)
index 0000000..2b7a726
--- /dev/null
+++ b/bin/restore.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env sh
+#
+# Simple hack script to restore __revision__ and __COPYRIGHT_ lines
+# to what gets checked in to source.  This comes in handy when people
+# send in diffs based on the released source.
+#
+
+for i in `find src test -name '*.py'`; do
+ed $i <<EOF
+/__revision__ = /s/= .*/= "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"/p
+/# Copyright (c) 2001/s/.*/# __COPYRIGHT__/p
+w
+q
+EOF
+done

diff --git a/src/engine/SCons/Tool/c++.py b/src/engine/SCons/Tool/c++.py
index 8ede17ed0e79e1e3d7035cea46734a94858ea741..1a6c6c0c53faa6a3e0c2c115bf7a3266d017ded8 100644 (file)
--- a/src/engine/SCons/Tool/c++.py
+++ b/src/engine/SCons/Tool/c++.py
@@ -8,7 +8,7 @@ selection method.
 """
 
 #
-# Copyright (c) 2001, 2002, 2003 Steven Knight
+# __COPYRIGHT__
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -30,7 +30,7 @@ selection method.
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = ""
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
 

diff --git a/src/engine/SCons/Tool/hpc++.py b/src/engine/SCons/Tool/hpc++.py
index b654df8bf7752a64e25bae0e27df502ed7e358ca..5b650d6def28f878af508dde664092c4fe95d981 100644 (file)
--- a/src/engine/SCons/Tool/hpc++.py
+++ b/src/engine/SCons/Tool/hpc++.py
@@ -7,6 +7,30 @@ It will usually be imported through the generic SCons.Tool.Tool()
 selection method.
 
 """
+
+#
+# __COPYRIGHT__
+#
+# 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__ = ""
 
 import os.path
@@ -17,7 +41,13 @@ cplusplus = __import__('c++', globals(), locals(), [])
 acc = None
 
 # search for the acc compiler and linker front end
-for dir in os.listdir('/opt'):
+
+try:
+    dirs = os.listdir('/opt')
+except:
+    dirs = []
+
+for dir in dirs:
     cc = '/opt/' + dir + '/bin/aCC'
     if os.path.exists(cc):
         acc = cc
@@ -29,7 +59,7 @@ def generate(env):
     cplusplus.generate(env)
 
     if acc:
-        env['CXX']        = acc
+        env['CXX']        = acc or 'aCC'
         # determine version of aCC
         line = os.popen(acc + ' -V 2>&1').readline().rstrip()
         if string.find(line, 'aCC: HP ANSI C++') == 0:

diff --git a/src/engine/SCons/Tool/hplink.py b/src/engine/SCons/Tool/hplink.py
index 3f3cd8524dfce9781bcbf7d71d1308df5a95cd1e..7468920d5b07b8a8c0bff38e385ac7fdd60972d2 100644 (file)
--- a/src/engine/SCons/Tool/hplink.py
+++ b/src/engine/SCons/Tool/hplink.py
@@ -40,7 +40,13 @@ import link
 ccLinker = None
 
 # search for the acc compiler and linker front end
-for dir in os.listdir('/opt'):
+
+try:
+    dirs = os.listdir('/opt')
+except:
+    dirs = []
+
+for dir in dirs:
     linker = '/opt/' + dir + '/bin/aCC'
     if os.path.exists(linker):
         ccLinker = linker

diff --git a/src/engine/SCons/Tool/icl.py b/src/engine/SCons/Tool/icl.py
index 666bcd16d524bb31b901d5e0be9eeb7e18c80758..ec1e0633b9b03bcf265f001df5833fbc964e3506 100644 (file)
--- a/src/engine/SCons/Tool/icl.py
+++ b/src/engine/SCons/Tool/icl.py
@@ -8,6 +8,29 @@ selection method.
 
 """
 
+#
+# __COPYRIGHT__
+#
+# 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__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path

diff --git a/src/engine/SCons/Tool/midl.py b/src/engine/SCons/Tool/midl.py
index a1f079b27d171484366128d305edd0208c3280d6..a3f816553e3dd0a7021d5428cdbc78d8cac06d84 100644 (file)
--- a/src/engine/SCons/Tool/midl.py
+++ b/src/engine/SCons/Tool/midl.py
@@ -9,7 +9,7 @@ selection method.
 """
 
 #
-# Copyright (c) 2001, 2002, 2003 Steven Knight
+# __COPYRIGHT__
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -31,7 +31,7 @@ selection method.
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "__REVISION__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
 

diff --git a/src/engine/SCons/Tool/sunlink.py b/src/engine/SCons/Tool/sunlink.py
index c73a3096ce0ad8ea1964b3dd40a4ed4967989bf3..f23917b2b1c83e404d8415bba3b2ec99f789735b 100644 (file)
--- a/src/engine/SCons/Tool/sunlink.py
+++ b/src/engine/SCons/Tool/sunlink.py
@@ -40,7 +40,13 @@ import link
 ccLinker = None
 
 # search for the acc compiler and linker front end
-for dir in os.listdir('/opt'):
+
+try:
+    dirs = os.listdir('/opt')
+except:
+    dirs = []
+
+for dir in dirs:
     linker = '/opt/' + dir + '/bin/CC'
     if os.path.exists(linker):
         ccLinker = linker

diff --git a/test/SCONS_LIB_DIR.py b/test/SCONS_LIB_DIR.py
index 2a9b986fc465831047af097b2c8023904b96d6b4..553da1dc6640940fadd1eb5860d056fb848515ec 100644 (file)
--- a/test/SCONS_LIB_DIR.py
+++ b/test/SCONS_LIB_DIR.py
@@ -22,7 +22,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "test/SCONS_LIB_DIR.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import os

diff --git a/test/append-action.py b/test/append-action.py
index c8de2811919f9848f2ef1d2e4f660fc89bfdb3fb..fa3bb640291d69e07f14c9b52739716ec56e25a0 100644 (file)
--- a/test/append-action.py
+++ b/test/append-action.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2001, 2002 Steven Knight
+# __COPYRIGHT__
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

diff --git a/test/dependency-cycle.py b/test/dependency-cycle.py
index 194be94381874efdd8a4901a43f078c2f31c9ef0..1486c7635791c36b1b4d831baec2f82eac103d00 100644 (file)
--- a/test/dependency-cycle.py
+++ b/test/dependency-cycle.py
@@ -22,7 +22,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "test/dependency-cycle.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import TestCmd

diff --git a/test/midl.py b/test/midl.py
index 6c1f836da9712f8a14cb04a0a46b4c064a87d45d..f2bb5d2a5c6483c24e1854f9c572b9e042250224 100644 (file)
--- a/test/midl.py
+++ b/test/midl.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2001, 2002, 2003 Steven Knight
+# __COPYRIGHT__
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -22,7 +22,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "__REVISION__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
 import sys

diff --git a/test/option--max-drift.py b/test/option--max-drift.py
index 255b3b13f7604689f5e8dac66eb039b4ca5f6fb0..bc26f33b57be04ac9e2453660f7be9861ef7aab0 100644 (file)
--- a/test/option--max-drift.py
+++ b/test/option--max-drift.py
@@ -24,8 +24,6 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
 import os.path
 import os
 import string

diff --git a/test/pre-post-actions.py b/test/pre-post-actions.py
index d5340f26be0982dc79d9c6b01516ec18833dcd0d..1e69a21c44acd3bbff145f3a4fb0c6aba55939f6 100644 (file)
--- a/test/pre-post-actions.py
+++ b/test/pre-post-actions.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2001, 2002 Steven Knight
+# __COPYRIGHT__
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

diff --git a/test/sconsign-script.py b/test/sconsign-script.py
index a5c0aa788ecb6f583851ac8aa27a9de1030ecc2d..24e23a03d4135b4778bd1de8607ac413f1a79994 100644 (file)
--- a/test/sconsign-script.py
+++ b/test/sconsign-script.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2001, 2002, 2003 Steven Knight
+# __COPYRIGHT__
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -22,7 +22,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "/home/scons/scons/branch.0/baseline/test/sconsign.py 0.90.D001 2003/06/25 15:32:24 knight"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
 import string