[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.2-25-gf4b7d91

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=f4b7d918eff9770f09893b023fd834f5c0bc33d1

The branch, stable-2.0 has been updated
       via  f4b7d918eff9770f09893b023fd834f5c0bc33d1 (commit)
       via  0d2e3fc1e7095c7b64845b29ff01e2077329f127 (commit)
       via  8698e810078e3224e08a67540fd42ad51b46fdf1 (commit)
       via  3cf634fa7c7cf02238ef434e4a3c42d9abc64674 (commit)
      from  4f0ea6e3cef32d54c1a276945b8885433a137b7c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f4b7d918eff9770f09893b023fd834f5c0bc33d1
Author: Ludovic Courtès <address@hidden>
Date:   Sat Jul 23 22:23:59 2011 +0200

    guild: Close over `$bindir/guile'.
    
    * configure.ac: Substitute `guile_program_name'.
    
    * meta/guild.in: Use address@hidden@/@guile_program_name@' by default.
    
    * meta/uninstalled-env.in: Define $GUILE.

commit 0d2e3fc1e7095c7b64845b29ff01e2077329f127
Author: Ludovic Courtès <address@hidden>
Date:   Sat Jul 23 22:43:08 2011 +0200

    Change `guild --help' and `--version' output to be more GNUish.
    
    * meta/guild.in (display-version): Display the version, not the
      effective version.
    
    * module/scripts/help.scm (list-commands)[help]: Add proper footer, as
      per the GCS.

commit 8698e810078e3224e08a67540fd42ad51b46fdf1
Author: Ludovic Courtès <address@hidden>
Date:   Sat Jul 23 19:25:28 2011 +0200

    doc: Remove redundant footnote about the former name of `guild'.
    
    * doc/ref/scheme-using.texi (Using Guile Tools): Remove redundant
      footnote introduced in e108c961fed2ffdedddcd10bad9c6aae44491b1e.
      Mention the version where the new name was introduced.

commit 3cf634fa7c7cf02238ef434e4a3c42d9abc64674
Author: Ludovic Courtès <address@hidden>
Date:   Sat Jul 23 22:42:09 2011 +0200

    Export `main' from (scripts help).
    
    * module/scripts/help.scm: Export `main'.

-----------------------------------------------------------------------

Summary of changes:
 configure.ac              |    4 ++++
 doc/ref/scheme-using.texi |    8 +++-----
 meta/guild.in             |    8 +++++---
 meta/uninstalled-env.in   |    4 ++++
 module/scripts/help.scm   |   17 ++++++++++-------
 5 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index b629f5c..dc4ef56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1636,6 +1636,10 @@ pkgdatadir="$datadir/$PACKAGE_TARNAME"
 sitedir="$pkgdatadir/site/$GUILE_EFFECTIVE_VERSION"
 AC_SUBST([sitedir])
 
+dnl Name of the `guile' program.
+guile_program_name="`echo guile | "$SED" "$program_transform_name"`"
+AC_SUBST([guile_program_name])
+
 # Additional SCM_I_GSC definitions are above.
 AC_SUBST([SCM_I_GSC_GUILE_DEBUG])
 AC_SUBST([SCM_I_GSC_ENABLE_DEPRECATED])
diff --git a/doc/ref/scheme-using.texi b/doc/ref/scheme-using.texi
index 119e7f8..ccf5e1e 100644
--- a/doc/ref/scheme-using.texi
+++ b/doc/ref/scheme-using.texi
@@ -704,17 +704,15 @@ information.
 Guile also comes with a growing number of command-line utilities: a
 compiler, a disassembler, some module inspectors, and in the future, a
 system to install Guile packages from the internet.  These tools may be
-invoked using the @code{guild} address@hidden Guile version
-2.0.1, this program was known as @code{guile-tools}.  The
address@hidden executable is still installed as of 2.0.x but may be
-removed in a future stable series.}.
+invoked using the @code{guild} program.
 
 @example
 $ guild compile -o foo.go foo.scm
 wrote `foo.go'
 @end example
 
-This program used to be called @code{guile-tools}, and for backward
+This program used to be called @code{guile-tools} up to
+Guile version 2.0.1, and for backward
 compatibility it still may be called as such.  However we changed the
 name to @code{guild}, not only because it is pleasantly shorter and
 easier to read, but also because this tool will serve to bind Guile
diff --git a/meta/guild.in b/meta/guild.in
index be4e5b5..183323f 100755
--- a/meta/guild.in
+++ b/meta/guild.in
@@ -1,6 +1,8 @@
 #!/bin/sh
 # -*- scheme -*-
-exec guile $GUILE_FLAGS -e '(@@ (guild) main)' -s "$0" "$@"
+prefix="@prefix@"
+exec_prefix="@exec_prefix@"
+exec ${GUILE:address@hidden@/@address@hidden $GUILE_FLAGS -e '(@@ (guild) 
main)' -s "$0" "$@"
 !#
 
 ;;;; guild --- running scripts bundled with Guile
@@ -39,8 +41,8 @@ exec guile $GUILE_FLAGS -e '(@@ (guild) main)' -s "$0" "$@"
     (version (single-char #\v))))
 
 (define (display-version)
-  (version-etc "GNU Guile"
-               (effective-version)
+  (version-etc "@PACKAGE_NAME@"
+               (version)
                #:command-name "guild"
                #:license *LGPLv3+*))
 
diff --git a/meta/uninstalled-env.in b/meta/uninstalled-env.in
index 4faad64..2276b4a 100644
--- a/meta/uninstalled-env.in
+++ b/meta/uninstalled-env.in
@@ -136,4 +136,8 @@ if test "x${top_srcdir}" != "x${top_builddir}"; then
 fi
 export PATH
 
+# Define $GUILE, used by `guild'.
+GUILE="${top_builddir}/meta/guile"
+export GUILE
+
 exec "$@"
diff --git a/module/scripts/help.scm b/module/scripts/help.scm
index 665ba9f..107d394 100644
--- a/module/scripts/help.scm
+++ b/module/scripts/help.scm
@@ -28,7 +28,8 @@
 (define-module (scripts help)
   #:use-module (ice-9 format)
   #:use-module (ice-9 documentation)
-  #:use-module ((srfi srfi-1) #:select (fold append-map)))
+  #:use-module ((srfi srfi-1) #:select (fold append-map))
+  #:export (main))
 
 (define %summary "Show a brief help message.")
 
@@ -84,10 +85,7 @@
 (define (list-commands all?)
   (display "\
 Usage: guild COMMAND [ARGS]
-
-  guild runs command-line scripts provided by GNU Guile and related
-  programs.  See \"Using Guile Tools\" in the Guile manual, for more
-  information.
+Run command-line scripts provided by GNU Guile and related programs.
 
 Commands:
 ")
@@ -106,9 +104,14 @@ Commands:
                (format #t "  ~A ~23t~a\n" name summary)
                (format #t "  ~A\n" name)))))
    (find-submodules '(scripts)))
-  (display "
+  (format #t "
 For help on a specific command, try \"guild help COMMAND\".
-"))
+
+Report guild bugs to ~a
+GNU Guile home page: <http://www.gnu.org/software/guile/>
+General help using GNU software: <http://www.gnu.org/gethelp/>
+For complete documentation, run: info guile 'Using Guile Tools'
+" %guile-bug-report-address))
 
 (define (module-commentary mod)
   (file-commentary


hooks/post-receive
-- 
GNU Guile