X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=config%2Fsrclist-update;h=3b8b9d47935ad6f50b56cbdde6dd440cdd590082;hb=7c1b995a7041ea366acafeb8632e1080f349f03f;hp=ef1bc2999281a878fbe3c55720fcd9b03ff478b6;hpb=e84d2d935312526b14aa82011dd925a36c87b843;p=gnulib.git
diff --git a/config/srclist-update b/config/srclist-update
index ef1bc2999..3b8b9d479 100755
--- a/config/srclist-update
+++ b/config/srclist-update
@@ -1,10 +1,25 @@
#!/bin/sh
-# $Id: srclist-update,v 1.4 2002-11-25 13:17:17 meyering Exp $
-#
# Check for files in directory $1 being up to date, according to the
# list on stdin. Don't actually make any changes, just show the diffs.
#
-# Source `dirname $0`/srclistvars.sh first, if it exists.
+# Copyright (C) 2002, 2003, 2005, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+# Originally written by Karl Berry.
+
if test -n "$1"; then
cd "$1" || exit 1
@@ -13,59 +28,78 @@ fi
verbose=false
#chicken="echo (would)"
-srctmp=${TMPDIR-/tmp}/srclist.src
-dsttmp=${TMPDIR-/tmp}/srclist.dst
+: ${TMPDIR=/tmp}
+dsttmp=$TMPDIR/srclist.dst
+# Source `dirname $0`/srclistvars.sh first, if it exists.
mydir=`dirname $0`
test -r $mydir/srclistvars.sh && . $mydir/srclistvars.sh
#
-# $1 is input, output to stdout with gpl.
-#
-fixlicense() \
-{
- sed '/The .* is free software/,/USA\. *\*\//c\
- This program is free software; you can redistribute it and/or modify\
+# sed command to fix the license to be GPL.
+fixlicense='
+ /^[[:space:]]*#[[:space:]]*Th[ei][ s].* is free software/,/^[[:space:]]*#.*USA\./c\
+# This program is free software: you can redistribute it and/or modify\
+# it under the terms of the GNU General Public License as published by\
+# the Free Software Foundation; either version 3 of the License, or\
+# (at your option) any later version.\
+#\
+# This program is distributed in the hope that it will be useful,\
+# but WITHOUT ANY WARRANTY; without even the implied warranty of\
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\
+# GNU General Public License for more details.\
+#\
+# You should have received a copy of the GNU General Public License\
+# along with this program. If not, see .
+
+ /Th[ei][ s].* is free software/,/\*\//c\
+ This program is free software: you can redistribute it and/or modify\
it under the terms of the GNU General Public License as published by\
- the Free Software Foundation; either version 2, or (at your option)\
- any later version.\
+ the Free Software Foundation; either version 3 of the License, or\
+ (at your option) any later version.\
\
This program is distributed in the hope that it will be useful,\
but WITHOUT ANY WARRANTY; without even the implied warranty of\
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\
GNU General Public License for more details.\
\
- You should have received a copy of the GNU General Public License along\
- with this program; if not, write to the Free Software Foundation,\
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-' $1
-}
+ You should have received a copy of the GNU General Public License\
+ along with this program. If not, see . */
+'
+# sed command to remove lines containing $Id lines.
+# Quote the $ so that CVS does not expand it in this script.
+remove_id_lines='/[$]Id:.*[$]/d'
# $1 is input file, $2 is output.
# Remove $Id lines, since they'll differ between source locations.
# If $options contains "gpl", change the license to be the standard
-# GPL. We use this for libc files.
+# GPL. We use this for libc files, et al.
#
fixfile() \
{
- if echo "$options" | grep -w gpl >/dev/null; then
- fixlicense $1
- else
- cat $1
- fi \
- | fgrep -v '$'"Id:" >$2
+ sed_command="$remove_id_lines"
+
+ case " $options " in
+ *' gpl '*)
+ sed_command="$sed_command; $fixlicense";;
+ esac
+
+ sed "$sed_command" $1 >$2
}
#
cat | while read src dst options; do
- test -z "$dst" && continue # skip lines without second element
- echo "$src $dst" | sed 's/#.*$//' | egrep '^\s*$' >/dev/null \
- && continue # skip whitespace and comment-only lines
-
- src=`eval echo $src`
+ #echo "src=$src, dst=$dst, options=$options" >&2
+ case $src:$dst in
+ *: ) continue;; # skip lines without second element
+ '#'* ) continue;; # skip comment-only lines
+ esac
+
+ # Expand variables and make sure we have an input file.
+ eval src=$src
if test ! -r $src; then
echo "$0: cannot read $src" >&2
continue
@@ -73,28 +107,28 @@ cat | while read src dst options; do
# Ignore subdirs in src dir. E.g., if input spec is
# src/subdir/foo.c dst
- # write destination file dst/foo.c.
- dst=`eval echo $dst`
+ # then write destination file dst/foo.c.
+ eval dst=$dst
test -d $dst && dst=$dst/`basename $src`
- # Make changes for sake of comparison.
+ # Fix files in both src and dst, for the sake
+ # of a clean comparison.
+ srctmp=$TMPDIR/`basename $src`
fixfile $src $srctmp
test -r $dst && fixfile $dst $dsttmp
- # don't show license differences.
- gplsrc=$TMPDIR/`basename $src`
- fixlicense $src >$gplsrc
- cmp -s $src $gplsrc && gplsrc=$src
+ # if src was executable, make dst executable, to placate git.
+ test -x $src && chmod a+x $dst
if test ! -e $dst; then
- echo "## $gplsrc $dst # new"
- $chicken cp -p $gplsrc $dst
+ echo "## $srctmp $dst # new"
+ $chicken cp -p $srctmp $dst
elif cmp -s $srctmp $dsttmp; then
- $verbose && echo "## $gplsrc $dst # unchanged"
+ $verbose && echo "## $srctmp $dst # unchanged"
else
- echo "## $gplsrc $dst # changes"
- diff -c2 $dst $gplsrc
+ echo "## $srctmp $dst # changes"
+ diff -C 2 $dst $srctmp
fi
done
-rm -f $srctmp $dsttmp
+rm -f $dsttmp