X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=config%2Fsrclist-update;h=198856a4052173e747f7d4022f26b90112cad6fb;hb=1276a2c5f24c0c932426aca9c899fa524d2443f2;hp=6daad83ab3ecde654bb05730bfb04be782a87bba;hpb=cbfd57c9e245d79e28c028ead19ee20be1e7cad0;p=gnulib.git

diff --git a/config/srclist-update b/config/srclist-update
index 6daad83ab..198856a40 100755
--- a/config/srclist-update
+++ b/config/srclist-update
@@ -1,10 +1,38 @@
 #!/bin/sh
-# $Id: srclist-update,v 1.8 2003-07-15 12:47:27 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.
 #
-# Source `dirname $0`/srclistvars.sh first, if it exists.
+# Empty (or only whitespace) input lines are ignored.
+# Lines beginning with # are ignored.
+# Lines with just one word are ignored.
+# Otherwise, the line has two or more whitespace-separated words:
+#   the first word is the source, the second word is the destination,
+#   other optional words are options.
+# The possible options are "gpl" (to replace the license with the GPL)
+#   and "doclicense" (to replace @include doclicense.texi with fdl.texi).
+#   Unrecognized options are ignored.
+# $VARIABLE expansions are done (with sh eval).
+#
+# This script is used in gnulib and texinfo; the input files are named
+# srclist.txt.
+#
+# Copyright (C) 2002-2003, 2005, 2007-2014 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 <http://www.gnu.org/licenses/>.
+
+# Originally written by Karl Berry.
+
 
 if test -n "$1"; then
   cd "$1" || exit 1
@@ -14,77 +42,79 @@ verbose=false
 #chicken="echo (would)"
 
 : ${TMPDIR=/tmp}
-srctmp=$TMPDIR/srclist.src
 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 '
-
-  /^\([[: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.\
+# 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.\
+#   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.
+#   You should have received a copy of the GNU General Public License\
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-  /Th[ei][ s].* is free software/,/USA\.  *\*\//c\
-   This program is free software; you can redistribute it and/or modify\
+  /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 <http://www.gnu.org/licenses/>.  */
+'
 
+# 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() \
 {
+  sed_command="$remove_id_lines"
+
   case " $options " in
   *' gpl '*)
-    fixlicense $1;;
-  *)
-    cat $1;;
-  esac \
-  | grep -v '\$Id: srclist-update,v 1.8 2003-07-15 12:47:27 karl Exp $2
+    sed_command="$sed_command; $fixlicense";;
+
+  *' doclicense '*)
+    sed_command="$sed_command; s/@include doclicense.texi/@include fdl.texi/";;
+  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
@@ -93,28 +123,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.
+  # 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 -C 2 $dst $gplsrc
+    echo "## $srctmp $dst  # changes"
+    diff -C 2 $dst $srctmp
   fi
 done
 
-rm -f $srctmp $dsttmp
+rm -f $dsttmp