X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=config%2Fsrclist-update;h=a77e0e03029197a4003c87a52368f4bc49654148;hb=e1df42fdae6c4a40efe923a4423166c823946f66;hp=cbe1af5292dcb78d340862cd83425bb1e2b4753b;hpb=5444dcf4d4e1c4b8dee21fad412f8843ec8cebb8;p=gnulib.git

diff --git a/config/srclist-update b/config/srclist-update
index cbe1af529..a77e0e030 100755
--- a/config/srclist-update
+++ b/config/srclist-update
@@ -1,11 +1,31 @@
 #!/bin/sh
-# $Id: srclist-update,v 1.6 2003-07-08 23:33:45 eggert Exp $
+# $Id: srclist-update,v 1.15 2004-06-22 18:28:25 eggert 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 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 2, 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.
+
+# Written by Karl Berry.
+
+
 if test -n "$1"; then
   cd "$1" || exit 1
 fi
@@ -14,7 +34,6 @@ verbose=false
 #chicken="echo (would)"
 
 : ${TMPDIR=/tmp}
-srctmp=$TMPDIR/srclist.src
 dsttmp=$TMPDIR/srclist.dst
 
 mydir=`dirname $0`
@@ -22,11 +41,24 @@ test -r $mydir/srclistvars.sh && . $mydir/srclistvars.sh
 
 
 # 
-# $1 is input, output to stdout with gpl.
-#
-fixlicense() \
-{
-    sed '/The .* is free software/,/USA\.  *\*\//c\
+# 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 2, 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.
+
+  /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)\
@@ -40,34 +72,39 @@ fixlicense() \
    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
-}
+'
 
+# sed command to remove lines containing $Id lines.
+# Quote the $Id 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() \
 {
+  sed_command="$remove_id_lines"
+
   case " $options " in
   *' gpl '*)
-    fixlicense $1;;
-  *)
-    cat $1;;
-  esac \
-  | grep -v '\$Id: srclist-update,v 1.6 2003-07-08 23:33:45 eggert Exp $' >$2
+    sed_command="$sed_command; $fixlicense";;
+  esac
+
+  sed "$sed_command" $1 >$2
 }
 
 
 # 
 cat | while read src dst options; do
+  #echo "src=$src, dst=$dst, options=$options" >&2
   case $src:$dst in
-    *: ) continue;;  # skip lines without second element
+    *: ) 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
@@ -76,28 +113,25 @@ 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.
+  # 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 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 -C 2 $dst $gplsrc
+    echo "## $srctmp $dst  # changes"
+    diff -C 2 $dst $srctmp
   fi
 done
 
-rm -f $srctmp $dsttmp
+rm -f $dsttmp