X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=gnulib-tool;h=36b4aad783ee4181c2591febe6970dcb787e4af0;hb=b0d9d3aa695aebab5ebc0fb02ebeac9e59f57242;hp=cd73eb15230f499cc4a25962465c49b3bc221422;hpb=9b554ac4ad67b6d068aa8a395f79c8781c8afe2f;p=gnulib.git diff --git a/gnulib-tool b/gnulib-tool index cd73eb152..36b4aad78 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -22,7 +22,7 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2007-01-27 13:53:54 $' +cvsdatestamp='$Date: 2007-03-11 22:11:22 $' last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` nl=' @@ -93,6 +93,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-link-directive module gnulib-tool --extract-license module gnulib-tool --extract-maintainer module gnulib-tool --extract-tests-module module @@ -117,6 +118,7 @@ Operation modes: --extract-autoconf-snippet extract the snippet for configure.ac --extract-automake-snippet extract the snippet for library makefile --extract-include-directive extract the #include directive + --extract-link-directive extract the linker directive --extract-license report the license terms of the source files under lib/ --extract-maintainer report the maintainer(s) inside gnulib @@ -888,9 +890,11 @@ sed_extract_prog=':[ ]*$/ { s/^Description:[ ]*$// s/^Files:[ ]*$// s/^Depends-on:[ ]*$// + s/^configure\.ac-early:[ ]*$// s/^configure\.ac:[ ]*$// s/^Makefile\.am:[ ]*$// s/^Include:[ ]*$// + s/^Link:[ ]*$// s/^License:[ ]*$// s/^Maintainer:[ ]*$// tb @@ -936,6 +940,15 @@ func_get_dependencies () sed -n -e "/^Depends-on$sed_extract_prog" < "$lookedup_file" } +# func_get_autoconf_early_snippet module +# Input: +# - local_gnulib_dir from --local-dir +func_get_autoconf_early_snippet () +{ + func_lookup_file "modules/$1" + sed -n -e "/^configure\.ac-early$sed_extract_prog" < "$lookedup_file" +} + # func_get_autoconf_snippet module # Input: # - local_gnulib_dir from --local-dir @@ -995,12 +1008,17 @@ func_get_automake_snippet () # If some .c file exists and is not used with AC_LIBOBJ - for example, # a .c file is preprocessed into another .c file for BUILT_SOURCES -, # automake will generate a useless dependency; this is harmless. - sed_extract_c_files='/\.c$/p' - extra_files=`echo "$extra_files" | sed -n -e "$sed_extract_c_files"` - if test -n "$extra_files"; then - echo "EXTRA_lib_SOURCES +=" $extra_files - echo - fi + case "$1" in + relocatable-prog-wrapper) ;; + *) + sed_extract_c_files='/\.c$/p' + extra_files=`echo "$extra_files" | sed -n -e "$sed_extract_c_files"` + if test -n "$extra_files"; then + echo "EXTRA_lib_SOURCES +=" $extra_files + echo + fi + ;; + esac ;; esac } @@ -1015,6 +1033,15 @@ func_get_include_directive () sed -e 's/^\(["<]\)/#include \1/' } +# func_get_link_directive module +# Input: +# - local_gnulib_dir from --local-dir +func_get_link_directive () +{ + func_lookup_file "modules/$1" + sed -n -e "/^Link$sed_extract_prog" < "$lookedup_file" +} + # func_get_license module # Input: # - local_gnulib_dir from --local-dir @@ -1287,7 +1314,7 @@ func_emit_lib_Makefile_am () echo "AM_CPPFLAGS =" fi echo - if grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *= *$libname\\.$libext\$" allsnippets.tmp > /dev/null; then + if LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *= *$libname\\.$libext\$" allsnippets.tmp > /dev/null; then # One of the snippets already specifies an installation location for the # library. Don't confuse automake by saying it should not be installed. : @@ -2095,12 +2122,13 @@ func_import () if grep AC_GNU_SOURCE "$destdir"/$m4base/*.m4 >/dev/null 2>/dev/null; then echo " AC_REQUIRE([AC_GNU_SOURCE])" fi - if grep gl_USE_SYSTEM_EXTENSIONS "$destdir"/$m4base/*.m4 >/dev/null 2>/dev/null; then - echo " AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])" - fi - if grep gl_LOCK "$destdir"/$m4base/*.m4 >/dev/null 2>/dev/null; then - echo " AC_REQUIRE([gl_LOCK_EARLY])" - fi + for module in $modules; do + func_verify_module + if test -n "$module"; then + func_get_autoconf_early_snippet "$module" + fi + done \ + | sed -e '/^$/d;' -e 's/^/ /' echo "])" echo echo "# This macro should be invoked from $configure_ac, in the section" @@ -2147,7 +2175,7 @@ func_import () # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is # created using libtool, because libtool already handles the dependencies. if test "$libtool" != true; then - libname_upper=`echo "$libname" | tr 'a-z' 'A-Z'` + libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z' 'A-Z'` echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\"" echo " AC_SUBST([${libname_upper}_LIBDEPS])" echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\"" @@ -2252,6 +2280,19 @@ func_import () ) | sed -e '/^$/d' -e 's/^/ /' rm -f "$tmp"/include-angles "$tmp"/include-quotes "$tmp"/include-if + for module in $modules; do + func_get_link_directive "$module" + done \ + | LC_ALL=C sort -u | sed -e '/^$/d' -e 's/^/ /' > "$tmp"/link + if test `wc -l < "$tmp"/link` != 0; then + echo + echo "You may need to use the following Makefile variables when linking." + echo "Use them in _LDADD when linking a program, or" + echo "in _a_LDFLAGS or _la_LDFLAGS when linking a library." + cat "$tmp"/link + fi + rm -f "$tmp"/link + echo echo "Don't forget to" if test "$makefile_am" = Makefile.am; then @@ -2453,14 +2494,13 @@ func_create_testdir () echo "AC_GNU_SOURCE" echo fi - if grep gl_USE_SYSTEM_EXTENSIONS "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then - echo "gl_USE_SYSTEM_EXTENSIONS" - echo - fi - if grep gl_LOCK "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then - echo "gl_LOCK_EARLY" - echo - fi + for module in $modules; do + func_verify_module + if test -n "$module"; then + func_get_autoconf_early_snippet "$module" + fi + done \ + | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/' if test "$libtool" = true; then echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" echo "gl_cond_libtool=true" @@ -2508,7 +2548,7 @@ func_create_testdir () # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is # created using libtool, because libtool already handles the dependencies. if test "$libtool" != true; then - libname_upper=`echo "$libname" | tr 'a-z' 'A-Z'` + libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z' 'A-Z'` echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\"" echo " AC_SUBST([${libname_upper}_LIBDEPS])" echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\"" @@ -2573,14 +2613,13 @@ func_create_testdir () echo "AC_GNU_SOURCE" echo fi - if grep gl_USE_SYSTEM_EXTENSIONS "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then - echo "gl_USE_SYSTEM_EXTENSIONS" - echo - fi - if grep gl_LOCK "$testdir/$m4base"/*.m4 >/dev/null 2>/dev/null; then - echo "gl_LOCK_EARLY" - echo - fi + for module in $modules; do + func_verify_nontests_module + if test -n "$module"; then + func_get_autoconf_early_snippet "$module" + fi + done \ + | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/' if test "$libtool" = true; then echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])" echo "gl_cond_libtool=true" @@ -2621,7 +2660,7 @@ func_create_testdir () # _LIBDEPS and _LTLIBDEPS variables are not needed if this library is # created using libtool, because libtool already handles the dependencies. if test "$libtool" != true; then - libname_upper=`echo "$libname" | tr 'a-z' 'A-Z'` + libname_upper=`echo "$libname" | LC_ALL=C tr 'a-z' 'A-Z'` echo " ${libname_upper}_LIBDEPS=\"\$gl_libdeps\"" echo " AC_SUBST([${libname_upper}_LIBDEPS])" echo " ${libname_upper}_LTLIBDEPS=\"\$gl_ltlibdeps\"" @@ -2700,10 +2739,10 @@ func_create_testdir () fi # Need to run configure and make once, to create built files that are to be # distributed (such as getdate.c). - # Extract the value of "CLEANFILES += ...". + # Extract the value of "CLEANFILES += ..." and "MOSTLYCLEANFILES += ...". cleaned_files=`sed -e "$sed_remove_backslash_newline" < "$testdir/$sourcebase/Makefile.am" \ - | sed -n -e 's,^CLEANFILES[ ]*+=\([^#]*\).*$,\1,p'` - cleaned_files=" "`for file in $cleaned_files; do echo "$file"; done`" " + | sed -n -e 's,^CLEANFILES[ ]*+=\([^#]*\).*$,\1,p' -e 's,^MOSTLYCLEANFILES[ ]*+=\([^#]*\).*$,\1,p'` + cleaned_files=`for file in $cleaned_files; do echo " $file "; done` # Extract the value of "BUILT_SOURCES += ...". Remove variable references # such $(FOO_H) because they don't refer to distributed files. sed_remove_make_variables='s,[$]([A-Za-z0-9_]*),,g' @@ -2753,12 +2792,50 @@ func_create_megatestdir () func_create_testdir "$megatestdir/ALL" "$allmodules" func_append megasubdirs "ALL" + # Create autobuild. + cvsdate=`sh "$gnulib_dir/build-aux/mdate-sh" "$gnulib_dir/CVS/Entries" \ + | sed -e 's,January,01,' -e 's,Jan,01,' \ + -e 's,February,02,' -e 's,Feb,02,' \ + -e 's,March,03,' -e 's,Mar,03,' \ + -e 's,April,04,' -e 's,Apr,04,' \ + -e 's,May,05,' \ + -e 's,June,06,' -e 's,Jun,06,' \ + -e 's,July,07,' -e 's,Jul,07,' \ + -e 's,August,08,' -e 's,Aug,08,' \ + -e 's,September,09,' -e 's,Sep,09,' \ + -e 's,October,10,' -e 's,Oct,10,' \ + -e 's,November,11,' -e 's,Nov,11,' \ + -e 's,December,12,' -e 's,Dec,12,' \ + | sed -e 's,^,00,' | sed -e 's,^[0-9]*\([0-9][0-9] \),\1,' \ + | sed -e 's,^\([0-9]*\) \([0-9]*\) \([0-9]*\),\3\2\1,'` + (echo '#!/bin/sh' + echo "CVSDATE=$cvsdate" + echo "test -d logs || mkdir logs" + echo "for module in $megasubdirs; do" + echo " echo \"Working on module \$module...\"" + echo " safemodule=\`echo \$module | sed -e 's|/|-|g'\`" + echo " (echo \"To: gnulib@autobuild.josefsson.org\"" + echo " echo" + echo " set -x" + echo " : autobuild project... \$module" + echo " : autobuild revision... cvs-\$CVSDATE-000000" + echo " : autobuild timestamp... \`date \"+%Y%m%d-%H%M%S\"\`" + echo " : autobuild hostname... \`hostname\`" + echo " cd \$module && ./configure && make && make check" + echo " echo rc=\$?" + echo " ) 2>&1 | sed -e \"\$AUTOBUILD_SUBST\" > logs/\$safemodule" + echo "done" + ) > "$megatestdir/autobuild" + chmod a+x "$megatestdir/autobuild" + # Create Makefile.am. (echo "## Process this file with automake to produce Makefile.in." echo echo "AUTOMAKE_OPTIONS = 1.5 foreign" echo echo "SUBDIRS = $megasubdirs" + echo + echo "EXTRA_DIST = autobuild" ) > "$megatestdir/Makefile.am" # Create configure.ac. @@ -2859,7 +2936,7 @@ case $mode in m4dirs= m4dirs_count=0 if test -f "$destdir"/Makefile.am; then - aclocal_amflags=`grep '^ACLOCAL_AMFLAGS[ ]*=' "$destdir"/Makefile.am | sed -e 's/^ACLOCAL_AMFLAGS[ ]*=\(.*\)$/\1/'` + aclocal_amflags=`sed -n 's/^ACLOCAL_AMFLAGS[ ]*=\(.*\)$/\1/p' "$destdir"/Makefile.am` m4dir_is_next= for arg in $aclocal_amflags; do if test -n "$m4dir_is_next"; then @@ -2873,6 +2950,7 @@ case $mode in fi ;; esac + m4dir_is_next= else if test "X$arg" = "X-I"; then m4dir_is_next=yes @@ -3055,6 +3133,16 @@ case $mode in done ;; + extract-link-directive ) + for module + do + func_verify_module + if test -n "$module"; then + func_get_link_directive "$module" + fi + done + ;; + extract-license ) for module do