mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

bump effective version to 2.2

Browse source 
* .gitignore:
* GUILE-VERSION (GUILE_EFFECTIVE_VERSION):
* configure.ac:
* doc/example-smob/Makefile (CFLAGS, LIBS):
* doc/guile.1:
* doc/ref/libguile-concepts.texi:
* doc/ref/srfi-modules.texi:
* doc/ref/vm.texi:
* meta/Makefile.am (EXTRA_DIST, pkgconfig_DATA):
* meta/guile-config.in (guile-module):
* meta/guile-2.2-uninstalled.pc.in:
* meta/guile-2.2.pc.in: Bump effective version to 2.2.
This commit is contained in:
Andy Wingo 2011-04-11 23:40:51 +02:00
parent 21c05db45b
commit 0c81a0c13a
12 changed files with 32 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -66,8 +66,8 @@ guile-procedures.txt
guile-config/guile-config guile-config/guile-config
*.go *.go
TAGS TAGS
/meta/guile-2.0.pc /meta/guile-2.2.pc
/meta/guile-2.0-uninstalled.pc /meta/guile-2.2-uninstalled.pc
gdb-pre-inst-guile gdb-pre-inst-guile
cscope.out cscope.out
cscope.files cscope.files

2
GUILE-VERSION
View file

@ -5,7 +5,7 @@ GUILE_MAJOR_VERSION=2
GUILE_MINOR_VERSION=1 GUILE_MINOR_VERSION=1
GUILE_MICRO_VERSION=0 GUILE_MICRO_VERSION=0
GUILE_EFFECTIVE_VERSION=2.0 GUILE_EFFECTIVE_VERSION=2.2
# All of the shared lib versioning info. Right now, for this to work # All of the shared lib versioning info. Right now, for this to work

4
configure.ac
View file

@ -1641,8 +1641,8 @@ AC_CONFIG_FILES([
module/Makefile module/Makefile
]) ])
AC_CONFIG_FILES([meta/guile-2.0.pc]) AC_CONFIG_FILES([meta/guile-2.2.pc])
AC_CONFIG_FILES([meta/guile-2.0-uninstalled.pc]) AC_CONFIG_FILES([meta/guile-2.2-uninstalled.pc])
AC_CONFIG_FILES([doc/ref/effective-version.texi]) AC_CONFIG_FILES([doc/ref/effective-version.texi])
GUILE_CONFIG_SCRIPT([check-guile]) GUILE_CONFIG_SCRIPT([check-guile])

4
doc/example-smob/Makefile
View file

@ -1,5 +1,5 @@
CFLAGS = `pkg-config guile-2.0 --cflags` CFLAGS = `pkg-config guile-2.2 --cflags`
LIBS = `pkg-config guile-2.0 --libs` LIBS = `pkg-config guile-2.2 --libs`
O_FILES = image-type.o myguile.o O_FILES = image-type.o myguile.o

2
doc/guile.1
View file

@ -4,7 +4,7 @@
.\" groff -man -Tascii foo.1 .\" groff -man -Tascii foo.1
.\" .\"
.\" title section date source manual .\" title section date source manual
.TH GUILE 1 "2011-03-04" GNU "GNU Guile 2.0" .TH GUILE 1 "2011-03-04" GNU "GNU Guile 2.2"
. .
.SH NAME .SH NAME
guile \- The GNU Project Extension Language guile \- The GNU Project Extension Language

24
doc/ref/libguile-concepts.texi
View file

@ -1,6 +1,6 @@
@c -*-texinfo-*- @c -*-texinfo-*-
@c This is part of the GNU Guile Reference Manual. @c This is part of the GNU Guile Reference Manual.
@c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2010 @c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2010, 2011
@c Free Software Foundation, Inc. @c Free Software Foundation, Inc.
@c See the file guile.texi for copying conditions. @c See the file guile.texi for copying conditions.
@ -449,16 +449,18 @@ that are stored in local variables. When a thread puts itself into
guile mode for the first time, it gets a Scheme representation and is guile mode for the first time, it gets a Scheme representation and is
listed by @code{all-threads}, for example. listed by @code{all-threads}, for example.
Threads in guile mode can block (e.g., do blocking I/O) without causing any Threads in guile mode can block (e.g., do blocking I/O) without causing
problems@footnote{In Guile 1.8, a thread blocking in guile mode would prevent any problems@footnote{In Guile 1.8, a thread blocking in guile mode
garbage collection to occur. Thus, threads had to leave guile mode whenever would prevent garbage collection to occur. Thus, threads had to leave
they could block. This is no longer needed with Guile 2.0.}; temporarily guile mode whenever they could block. This is no longer needed with
leaving guile mode with @code{scm_without_guile} before blocking slightly Guile 2.@var{x}.}; temporarily leaving guile mode with
improves GC performance, though. For some common blocking operations, Guile @code{scm_without_guile} before blocking slightly improves GC
provides convenience functions. For example, if you want to lock a pthread performance, though. For some common blocking operations, Guile
mutex while in guile mode, you might want to use @code{scm_pthread_mutex_lock} provides convenience functions. For example, if you want to lock a
which is just like @code{pthread_mutex_lock} except that it leaves guile mode pthread mutex while in guile mode, you might want to use
while blocking. @code{scm_pthread_mutex_lock} which is just like
@code{pthread_mutex_lock} except that it leaves guile mode while
blocking.
All libguile functions are (intended to be) robust in the face of All libguile functions are (intended to be) robust in the face of

4
doc/ref/srfi-modules.texi
View file

@ -171,8 +171,8 @@ how to load it with the Guile mechanism.
@cindex @code{guile-2} SRFI-0 feature @cindex @code{guile-2} SRFI-0 feature
@cindex portability between 2.0 and older versions @cindex portability between 2.0 and older versions
Likewise, testing the @code{guile-2} feature allows code to be portable Likewise, testing the @code{guile-2} feature allows code to be portable
between Guile 2.0 and previous versions of Guile. For instance, it between Guile 2.@var{x} and previous versions of Guile. For instance, it
makes it possible to write code that accounts for Guile 2.0's compiler, makes it possible to write code that accounts for Guile 2.@var{x}'s compiler,
yet be correctly interpreted on 1.8 and earlier versions: yet be correctly interpreted on 1.8 and earlier versions:
@example @example

8
doc/ref/vm.texi
View file

@ -1,6 +1,6 @@
@c -*-texinfo-*- @c -*-texinfo-*-
@c This is part of the GNU Guile Reference Manual. @c This is part of the GNU Guile Reference Manual.
@c Copyright (C) 2008,2009,2010 @c Copyright (C) 2008,2009,2010,2011
@c Free Software Foundation, Inc. @c Free Software Foundation, Inc.
@c See the file guile.texi for copying conditions. @c See the file guile.texi for copying conditions.
@ -79,9 +79,9 @@ but it is not normally used at runtime.)
The upside of implementing the interpreter in Scheme is that we preserve The upside of implementing the interpreter in Scheme is that we preserve
tail calls and multiple-value handling between interpreted and compiled tail calls and multiple-value handling between interpreted and compiled
code. The downside is that the interpreter in Guile 2.0 is slower than code. The downside is that the interpreter in Guile 2.@var{x} is slower
the interpreter in 1.8. We hope the that the compiler's speed makes up than the interpreter in 1.8. We hope the that the compiler's speed makes
for the loss! up for the loss!
Also note that this decision to implement a bytecode compiler does not Also note that this decision to implement a bytecode compiler does not
preclude native compilation. We can compile from bytecode to native preclude native compilation. We can compile from bytecode to native

6
meta/Makefile.am
View file

@ -1,7 +1,7 @@
## Process this file with Automake to create Makefile.in ## Process this file with Automake to create Makefile.in
## Jim Blandy <jimb@red-bean.com> --- September 1997 ## Jim Blandy <jimb@red-bean.com> --- September 1997
## ##
## Copyright (C) 1998, 1999, 2001, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ## Copyright (C) 1998, 1999, 2001, 2006, 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
## ##
## This file is part of GUILE. ## This file is part of GUILE.
## ##
@ -23,11 +23,11 @@
bin_SCRIPTS = guile-config guile-tools bin_SCRIPTS = guile-config guile-tools
EXTRA_DIST= \ EXTRA_DIST= \
guile.m4 ChangeLog-2008 \ guile.m4 ChangeLog-2008 \
guile-2.0.pc.in guile-2.0-uninstalled.pc.in \ guile-2.2.pc.in guile-2.2-uninstalled.pc.in \
guile-tools.in guile-config.in guile-tools.in guile-config.in
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = guile-2.0.pc pkgconfig_DATA = guile-2.2.pc
## FIXME: in the future there will be direct automake support for ## FIXME: in the future there will be direct automake support for
## doing this. When that happens, switch over. ## doing this. When that happens, switch over.

0
meta/guile-2.0-uninstalled.pc.in → meta/guile-2.2-uninstalled.pc.in
View file

0
meta/guile-2.0.pc.in → meta/guile-2.2.pc.in
View file

4
meta/guile-config.in
View file

@ -8,7 +8,7 @@ exec "@installed_guile@" -e main -s $0 "$@"
;;;; guile-config --- utility for linking programs with Guile ;;;; guile-config --- utility for linking programs with Guile
;;;; Jim Blandy <jim@red-bean.com> --- September 1997 ;;;; Jim Blandy <jim@red-bean.com> --- September 1997
;;;; ;;;;
;;;; Copyright (C) 1998, 2001, 2004, 2005, 2006, 2008, 2009 Free Software Foundation, Inc. ;;;; Copyright (C) 1998, 2001, 2004, 2005, 2006, 2008, 2009, 2011 Free Software Foundation, Inc.
;;;; ;;;;
;;;; This library is free software; you can redistribute it and/or ;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public ;;;; modify it under the terms of the GNU Lesser General Public
@ -77,7 +77,7 @@ exec "@installed_guile@" -e main -s $0 "$@"
(dle " " p " --help - show usage info (this message)") (dle " " p " --help - show usage info (this message)")
(dle " " p " --help SUBCOMMAND - show help for SUBCOMMAND"))) (dle " " p " --help SUBCOMMAND - show help for SUBCOMMAND")))
(define guile-module "guile-2.0") (define guile-module "guile-2.2")
(define (pkg-config . args) (define (pkg-config . args)
(let* ((real-args (cons %pkg-config-program args)) (let* ((real-args (cons %pkg-config-program args))