Mostly comment updates. 2006-08-27 Bruno Haible <[EMAIL PROTECTED]>
* gnulib-tool (func_get_tests_module): Don't assume that $gnulib_dir is the current directory. Respect also $local_gnulib_dir. *** gnulib-20060823/gnulib-tool 2006-08-27 01:48:40.000000000 +0200 --- gnulib-20060823-modified/gnulib-tool 2006-08-27 16:24:50.000000000 +0200 *************** *** 675,680 **** --- 675,682 ---- # func_lookup_file file # looks up a file in $local_gnulib_dir or $gnulib_dir, or combines it through # 'patch'. + # Input: + # - local_gnulib_dir from --local-dir # Output: # - lookedup_file name of the merged (combined) file # - lookedup_tmp true if it is located in the tmp directory, blank otherwise *************** *** 705,710 **** --- 707,714 ---- } # func_all_modules + # Input: + # - local_gnulib_dir from --local-dir func_all_modules () { # Filter out metainformation files like README, which are not modules. *************** *** 724,729 **** --- 728,736 ---- # func_verify_module # verifies a module name + # Input: + # - local_gnulib_dir from --local-dir + # - module module name argument func_verify_module () { if { test -f "$gnulib_dir/modules/$module" \ *************** *** 746,751 **** --- 753,761 ---- # func_verify_nontests_module # verifies a module name, excluding tests modules + # Input: + # - local_gnulib_dir from --local-dir + # - module module name argument func_verify_nontests_module () { case "$module" in *************** *** 756,761 **** --- 766,774 ---- # func_verify_tests_module # verifies a module name, considering only tests modules + # Input: + # - local_gnulib_dir from --local-dir + # - module module name argument func_verify_tests_module () { case "$module" in *************** *** 782,787 **** --- 795,802 ---- }' # func_get_description module + # Input: + # - local_gnulib_dir from --local-dir func_get_description () { func_lookup_file "modules/$1" *************** *** 789,794 **** --- 804,811 ---- } # func_get_filelist module + # Input: + # - local_gnulib_dir from --local-dir func_get_filelist () { func_lookup_file "modules/$1" *************** *** 802,807 **** --- 819,826 ---- } # func_get_dependencies module + # Input: + # - local_gnulib_dir from --local-dir func_get_dependencies () { # ${module}-tests always implicitly depends on ${module}. *************** *** 812,817 **** --- 831,838 ---- } # func_get_autoconf_snippet module + # Input: + # - local_gnulib_dir from --local-dir func_get_autoconf_snippet () { func_lookup_file "modules/$1" *************** *** 819,824 **** --- 840,847 ---- } # func_get_automake_snippet module + # Input: + # - local_gnulib_dir from --local-dir func_get_automake_snippet () { func_lookup_file "modules/$1" *************** *** 826,831 **** --- 849,856 ---- } # func_get_include_directive module + # Input: + # - local_gnulib_dir from --local-dir func_get_include_directive () { func_lookup_file "modules/$1" *************** *** 834,839 **** --- 859,866 ---- } # func_get_license module + # Input: + # - local_gnulib_dir from --local-dir func_get_license () { func_lookup_file "modules/$1" *************** *** 841,846 **** --- 868,875 ---- } # func_get_maintainer module + # Input: + # - local_gnulib_dir from --local-dir func_get_maintainer () { func_lookup_file "modules/$1" *************** *** 848,857 **** } # func_get_tests_module module func_get_tests_module () { # The naming convention for tests modules is hardwired: ${module}-tests. ! if test -f modules/"$1"-tests; then echo "$1"-tests fi } --- 877,890 ---- } # func_get_tests_module module + # Input: + # - local_gnulib_dir from --local-dir func_get_tests_module () { # The naming convention for tests modules is hardwired: ${module}-tests. ! if test -f "$gnulib_dir/modules/$1"-tests \ ! || { test -n "$local_gnulib_dir" && test -d "$local_gnulib_dir/modules" \ ! && test -f "$local_gnulib_dir/modules/$1"-tests; }; then echo "$1"-tests fi } *************** *** 872,877 **** --- 905,911 ---- # func_modules_transitive_closure # Input: + # - local_gnulib_dir from --local-dir # - modules list of specified modules # - inctests true if tests should be included, blank otherwise # - avoidlist list of modules to avoid *************** *** 922,927 **** --- 956,962 ---- # func_modules_add_dummy # Input: + # - local_gnulib_dir from --local-dir # - modules list of modules, including dependencies # Output: # - modules list of modules, including 'dummy' if needed *************** *** 956,961 **** --- 991,997 ---- # func_modules_to_filelist # Input: + # - local_gnulib_dir from --local-dir # - modules list of modules, including dependencies # Output: # - files list of files *************** *** 974,979 **** --- 1010,1016 ---- # func_emit_lib_Makefile_am # emits the contents of lib/Makefile.am to standard output. # Input: + # - local_gnulib_dir from --local-dir # - modules list of modules, including dependencies # - libname library name # - libtool true if libtool will be used, false or blank otherwise *************** *** 1066,1071 **** --- 1103,1109 ---- # func_emit_tests_Makefile_am # emits the contents of tests/Makefile.am to standard output. # Input: + # - local_gnulib_dir from --local-dir # - modules list of modules, including dependencies # - libname library name # - libtool true if libtool will be used, false or blank otherwise *************** *** 1153,1158 **** --- 1191,1197 ---- # func_import modules # Uses also the variables # - destdir target directory + # - local_gnulib_dir from --local-dir # - libname library name # - sourcebase directory relative to destdir where to place source code # - m4base directory relative to destdir where to place *.m4 macros *************** *** 1849,1854 **** --- 1888,1894 ---- # func_create_testdir testdir modules # Input: + # - local_gnulib_dir from --local-dir # - auxdir directory relative to destdir where to place build aux files func_create_testdir () { *************** *** 2128,2133 **** --- 2168,2174 ---- # func_create_megatestdir megatestdir allmodules # Input: + # - local_gnulib_dir from --local-dir # - auxdir directory relative to destdir where to place build aux files func_create_megatestdir () {