X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=config%2Fsrclist-update;h=cf36d5dde6f6952dfae713a7966eaf281038c8b6;hb=9b1a374d33160fc9f6701559930ddbdd5167b17d;hp=40619e26306d63d430713ba21d61b8c914f6e7b7;hpb=6729a45ff584c6f8465afc214a31f97b81eb4436;p=pspp
diff --git a/config/srclist-update b/config/srclist-update
index 40619e2630..cf36d5dde6 100755
--- a/config/srclist-update
+++ b/config/srclist-update
@@ -1,10 +1,26 @@
#!/bin/sh
-# $Id: srclist-update,v 1.10 2003-07-16 12:47:48 karl Exp $
+# $Id: srclist-update,v 1.19 2007-03-30 23:44: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.
+# Copyright (C) 2002, 2003, 2005, 2007, 2008 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
@@ -16,49 +32,46 @@ verbose=false
: ${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 '
-
- /^\([[: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 .
- /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 . */
+'
+# 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.
@@ -67,13 +80,14 @@ fixlicense() \
#
fixfile() \
{
+ sed_command="$remove_id_lines"
+
case " $options " in
*' gpl '*)
- fixlicense $1;;
- *)
- cat $1;;
- esac \
- | grep -v '[$]Id:.*[$]' >$2 2>&1
+ sed_command="$sed_command; $fixlicense";;
+ esac
+
+ sed "$sed_command" $1 >$2
}
@@ -98,12 +112,15 @@ cat | while read src dst options; do
eval dst=$dst
test -d $dst && dst=$dst/`basename $src`
- # Do license changes and $Id removal in both src and dst, for the sake
+ # 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
+ # if src was executable, make dst executable, to placate git.
+ test -x $src && chmod a+x $dst
+
if test ! -e $dst; then
echo "## $srctmp $dst # new"
$chicken cp -p $srctmp $dst