Include "userspec.h".

[gnulib.git] / gnulib-tool

diff --git a/gnulib-tool b/gnulib-tool
index 645b3af..3a87d2f 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2003-01-01 14:49:10 $'
+cvsdatestamp='$Date: 2003-09-17 18:30:23 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -57,6 +57,7 @@ Usage: gnulib-tool --list
        gnulib-tool --extract-autoconf-snippet module
        gnulib-tool --extract-automake-snippet module
        gnulib-tool --extract-include-directive module
+       gnulib-tool --extract-maintainer module
 
 Operation modes:
       --list                print the available module names
@@ -65,19 +66,20 @@ Operation modes:
       --create-megatestdir  create a mega scratch package with the given modules
                             one by one and all together
       --test                test the combination of the given modules
-                            (recommended to use CC="gcc -Wall -Werror" here)
+                            (recommended to use CC=\"gcc -Wall\" here)
       --megatest            test the given modules one by one and all together
-                            (recommended to use CC="gcc -Wall -Werror" here)
+                            (recommended to use CC=\"gcc -Wall\" here)
       --extract-description        extract the description
       --extract-filelist           extract the list of files
       --extract-dependencies       extract the dependencies
       --extract-autoconf-snippet   extract the snippet for configure.ac
       --extract-automake-snippet   extract the snippet for lib/Makefile.am
       --extract-include-directive  extract the #include directive
+      --extract-maintainer         report the maintainer(s) inside gnulib
 
 Options:
       --dir=DIRECTORY       specify the target directory
-      --lib=libRARY         specify the library name
+      --lib=LIBRARY         specify the library name
       --no-changelog        don't update or create ChangeLog files
 
 Report bugs to <bug-gnulib@gnu.org>."
@@ -195,7 +197,7 @@ case "$0" in
      fi
      ;;
 esac
-while test -L "$self_abspathname"; do
+while test -h "$self_abspathname"; do
   # Resolve symbolic link.
   sedexpr1='s, -> ,#%%#,'
   sedexpr2='s,^.*#%%#\(.*\)$,\1,p'
@@ -212,7 +214,7 @@ gnulib_dir=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`
 func_all_modules ()
 {
   (cd "$gnulib_dir/modules" && ls -1) \
-      | sed -e '/^CVS$/d' -e '/^ChangeLog$/d' -e '/^TEMPLATE$/d' \
+      | sed -e '/^CVS$/d' -e '/^ChangeLog$/d' -e '/^TEMPLATE$/d' -e '/~$/d' \
       | sort
 }
 
@@ -221,17 +223,24 @@ func_all_modules ()
 func_verify_module ()
 {
   if test ! -f "$gnulib_dir/modules/$module" \
-     || test "CVS" = "$module" || test "ChangeLog" = "$module" || test "TEMPLATE" = "$module"; then
-    echo "gnulib-tool: module $1 doesn't exist" 1>&2
+     || test "CVS" = "$module" \
+     || test "ChangeLog" = "$module" \
+     || test "TEMPLATE" = "$module"; then
+    echo "gnulib-tool: module $module doesn't exist" 1>&2
     module=
   fi
 }
 
-tags_regexp='\(Description\|Files\|Depends-on\|configure\.ac\|Makefile\.am\|Include\)'
 sed_extract_prog=':[   ]*$/ {
   :a
     n
-    s/^'"$tags_regexp"':[      ]*$//
+    s/^Description:[   ]*$//
+    s/^Files:[         ]*$//
+    s/^Depends-on:[    ]*$//
+    s/^configure\.ac:[         ]*$//
+    s/^Makefile\.am:[  ]*$//
+    s/^Include:[       ]*$//
+    s/^Maintainer:[    ]*$//
     tb
     p
     ba
@@ -277,6 +286,12 @@ func_get_include_directive ()
   sed -e 's/^\(["<]\)/#include \1/'
 }
 
+# func_get_maintainer module
+func_get_maintainer ()
+{
+  sed -n -e "/^Maintainer$sed_extract_prog" < "$gnulib_dir/modules/$1"
+}
+
 # func_create_testdir testdir modules
 func_create_testdir ()
 {
@@ -290,6 +305,11 @@ func_create_testdir ()
     for module in $modules; do
       func_verify_module
       if test -n "$module"; then
+        # Duplicate dependenies are harmless, but Jim wants a warning.
+        duplicated_deps=`func_get_dependencies $module | sort | uniq -d`
+        if test -n "$duplicated_deps"; then
+          echo "warning: module $module has duplicated dependencies: "`echo $duplicated_deps` 1>&2
+        fi
         xmodules="$xmodules $module "`func_get_dependencies $module`
       fi
     done
@@ -316,13 +336,19 @@ func_create_testdir ()
 
   # Create directories.
   for d in `echo "$files" | sed -n -e 's,^\(.*\)/[^/]*,\1,p'`; do
-    mkdir -p "$testdir/$d"
+    if test "$d" != config; then
+      mkdir -p "$testdir/$d"
+    fi
   done
 
   # Copy files.
   for f in $files; do
-    ln "$gnulib_dir/$f" "$testdir/$f" 2>/dev/null ||
-    cp -p "$gnulib_dir/$f" "$testdir/$f"
+    case "$f" in
+      config/*) g=`echo "$f" | sed -e 's,^config/,,'` ;;
+      *) g="$f" ;;
+    esac
+    ln "$gnulib_dir/$f" "$testdir/$g" 2>/dev/null ||
+    cp -p "$gnulib_dir/$f" "$testdir/$g"
   done
 
   # Create lib/Makefile.am.
@@ -346,7 +372,7 @@ func_create_testdir ()
    for module in $modules; do
      func_verify_module
      if test -n "$module"; then
-       func_get_automake_snippet "$module" | sed -e "s,lib_SOURCES,$libname"'_a_SOURCES,g'
+       func_get_automake_snippet "$module" | sed -e "s,lib_SOURCES,$libname"'_a_SOURCES,g' -e "s,lib_OBJECTS,$libname"'_a_OBJECTS,g'
        if test "$module" = 'alloca'; then
          echo "$libname"'_a_LIBADD += @ALLOCA@'
          echo '#'"$libname"'_la_LIBADD += @LTALLOCA@'
@@ -405,6 +431,10 @@ func_create_testdir ()
      echo "AC_GNU_SOURCE"
      echo
    fi
+   if grep gl_USE_SYSTEM_EXTENSIONS "$testdir"/m4/*.m4 > /dev/null; then
+     echo "gl_USE_SYSTEM_EXTENSIONS"
+     echo
+   fi
    for module in $modules; do
      func_verify_module
      if test -n "$module"; then
@@ -510,7 +540,9 @@ case $mode in
     if test -z "$destdir"; then
       func_fatal_error "please specify --dir option"
     fi
-    mkdir "$destdir" || func_fatal_error "could not create destination directory"
+    mkdir "$destdir"
+    test -d "$destdir" \
+      || func_fatal_error "could not create destination directory"
     func_create_testdir "$destdir" "$*"
     ;;
 
@@ -626,6 +658,16 @@ case $mode in
     done
     ;;
 
+  extract-maintainer )
+    for module
+    do
+      func_verify_module
+      if test -n "$module"; then
+        func_get_maintainer "$module"
+      fi
+    done
+    ;;
+
   * )
     func_fatal_error "unknown operation mode --$mode" ;;
 esac