guile-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Guile-commits] GNU Guile branch, master, updated. release_1-9-1-79-ga9b


From: Ludovic Courtès
Subject: [Guile-commits] GNU Guile branch, master, updated. release_1-9-1-79-ga9b8b7b
Date: Sat, 15 Aug 2009 12:45:33 +0000

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

The branch, master has been updated
       via  a9b8b7b02fc0492627f9e5785147f0cf007e7008 (commit)
       via  e4ca305f247c919cf50da25e2515bf400d6389c8 (commit)
       via  54dd0ca509bb9c5c549d58893834a2150421f76d (commit)
       via  54b38caf19deb0e5a6e8146c65b3e176e7fffa60 (commit)
      from  acf04ab4621d9b558f0c403897d36ef9369d1dfc (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 a9b8b7b02fc0492627f9e5785147f0cf007e7008
Author: Ludovic Courtès <address@hidden>
Date:   Sat Aug 15 14:41:46 2009 +0200

    Bump version number for 1.9.2.
    
    * GUILE-VERSION (GUILE_MICRO_VERSION): Increment.

commit e4ca305f247c919cf50da25e2515bf400d6389c8
Author: Ludovic Courtès <address@hidden>
Date:   Sat Aug 15 14:35:29 2009 +0200

    Turn off auto-compilation to stand-alone tests.
    
    * test-suite/standalone/Makefile.am (TESTS_ENVIRONMENT): Add
      "GUILE_AUTO_COMPILE=0".

commit 54dd0ca509bb9c5c549d58893834a2150421f76d
Author: Ludovic Courtès <address@hidden>
Date:   Sat Aug 15 14:26:17 2009 +0200

    Update the manual and `NEWS' regarding `guile-2.0.pc'.
    
    * NEWS: Mention `guile-2.0.pc'.
    
    * doc/ref/autoconf.texi (Autoconf Macros): Update to `guile-2.0'.

commit 54b38caf19deb0e5a6e8146c65b3e176e7fffa60
Author: Ludovic Courtès <address@hidden>
Date:   Sat Aug 15 12:53:59 2009 +0200

    Add proper `--help' and `--version' for `guile-tools compile'.
    
    * configure.ac: Produce `meta/guile-tools'.
    
    * meta/Makefile.am (EXTRA_DIST): Add `guile-tools.in'.
      (bin_SCRIPTS): Remove `guile-tools'.
    
    * meta/uninstalled-env.in (PATH): Add "${top_builddir}/meta".
    
    * module/scripts/compile.scm (%options): Add `--version'.
      (parse-args): Show the offending option name upon error.
      (show-version): New.
      (compile): Use `%guile-bug-report-address'.

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

Summary of changes:
 .gitignore                           |    1 +
 GUILE-VERSION                        |    2 +-
 NEWS                                 |   10 ++++++++++
 configure.ac                         |    1 +
 doc/ref/autoconf.texi                |   10 +++++-----
 meta/Makefile.am                     |    9 +++++----
 meta/{guile-tools => guile-tools.in} |    6 ++++++
 meta/uninstalled-env.in              |    3 ++-
 module/scripts/compile.scm           |   16 ++++++++++++++--
 test-suite/standalone/Makefile.am    |    3 ++-
 10 files changed, 47 insertions(+), 14 deletions(-)
 rename meta/{guile-tools => guile-tools.in} (95%)

diff --git a/.gitignore b/.gitignore
index 004c7f3..2a7e694 100644
--- a/.gitignore
+++ b/.gitignore
@@ -113,3 +113,4 @@ INSTALL
 /GRTAGS
 /GSYMS
 /GTAGS
+/meta/guile-tools
diff --git a/GUILE-VERSION b/GUILE-VERSION
index fa96ed9..6d86dd8 100644
--- a/GUILE-VERSION
+++ b/GUILE-VERSION
@@ -2,7 +2,7 @@
 
 GUILE_MAJOR_VERSION=1
 GUILE_MINOR_VERSION=9
-GUILE_MICRO_VERSION=1
+GUILE_MICRO_VERSION=2
 
 GUILE_EFFECTIVE_VERSION=${GUILE_MAJOR_VERSION}.${GUILE_MINOR_VERSION}
 GUILE_VERSION=${GUILE_EFFECTIVE_VERSION}.${GUILE_MICRO_VERSION}
diff --git a/NEWS b/NEWS
index f8aea59..e05f3b4 100644
--- a/NEWS
+++ b/NEWS
@@ -98,6 +98,11 @@ There was an EBCDIC compile flag that altered some of the 
character
 processing.  It appeared that full EBCDIC support was never completed
 and was unmaintained.
 
+** Packaging changes
+
+Guile now provides `guile-2.0.pc' (used by pkg-config) instead of
+`guile-1.8.pc'.
+
 ** And of course, the usual collection of bugfixes
  
 Interested users should see the ChangeLog for more information.
@@ -639,6 +644,11 @@ part of Guile).
 guile.m4 has yet to be modified to call pkg-config instead of
 guile-config.
 
+** Guile now provides `guile-2.0.pc' instead of `guile-1.8.pc'
+
+Programs that use `pkg-config' to find Guile or one of its Autoconf
+macros should now require `guile-2.0' instead of `guile-1.8'.
+
 ** New installation directory: $(pkglibdir)/1.9/ccache
 
 If $(libdir) is /usr/lib, for example, Guile will install its .go files
diff --git a/configure.ac b/configure.ac
index ddc092e..da71529 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1546,6 +1546,7 @@ AC_CONFIG_FILES([benchmark-guile], [chmod +x 
benchmark-guile])
 AC_CONFIG_FILES([meta/guile], [chmod +x meta/guile])
 AC_CONFIG_FILES([meta/uninstalled-env], [chmod +x meta/uninstalled-env])
 AC_CONFIG_FILES([meta/gdb-uninstalled-guile], [chmod +x 
meta/gdb-uninstalled-guile])
+AC_CONFIG_FILES([meta/guile-tools], [chmod +x meta/guile-tools])
 AC_CONFIG_FILES([libguile/guile-snarf],
                 [chmod +x libguile/guile-snarf])
 AC_CONFIG_FILES([libguile/guile-doc-snarf],
diff --git a/doc/ref/autoconf.texi b/doc/ref/autoconf.texi
index 83686da..ba5800f 100644
--- a/doc/ref/autoconf.texi
+++ b/doc/ref/autoconf.texi
@@ -1,6 +1,6 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Guile Reference Manual.
address@hidden Copyright (C)  1996, 1997, 2000, 2001, 2002, 2003, 2004
address@hidden Copyright (C)  1996, 1997, 2000, 2001, 2002, 2003, 2004, 2009
 @c   Free Software Foundation, Inc.
 @c See the file guile.texi for copying conditions.
 
@@ -49,7 +49,7 @@ checks.
 @cindex autoconf
 
 GNU Guile provides a @dfn{pkg-config} description file, installed as
address@hidden@var{prefix}/lib/pkgconfig/guile-1.8.pc}, which contains all the
address@hidden@var{prefix}/lib/pkgconfig/guile-2.0.pc}, which contains all the
 information necessary to compile and link C applications that use Guile.
 The @code{pkg-config} program is able to read this file and provide this
 information to application programmers; it can be obtained at
@@ -59,8 +59,8 @@ The following command lines give respectively the C 
compilation and link
 flags needed to build Guile-using programs:
 
 @example
-pkg-config guile-1.8 --cflags
-pkg-config guile-1.8 --libs
+pkg-config guile-2.0 --cflags
+pkg-config guile-2.0 --libs
 @end example
 
 To ease use of pkg-config with Autoconf, pkg-config comes with a
@@ -71,7 +71,7 @@ accordingly, or prints an error and exits if Guile was not 
found:
 @findex PKG_CHECK_MODULES
 
 @example
-PKG_CHECK_MODULES([GUILE], [guile-1.8])
+PKG_CHECK_MODULES([GUILE], [guile-2.0])
 @end example
 
 Guile comes with additional Autoconf macros providing more information,
diff --git a/meta/Makefile.am b/meta/Makefile.am
index ba79794..c8bdacc 100644
--- a/meta/Makefile.am
+++ b/meta/Makefile.am
@@ -20,10 +20,11 @@
 ##   write to the Free Software Foundation, Inc., 51 Franklin Street,
 ##   Fifth Floor, Boston, MA 02110-1301 USA
 
-bin_SCRIPTS=guile-config guile-tools
-EXTRA_DIST= $(bin_SCRIPTS) \
-       guile.m4 ChangeLog-2008 \
-       guile-2.0.pc.in guile-2.0-uninstalled.pc.in
+bin_SCRIPTS = guile-config
+EXTRA_DIST= $(bin_SCRIPTS)                     \
+  guile.m4 ChangeLog-2008                      \
+  guile-2.0.pc.in guile-2.0-uninstalled.pc.in  \
+  guile-tools.in
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = guile-2.0.pc
diff --git a/meta/guile-tools b/meta/guile-tools.in
similarity index 95%
rename from meta/guile-tools
rename to meta/guile-tools.in
index 0c66c72..51d103f 100755
--- a/meta/guile-tools
+++ b/meta/guile-tools.in
@@ -25,6 +25,12 @@ exec guile $GUILE_FLAGS -e '(@@ (guile-tools) main)' -s "$0" 
"$@"
 
 (define-module (guile-tools))
 
+;; Hack to provide scripts with the bug-report address.
+(module-define! the-scm-module
+                '%guile-bug-report-address
+                "@PACKAGE_BUGREPORT@")
+
+
 ;; We can't import srfi-1, unfortunately, as we are used early in the
 ;; boot process, before the srfi-1 shlib is built.
 
diff --git a/meta/uninstalled-env.in b/meta/uninstalled-env.in
index 8ee690c..9a62272 100644
--- a/meta/uninstalled-env.in
+++ b/meta/uninstalled-env.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-#      Copyright (C) 2003, 2006, 2008 Free Software Foundation
+#      Copyright (C) 2003, 2006, 2008, 2009 Free Software Foundation
 #
 #   This file is part of GUILE.
 #
@@ -112,6 +112,7 @@ export PKG_CONFIG_PATH
 # handle PATH (no clobber)
 PATH="${top_builddir}/libguile:${PATH}"
 PATH="${top_srcdir}/meta:${PATH}"
+PATH="${top_builddir}/meta:${PATH}"
 export PATH
 
 exec "$@"
diff --git a/module/scripts/compile.scm b/module/scripts/compile.scm
index 89d35bc..9b14f2f 100644
--- a/module/scripts/compile.scm
+++ b/module/scripts/compile.scm
@@ -48,6 +48,10 @@
   (list (option '(#\h "help") #f #f
                 (lambda (opt name arg result)
                  (alist-cons 'help? #t result)))
+        (option '("version") #f #f
+                (lambda (opt name arg result)
+                  (show-version)
+                  (exit 0)))
 
        (option '(#\L "load-path") #t #f
                (lambda (opt name arg result)
@@ -90,7 +94,7 @@
 options."
   (args-fold args %options
              (lambda (opt name arg result)
-               (format (current-error-port) "~A: unrecognized option" opt)
+               (format (current-error-port) "~A: unrecognized option" name)
               (exit 1))
              (lambda (file result)
               (let ((input-files (assoc-ref result 'input-files)))
@@ -102,6 +106,13 @@ options."
               (load-path)
                (warnings unsupported-warning))))
 
+(define (show-version)
+  (format #t "compile (GNU Guile) ~A~%" (version))
+  (format #t "Copyright (C) 2009 Free Software Foundation, Inc.
+License LGPLv3+: GNU LGPL version 3 or later 
<http://gnu.org/licenses/lgpl.html>.
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.~%"))
+
 (define (show-warning-help)
   (format #t "The available warning types are:~%~%")
   (for-each (lambda (wt)
@@ -143,7 +154,8 @@ Compile each Guile source file FILE into a Guile object.
 
 Note that autocompilation will be turned off.
 
-Report bugs to <address@hidden>.~%")
+Report bugs to <~A>.~%"
+                  %guile-bug-report-address)
           (exit 0)))
 
     (set! %load-path (append load-path %load-path))
diff --git a/test-suite/standalone/Makefile.am 
b/test-suite/standalone/Makefile.am
index 37b9cb5..a990532 100644
--- a/test-suite/standalone/Makefile.am
+++ b/test-suite/standalone/Makefile.am
@@ -28,7 +28,8 @@ check_SCRIPTS =
 BUILT_SOURCES =
 EXTRA_DIST =
 
-TESTS_ENVIRONMENT = "${top_builddir}/meta/uninstalled-env"
+TESTS_ENVIRONMENT =                                            \
+  GUILE_AUTO_COMPILE=0 "${top_builddir}/meta/uninstalled-env"
 
 test_cflags =                                  \
   -I$(top_srcdir)/test-suite/standalone                \


hooks/post-receive
-- 
GNU Guile




reply via email to

[Prev in Thread] Current Thread [Next in Thread]