diff options
| -rw-r--r-- | bin/restore.sh | 70 | ||||
| -rw-r--r-- | src/engine/SCons/Scanner/LaTeXTests.py | 4 |
2 files changed, 63 insertions, 11 deletions
diff --git a/bin/restore.sh b/bin/restore.sh index d23d1d0..0ed181d 100644 --- a/bin/restore.sh +++ b/bin/restore.sh @@ -1,8 +1,8 @@ #!/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. +# Simple hack script to restore __revision__, __COPYRIGHT_, __VERSION__ +# and other similar variables to what gets checked in to source. This +# comes in handy when people send in diffs based on the released source. # if test "X$*" = "X"; then @@ -11,27 +11,79 @@ else DIRS="$*" fi +SEPARATOR="================================================================================" + +header() { + arg_space="$1 " + dots=`echo "$arg_space" | sed 's/./\./g'` + echo "$SEPARATOR" | sed "s;$dots;$arg_space;" +} + for i in `find $DIRS -name '*.py'`; do -ed $i <<EOF + header $i + ed $i <<EOF +g/Copyright (c) 2001.*SCons Foundation/s//__COPYRIGHT__/p +w /^__revision__ = /s/= .*/= "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"/p -/Copyright (c) 2001.*SCons Foundation.*/s//__COPYRIGHT__/p +w +q +EOF +done + +for i in `find $DIRS -name 'scons.bat'`; do + header $i + ed $i <<EOF +g/Copyright (c) 2001.*SCons Foundation/s//__COPYRIGHT__/p +w +/^@REM src\/script\/scons.bat/s/@REM .* knight/@REM __FILE__ __REVISION__ __DATE__ __DEVELOPER__/p +w +q +EOF +done + +for i in `find $DIRS -name '__init__.py' -o -name 'scons.py' -o -name 'sconsign.py'`; do + header $i + ed $i <<EOF +/^__version__ = /s/= .*/= "__VERSION__"/p +w +/^__build__ = /s/= .*/= "__BUILD__"/p +w +/^__buildsys__ = /s/= .*/= "__BUILDSYS__"/p +w +/^__date__ = /s/= .*/= "__DATE__"/p +w +/^__developer__ = /s/= .*/= "__DEVELOPER__"/p +w +q +EOF +done + +for i in `find $DIRS -name 'setup.py'`; do + header $i + ed $i <<EOF +/^ *version = /s/= .*/= "__VERSION__",/p w q EOF done for i in `find $DIRS -name '*.txt'`; do -ed $i <<EOF + header $i + ed $i <<EOF +g/Copyright (c) 2001.*SCons Foundation/s//__COPYRIGHT__/p +w /# [^ ]* 0.96.[CD][0-9]* [0-9\/]* [0-9:]* knight$/s/.*/# __FILE__ __REVISION__ __DATE__ __DEVELOPER__/p -/Copyright (c) 2001.*SCons Foundation.*/s//__COPYRIGHT__/p +w +/Version [0-9][0-9]*\.[0-9][0-9]*/s//Version __VERSION__/p w q EOF done for i in `find $DIRS -name '*.xml'`; do -ed $i <<EOF -/^<!-- Copyright (c) 2001.*SCons Foundation -->$/s/.*/<!-- __COPYRIGHT__ -->/p + header $i + ed $i <<EOF +g/Copyright (c) 2001.*SCons Foundation/s//__COPYRIGHT__/p w q EOF diff --git a/src/engine/SCons/Scanner/LaTeXTests.py b/src/engine/SCons/Scanner/LaTeXTests.py index 1f1861e..45a387a 100644 --- a/src/engine/SCons/Scanner/LaTeXTests.py +++ b/src/engine/SCons/Scanner/LaTeXTests.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2005 The SCons Foundation +# __COPYRIGHT__ # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "" +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" import os.path import string |