octave-nkf/gnulib-hg: gnulib-tool comparison

comparison gnulib-tool @ 7213:0f2957c42e86

Save the --local-dir value in the cache file.

author	Bruno Haible <bruno@clisp.org>
date	Mon, 28 Aug 2006 15:14:35 +0000
parents	232ee448d272
children	eb43edab28c3

comparison

equal deleted inserted replaced

-:232ee448d272
+:0f2957c42e86
 # This program is meant for authors or maintainers which want to import
 # modules from gnulib into their packages.
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2006-08-28 15:12:52 $'
+cvsdatestamp='$Date: 2006-08-28 15:14:35 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 # You can set AUTOCONFPATH to empty if autoconf 2.57 is already in your PATH.
 AUTOCONFPATH=
 rm -f "$2"
 ln -s "$1" "$2"
 fi
 }
+# func_relativize DIR1 DIR2
+# computes a relative pathname RELDIR such that DIR1/RELDIR = DIR2.
+# Input:
+# - DIR1            relative pathname, relative to the current directory
+# - DIR2            relative pathname, relative to the current directory
+# Output:
+# - reldir          relative pathname of DIR2, relative to DIR1
+func_relativize ()
+{
+dir0=`pwd`
+dir1="$1"
+dir2="$2"
+sed_first='s,^\([^/]*\)/.*$,\1,'
+sed_rest='s,^[^/]*/*,,'
+sed_last='s,^.*/\([^/]*\)$,\1,'
+sed_butlast='s,/*[^/]*$,,'
+while test -n "$dir1"; do
+first=`echo "$dir1" | sed -e "$sed_first"`
+if test "$first" != "."; then
+if test "$first" = ".."; then
+dir2=`echo "$dir0" | sed -e "$sed_last"`/"$dir2"
+dir0=`echo "$dir0" | sed -e "$sed_butlast"`
+else
+first2=`echo "$dir2" | sed -e "$sed_first"`
+if test "$first2" = "$first"; then
+dir2=`echo "$dir2" | sed -e "$sed_rest"`
+else
+dir2="../$dir2"
+fi
+dir0="$dir0"/"$first"
+fi
+fi
+dir1=`echo "$dir1" | sed -e "$sed_rest"`
+done
+reldir="$dir2"
+}
+# func_relconcat DIR1 DIR2
+# computes a relative pathname DIR1/DIR2, with obvious simplifications.
+# Input:
+# - DIR1            relative pathname, relative to the current directory
+# - DIR2            relative pathname, relative to DIR1
+# Output:
+# - relconcat       DIR1/DIR2, relative to the current directory
+func_relconcat ()
+{
+dir1="$1"
+dir2="$2"
+sed_first='s,^\([^/]*\)/.*$,\1,'
+sed_rest='s,^[^/]*/*,,'
+sed_last='s,^.*/\([^/]*\)$,\1,'
+sed_butlast='s,/*[^/]*$,,'
+while true; do
+first=`echo "$dir2" | sed -e "$sed_first"`
+if test "$first" = "."; then
+dir2=`echo "$dir2" | sed -e "$sed_rest"`
+if test -z "$dir2"; then
+relconcat="$dir1"
+break
+fi
+else
+last=`echo "$dir1" | sed -e "$sed_last"`
+while test "$last" = "."; do
+dir1=`echo "$dir1" | sed -e "$sed_butlast"`
+last=`echo "$dir1" | sed -e "$sed_last"`
+done
+if test -z "$dir1"; then
+relconcat="$dir2"
+break
+fi
+if test "$first" = ".."; then
+if test "$last" = ".."; then
+relconcat="$dir1/$dir2"
+break
+fi
+dir1=`echo "$dir1" | sed -e "$sed_butlast"`
+dir2=`echo "$dir2" | sed -e "$sed_rest"`
+if test -z "$dir1"; then
+relconcat="$dir2"
+break
+fi
+if test -z "$dir2"; then
+relconcat="$dir1"
+break
+fi
+else
+relconcat="$dir1/$dir2"
+break
+fi
+fi
+done
+}
 # Command-line option processing.
 # Removes the OPTIONS from the arguments. Sets the variables:
 # - mode            list or import or create-testdir or create-megatestdir
 # - destdir         from --dir
 # - libname, supplied_libname  from --lib
 echo "Try 'gnulib-tool --help' for more information." 1>&2
 echo "If you really want to modify the gnulib configuration of your project," 1>&2
 echo "you need to use 'gnulib --import' - at your own risk!" 1>&2
 exit 1
 fi
-if test -n "$supplied_libname" || test -n "$sourcebase" || test -n "$m4base" \
+if test -n "$local_gnulib_dir" || test -n "$supplied_libname" \
+|| test -n "$sourcebase" || test -n "$m4base" \
 || test -n "$docbase" || test -n "$testsbase" || test -n "$auxdir" \
 || test -n "$inctests" || test -n "$avoidlist" || test -n "$lgpl" \
 || test -n "$macro_prefix"; then
 echo "gnulib-tool: invalid options for 'update' mode" 1>&2
 echo "Try 'gnulib-tool --help' for more information." 1>&2
 esac
 # Remove trailing slashes from the directory names. This is necessary for
 # m4base (to avoid an error in func_import) and optional for the others.
 sed_trimtrailingslashes='s,\([^/]\)//*$,\1,'
+case "$local_gnulib_dir" in
+*/ ) sourcebase=`echo "$local_gnulib_dir" | sed -e "$sed_trimtrailingslashes"` ;;
+esac
 case "$sourcebase" in
 */ ) sourcebase=`echo "$sourcebase" | sed -e "$sed_trimtrailingslashes"` ;;
 esac
 case "$m4base" in
 */ ) m4base=`echo "$m4base" | sed -e "$sed_trimtrailingslashes"` ;;
 # - doit            : if actions shall be executed, false if only to be printed
 # - symbolic        true if files should be symlinked, copied otherwise
 func_import ()
 {
 # Get the cached settings.
+cached_local_gnulib_dir=
 cached_specified_modules=
 cached_avoidlist=
 cached_sourcebase=
 cached_m4base=
 cached_docbase=
 cached_libtool=false
 my_sed_traces='
 s,#.*$,,
 s,^dnl .*$,,
 s, dnl .*$,,
+/gl_LOCAL_DIR(/ {
+s,^.*gl_LOCAL_DIR([[ ]*\([^])]*\).*$,cached_local_gnulib_dir="\1",p
+}
 /gl_MODULES(/ {
 s,^.*gl_MODULES([[ ]*\([^])]*\).*$,cached_specified_modules="\1",p
 }
 /gl_AVOID(/ {
 s,^.*gl_AVOID([[ ]*\([^])]*\).*$,cached_avoidlist="\1",p
 # Merge the cached settings with the specified ones.
 # The m4base must be the same as expected from the pathname.
 if test -n "$cached_m4base" && test "$cached_m4base" != "$m4base"; then
 func_fatal_error "$m4base/gnulib-cache.m4 is expected to contain gl_M4_BASE([$m4base])"
 fi
+# The local_gnulib_dir defaults to the cached one. Recall that the cached one
+# is relative to $destdir, whereas the one we use is relative to . or absolute.
+if test -z "$local_gnulib_dir"; then
+if test -n "$cached_local_gnulib_dir"; then
+case "$destdir" in
+/*)
+local_gnulib_dir="$destdir/$cached_local_gnulib_dir" ;;
+*)
+case "$cached_local_gnulib_dir" in
+/*)
+local_gnulib_dir="$destdir/$cached_local_gnulib_dir" ;;
+*)
+func_relconcat "$destdir" "$cached_local_gnulib_dir"
+local_gnulib_dir="$relconcat" ;;
+esac ;;
+esac
+fi
+fi
 # Append the cached and the specified module names. So that
 # "gnulib-tool --import foo" means to add the module foo.
 specified_modules="$cached_specified_modules $1"
 # Append the cached and the specified avoidlist. This is probably better
 # than dropping the cached one when --avoid is specified at least once.
 done
 # Command-line invocation printed in a comment in generated gnulib-cache.m4.
 actioncmd="gnulib-tool --import"
 actioncmd="$actioncmd --dir=$destdir"
+if test -n "$local_gnulib_dir"; then
+actioncmd="$actioncmd --local-dir=$local_gnulib_dir"
+fi
 actioncmd="$actioncmd --lib=$libname"
 actioncmd="$actioncmd --source-base=$sourcebase"
 actioncmd="$actioncmd --m4-base=$m4base"
 actioncmd="$actioncmd --doc-base=$docbase"
 actioncmd="$actioncmd --aux-dir=$auxdir"
 echo
 echo "# Specification in the form of a command-line invocation:"
 echo "#   $actioncmd"
 echo
 echo "# Specification in the form of a few gnulib-tool.m4 macro invocations:"
+# Store the local_gnulib_dir relative to destdir.
+case "$local_gnulib_dir" in
+"" | /*)
+relative_local_gnulib_dir="$local_gnulib_dir" ;;
+* )
+case "$destdir" in
+/*) relative_local_gnulib_dir="$local_gnulib_dir" ;;
+*)
+# destdir, local_gnulib_dir are both relative.
+func_relativize "$destdir" "$local_gnulib_dir"
+relative_local_gnulib_dir="$reldir" ;;
+esac ;;
+esac
+echo "gl_LOCAL_DIR([$relative_local_gnulib_dir])"
 echo "gl_MODULES(["`echo $specified_modules`"])"
 echo "gl_AVOID([$avoidlist])"
 echo "gl_SOURCE_BASE([$sourcebase])"
 echo "gl_M4_BASE([$m4base])"
 echo "gl_DOC_BASE([$docbase])"

Mercurial > hg > octave-nkf > gnulib-hg

comparison gnulib-tool @ 7213:0f2957c42e86