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

diff --git a/config/srclist-update b/config/srclist-update
index cbe1af529..40619e263 100755
--- a/config/srclist-update
+++ b/config/srclist-update
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: srclist-update,v 1.6 2003-07-08 23:33:45 eggert Exp $
+# $Id: srclist-update,v 1.10 2003-07-16 12:47:48 karl 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.
@@ -14,7 +14,6 @@ verbose=false
 #chicken="echo (would)"
 
 : ${TMPDIR=/tmp}
-srctmp=$TMPDIR/srclist.src
 dsttmp=$TMPDIR/srclist.dst
 
 mydir=`dirname $0`
@@ -26,7 +25,24 @@ test -r $mydir/srclistvars.sh && . $mydir/srclistvars.sh
 #
 fixlicense() \
 {
-    sed '/The .* is free software/,/USA\.  *\*\//c\
+    sed '
+
+  /^\([[: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/,/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)\
@@ -47,7 +63,7 @@ fixlicense() \
 # $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() \
 {
@@ -57,17 +73,19 @@ fixfile() \
   *)
     cat $1;;
   esac \
-  | grep -v '\$Id: srclist-update,v 1.6 2003-07-08 23:33:45 eggert Exp $' >$2
+  | grep -v '[$]Id:.*[$]' >$2 2>&1
 }
 
 
 # 
 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 +94,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.
+  # Do license changes and $Id removal 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