On 6/30/07, James Youngman <[EMAIL PROTECTED]> wrote:
I enclose a patch which adds an option to gnulib-tool to modify the
copyright banners of the Gnulib code to say "version 3".
Findutils also builds the gnulib tests and runs the tests when the
user says "make check". Unfortunately, my previous change missed
those out. This change includes them too, but it's possible the
change is too broad:
--- gnulib-tool 2007-06-30 18:27:41.000000000 +0100
+++ gnulib-tool.gpl3 2007-06-30 18:26:13.000000000 +0100
@@ -1772,6 +1772,7 @@
# Determine script to apply to imported library files.
sed_transform_lib_file=
+ sed_transform_file=
for module in $modules; do
if test $module = config-h; then
# Assume config.h exists, and that -DHAVE_CONFIG_H is omitted.
@@ -1790,6 +1791,9 @@
fi
if test -n "gpl3"; then
# Update license.
+ sed_transform_file=$sed_transform_file'
+ s/version 2\([ ,]\)/version 3\1/g
+ '
sed_transform_lib_file=$sed_transform_lib_file'
s/version 2\([ ,]\)/version 3\1/g
'
@@ -1912,11 +1916,21 @@
func_dest_tmpfilename "$g"
func_lookup_file "$f"
cp "$lookedup_file" "$tmpfile" || func_fatal_error "failed"
- if test -n "$sed_transform_lib_file"; then
+ if test -n "$sed_transform_lib_file" || test n "$sed_transform_file"; then
case "$f" in
lib/*)
- sed -e "$sed_transform_lib_file" \
- < "$lookedup_file" > "$tmpfile" || func_fatal_error "failed"
+ # Perform transformations on a library file.
+ if test -n "$sed_transform_lib_file"; then
+ sed -e "$sed_transform_lib_file" \
+ < "$lookedup_file" > "$tmpfile" || func_fatal_error "failed"
+ fi
+ ;;
+ *)
+ # Perform any transforms for other, non-library, files.
+ if test -n "$sed_transform_file"; then
+ sed -e "$sed_transform_file" \
+ < "$lookedup_file" > "$tmpfile" || func_fatal_error "failed"
+ fi
;;
esac
fi
