[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.0-132-gc6e0539

[Neil Jerram]

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=c6e05396dc73c3bcfa71b92b4689e8cb6d4588eb

The branch, stable-2.0 has been updated
       via  c6e05396dc73c3bcfa71b92b4689e8cb6d4588eb (commit)
       via  6b8bc6f8b507928f9b0bd71000f5132c984db798 (commit)
       via  aab99f7b8b74204993c7b9f8bc4ac3703551028b (commit)
       via  08e6b25ca2184bed67d38be4db26561ee713b290 (commit)
       via  29ee01c009c46969a6b5570daf0a021a541c2d17 (commit)
      from  7f22442b2af85ea9db89c84fbd3acb6a96ee13fd (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 c6e05396dc73c3bcfa71b92b4689e8cb6d4588eb
Author: Neil Jerram <address@hidden>
Date:   Mon Mar 21 09:05:59 2011 +0000

    Remove statements about scripts/* that are no longer true
    
    * doc/ref/tools.texi (Executable Modules): Say "guile-tools modules"
      instead of "executable modules".  Remove obsolete statements about
      not ending in .scm, being executable, and beginning with shell
      script invocation sequence.
    
    * module/scripts/README: Ditto.

commit 6b8bc6f8b507928f9b0bd71000f5132c984db798
Author: Neil Jerram <address@hidden>
Date:   Sun Mar 20 23:50:22 2011 +0000

    Inline the effect of am/pre-inst-guile
    
    It's just one variable definition, and in my opinion it confuses,
    rather than helps, the overall build picture to have two names
    (preinstguile and meta/guile) for the same thing.
    
    * am/Makefile.am (am_frags): Remove pre-inst-guile.
    
    * am/pre-inst-guile: Deleted.
    
    * doc/ref/Makefile.am: Don't include am/pre-inst-guile.
      ($(snarf_doc).am, $(snarf_doc).texi): Expand $(preinstguile).
    
    * module/Makefile.am (ice-9/psyntax-pp.scm.gen): Don't include
      am/pre-inst-guile.
      (ice-9/psyntax-pp.scm.gen): Expand $(preinstguile).

commit aab99f7b8b74204993c7b9f8bc4ac3703551028b
Author: Neil Jerram <address@hidden>
Date:   Sun Mar 20 23:02:33 2011 +0000

    Make explicit that GUILE_FOR_BUILD is only used when cross-compiling
    
    * configure.ac (GUILE_FOR_BUILD): Change normal build value to
      'this-value-will-never-be-used'.

commit 08e6b25ca2184bed67d38be4db26561ee713b290
Author: Neil Jerram <address@hidden>
Date:   Sun Mar 20 22:48:33 2011 +0000

    GUILE_FOR_BUILD is only needed by meta/guile.in, not by Makefiles
    
    * configure.ac: Use AM_SUBST_NOTMAKE for GUILE_FOR_BUILD instead of
      AC_SUBST.

commit 29ee01c009c46969a6b5570daf0a021a541c2d17
Author: Neil Jerram <address@hidden>
Date:   Sun Mar 20 22:27:38 2011 +0000

    Remove unused definition of preinstguiletool
    
    * am/pre-inst-guile (preinstguiletool): Removed.

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

Summary of changes:
 am/Makefile.am        |    2 +-
 am/pre-inst-guile     |   34 ----------------------------------
 configure.ac          |    4 ++--
 doc/ref/Makefile.am   |    7 +++----
 doc/ref/tools.texi    |   33 +++++++--------------------------
 module/Makefile.am    |    3 +--
 module/scripts/README |   23 +++++------------------
 7 files changed, 19 insertions(+), 87 deletions(-)
 delete mode 100644 am/pre-inst-guile

diff --git a/am/Makefile.am b/am/Makefile.am
index d1b7ecc..e2044d6 100644
--- a/am/Makefile.am
+++ b/am/Makefile.am
@@ -21,7 +21,7 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-am_frags = pre-inst-guile maintainer-dirs guilec
+am_frags = maintainer-dirs guilec
 
 EXTRA_DIST = $(am_frags) ChangeLog-2008
 
diff --git a/am/pre-inst-guile b/am/pre-inst-guile
deleted file mode 100644
index 7993d15..0000000
--- a/am/pre-inst-guile
+++ /dev/null
@@ -1,34 +0,0 @@
-## am/pre-inst-guile --- define preinstguile and preinstguiletool vars
-
-##     Copyright (C) 2002, 2006 Free Software Foundation
-##
-##   This file is part of GUILE.
-##
-##   GUILE is free software; you can redistribute it and/or modify
-##   it under the terms of the GNU Lesser General Public License as
-##   published by the Free Software Foundation; either version 3, or
-##   (at your option) any later version.
-##
-##   GUILE is distributed in the hope that it will be useful, but
-##   WITHOUT ANY WARRANTY; without even the implied warranty of
-##   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-##   GNU Lesser General Public License for more details.
-##
-##   You should have received a copy of the GNU Lesser General Public
-##   License along with GUILE; see the file COPYING.LESSER.  If not, write
-##   to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-##   Floor, Boston, MA 02110-1301 USA
-
-## Commentary:
-
-## This fragment defines two variables: preinstguile, preinstguiletool.
-## It can be included in any Makefile.am by adding the line:
-##   include $(top_srcdir)/am/pre-inst-guile
-## See devel/build/pre-inst-guile.text (CVS only) for more info.
-
-## Code:
-
-preinstguile     = $(top_builddir_absolute)/meta/guile
-preinstguiletool = GUILE="$(preinstguile)" $(top_srcdir)/scripts
-
-## am/pre-inst-guile ends here
diff --git a/configure.ac b/configure.ac
index 6f24d8d..a254634 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1494,7 +1494,7 @@ if test "$cross_compiling" = "yes"; then
   AC_MSG_CHECKING(guile for build)
   GUILE_FOR_BUILD="${GUILE_FOR_BUILD-guile}"
 else
-  GUILE_FOR_BUILD='$(preinstguile)'
+  GUILE_FOR_BUILD='this-value-will-never-be-used'
 fi   
 
 ## AC_MSG_CHECKING("if we are cross compiling")
@@ -1503,7 +1503,7 @@ if test "$cross_compiling" = "yes"; then
    AC_MSG_RESULT($GUILE_FOR_BUILD)
 fi
 AC_ARG_VAR(GUILE_FOR_BUILD,[guile for build system])
-AC_SUBST(GUILE_FOR_BUILD)
+AM_SUBST_NOTMAKE(GUILE_FOR_BUILD)
                        
 ## If we're using GCC, ask for aggressive warnings.
 GCC_CFLAGS=""
diff --git a/doc/ref/Makefile.am b/doc/ref/Makefile.am
index c154f42..0359380 100644
--- a/doc/ref/Makefile.am
+++ b/doc/ref/Makefile.am
@@ -111,8 +111,6 @@ noinst_DATA = $(PICTURES)
 
 EXTRA_DIST = ChangeLog-2008 $(PICTURES)
 
-include $(top_srcdir)/am/pre-inst-guile
-
 # Automated snarfing
 
 autoconf.texi: autoconf-macros.texi
@@ -129,7 +127,8 @@ snarf_doc = standard-library
 $(snarf_doc).am: $(snarf_doc).scm
        GUILE_AUTO_COMPILE=0 ;                                                  
\
        variable="`echo $(snarf_doc) | tr - _`_scm_files" ;                     
\
-       "$(preinstguile)" -l "$(srcdir)/$(snarf_doc).scm" -c "                  
\
+       "$(top_builddir_absolute)/meta/guile" -l "$(srcdir)/$(snarf_doc).scm"   
\
+        -c "                                                                   
\
         (format #t \"# Automatically generated, do not edit.~%\")              
\
         (format #t \"$$variable = \")                                          
\
         (for-each (lambda (m)                                                  
\
@@ -143,7 +142,7 @@ include standard-library.am
 
 $(snarf_doc).texi: $(standard_library_scm_files)
        GUILE_AUTO_COMPILE=0                            \
-       "$(preinstguile)" "$(srcdir)/make-texinfo.scm"  \
+       "$(top_builddir_absolute)/meta/guile" "$(srcdir)/make-texinfo.scm"      
\
          "$(abs_srcdir)/$(snarf_doc).scm" > "address@hidden"
        mv "address@hidden" "$@"
 
diff --git a/doc/ref/tools.texi b/doc/ref/tools.texi
index 2f4f59a..7a98884 100644
--- a/doc/ref/tools.texi
+++ b/doc/ref/tools.texi
@@ -303,14 +303,11 @@ is rather byzantine, so for now @emph{NO} doc snarfing 
programs are installed.
 @cindex executable modules
 @cindex scripts
 
-When Guile is installed, in addition to the @code{(ice-9 FOO)} modules,
-a set of @dfn{executable modules} @code{(scripts BAR)} is also installed.
-Each is a regular Scheme module that has some additional packaging so
-that it can be called as a program in its own right, from the shell.  For this
-reason, we sometimes use the term @dfn{script} in this context to mean the
-same thing.
-
address@hidden wow look at this hole^!  variable-width font users eat your 
heart out.
+When Guile is installed, in addition to the @code{(ice-9 FOO)} modules, a set
+of @dfn{guile-tools modules} @code{(scripts BAR)} is also installed.  Each is
+a regular Scheme module that has some additional packaging so that it can be
+used by guile-tools, from the shell.  For this reason, we sometimes use the
+term @dfn{script} in this context to mean the same thing.
 
 As a convenience, the @code{guile-tools} wrapper program is installed along w/
 @code{guile}; it knows where a particular module is installed and calls it
@@ -346,17 +343,11 @@ executable module.  Feel free to skip to the next chapter.
 
 See template file @code{PROGRAM} for a quick start.
 
-Programs must follow the @dfn{executable module} convention, documented here:
+Programs must follow the @dfn{guile-tools} convention, documented here:
 
 @itemize
 
 @item
-The file name must not end in ".scm".
-
address@hidden
-The file must be executable (chmod +x).
-
address@hidden
 The module name must be "(scripts PROGRAM)".  A procedure named PROGRAM w/
 signature "(PROGRAM . args)" must be exported.  Basically, use some variant
 of the form:
@@ -377,20 +368,10 @@ There must be the alias:
 
 However, `main' must NOT be exported.
 
address@hidden
-The beginning of the file must use the following invocation sequence:
-
address@hidden
-#!/bin/sh
-main='(module-ref (resolve-module '\''(scripts PROGRAM)) '\'main')'
-exec address@hidden@} -l $0 -c "(apply $main (cdr (command-line)))" "$@@"
-!#
address@hidden example
-
 @end itemize
 
 Following these conventions allows the program file to be used as module
address@hidden(scripts PROGRAM)} in addition to as a standalone executable.  
Please
address@hidden(scripts PROGRAM)} in addition to being invoked by guile-tools.  
Please
 also include a helpful Commentary section w/ some usage info.
 
 @c tools.texi ends here
diff --git a/module/Makefile.am b/module/Makefile.am
index b39b827..2685a3a 100644
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -73,9 +73,8 @@ ETAGS_ARGS +=                                 \
   ice-9/compile-psyntax.scm                    \
   ice-9/ChangeLog-2008
 
-include $(top_srcdir)/am/pre-inst-guile
 ice-9/psyntax-pp.scm.gen:
-       $(preinstguile) --no-auto-compile -s 
$(srcdir)/ice-9/compile-psyntax.scm \
+       $(top_builddir_absolute)/meta/guile --no-auto-compile -s 
$(srcdir)/ice-9/compile-psyntax.scm \
                $(srcdir)/ice-9/psyntax.scm $(srcdir)/ice-9/psyntax-pp.scm
 
 .PHONY: ice-9/psyntax-pp.scm.gen
diff --git a/module/scripts/README b/module/scripts/README
index 56dd286..cb397f5 100644
--- a/module/scripts/README
+++ b/module/scripts/README
@@ -4,9 +4,9 @@ Overview and Usage
 This directory contains Scheme programs, some useful in maintaining Guile.
 On "make install", these programs are copied to PKGDATADIR/VERSION/scripts.
 
-You can invoke a program from the shell, or alternatively, load its file
-as a Guile Scheme module, and use its exported procedure(s) from Scheme code.
-Typically for any PROGRAM:
+You can use guile-tools to invoke a program from the shell, or alternatively,
+load its file as a Guile Scheme module, and use its exported procedure(s)
+from Scheme code.  Typically for any PROGRAM:
 
   (use-modules (scripts PROGRAM))
   (PROGRAM ARG1 ARG2 ...)
@@ -22,8 +22,6 @@ To see PROGRAM's commentary, which may or may not be helpful:
 
   (help (scripts PROGRAM))
 
-To see all commentaries and module dependencies, try: "make overview".
-
 If you want to try the programs before installing Guile, you will probably
 need to set environment variable GUILE_LOAD_PATH to be the parent directory.
 This can be done in Bourne-compatible shells like so:
@@ -40,11 +38,7 @@ How to Contribute
 
 See template file PROGRAM for a quick start.
 
-Programs must follow the "executable module" convention, documented here:
-
-- The file name must not end in ".scm".
-
-- The file must be executable (chmod +x).
+Programs must follow the "guile-tools" convention, documented here:
 
 - The module name must be "(scripts PROGRAM)".  A procedure named PROGRAM w/
   signature "(PROGRAM . args)" must be exported.  Basically, use some variant
@@ -61,15 +55,8 @@ Programs must follow the "executable module" convention, 
documented here:
 
   However, `main' must NOT be exported.
 
-- The beginning of the file must use the following invocation sequence:
-
-  #!/bin/sh
-  main='(module-ref (resolve-module '\''(scripts PROGRAM)) '\'main')'
-  exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@"
-  !#
-
 Following these conventions allows the program file to be used as module
-(scripts PROGRAM) in addition to as a standalone executable.  Please also
+(scripts PROGRAM) in addition to being invoked by guile-tools.  Please also
 include a helpful Commentary section w/ some usage info.
 
 


hooks/post-receive
-- 
GNU Guile