@value{EFFECTIVE-VERSION} instead of 2.0 in some places in the manual

* doc/ref/history.texi (A Timeline of Selected Guile Releases): Update
  the 2.0 release blurb.

* doc/ref/api-foreign.texi (Modules and Extensions):
* doc/ref/libguile-extensions.texi (A Sample Guile Extension):
* doc/ref/tour.texi (Linking Guile into Programs): Use
  @value{EFFECTIVE-VERSION} instead of 2.0.  Also fix sample extension
  compilation line to include the Guile CFLAGS.
This commit is contained in:
Andy Wingo 2011-02-20 13:15:34 +01:00
commit 4b93693dff
4 changed files with 13 additions and 12 deletions

View file

@ -360,8 +360,8 @@ When loaded with @code{(use-modules (foo bar))}, the
@code{load-extension} call looks for the @file{foobar-c-code.so} (etc) @code{load-extension} call looks for the @file{foobar-c-code.so} (etc)
object file in Guile's @code{extensiondir}, which is usually a object file in Guile's @code{extensiondir}, which is usually a
subdirectory of the @code{libdir}. For example, if your libdir is subdirectory of the @code{libdir}. For example, if your libdir is
@file{/usr/lib}, the @code{extensiondir} for the Guile 2.0.@var{x} @file{/usr/lib}, the @code{extensiondir} for the Guile @value{EFFECTIVE-VERSION}.@var{x}
series will be @file{/usr/lib/guile/2.0/}. series will be @file{/usr/lib/guile/@value{EFFECTIVE-VERSION}/}.
The extension path includes the major and minor version of Guile (the The extension path includes the major and minor version of Guile (the
``effective version''), because Guile guarantees compatibility within a ``effective version''), because Guile guarantees compatibility within a
@ -399,7 +399,7 @@ with the following in a @file{Makefile}, using @command{sed}
@example @example
foo.scm: foo.scm.in foo.scm: foo.scm.in
sed 's|XXextensiondirXX|$(libdir)/guile/2.0|' <foo.scm.in >foo.scm sed 's|XXextensiondirXX|$(libdir)/guile/@value{EFFECTIVE-VERSION}|' <foo.scm.in >foo.scm
@end example @end example
The actual pattern @code{XXextensiondirXX} is arbitrary, it's only something The actual pattern @code{XXextensiondirXX} is arbitrary, it's only something

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, 2010 @c Copyright (C) 2008, 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.
@ -214,15 +214,15 @@ user-space threading was removed in favor of POSIX pre-emptive
threads, providing true multiprocessing. Gettext support was added, threads, providing true multiprocessing. Gettext support was added,
and Guile's C API was cleaned up and orthogonalized in a massive way. and Guile's C API was cleaned up and orthogonalized in a massive way.
@item 2.0 --- April 2010 @item 2.0 --- 16 February 2010
A virtual machine was added to Guile, along with the associated compiler A virtual machine was added to Guile, along with the associated compiler
and toolchain. Support for internationalization was finally and toolchain. Support for internationalization was finally
reimplemented, in terms of unicode, locales, and libunistring. Running reimplemented, in terms of unicode, locales, and libunistring. Running
Guile instances became controllable and debuggable from within Emacs, Guile instances became controllable and debuggable from within Emacs,
via GDS and Geiser. Guile caught up to features found in a number of via Geiser. Guile caught up to features found in a number of other
other Schemes: SRFI-18 threads, including thread cancellation, Schemes: SRFI-18 threads, module-hygienic macros, a profiler, tracer,
module-hygienic macros, a profiler, tracer, and debugger, SSAX XML and debugger, SSAX XML integration, bytevectors, a dynamic FFI,
integration, bytevectors, module versions, and partial support for R6RS. delimited continuations, module versions, and partial support for R6RS.
@end table @end table
@node Status @node Status

View file

@ -78,7 +78,8 @@ This C source file needs to be compiled into a shared library. Here is
how to do it on GNU/Linux: how to do it on GNU/Linux:
@smallexample @smallexample
gcc -shared -o libguile-bessel.so -fPIC bessel.c gcc `pkg-config --cflags guile-@value{EFFECTIVE-VERSION}` \
-shared -o libguile-bessel.so -fPIC bessel.c
@end smallexample @end smallexample
For creating shared libraries portably, we recommend the use of GNU For creating shared libraries portably, we recommend the use of GNU

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, 2006, 2010 @c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2006, 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.
@ -115,7 +115,7 @@ can be compiled and linked like this:
@example @example
$ gcc -o simple-guile simple-guile.c \ $ gcc -o simple-guile simple-guile.c \
`pkg-config --cflags --libs guile-2.0` `pkg-config --cflags --libs guile-@value{EFFECTIVE-VERSION}`
@end example @end example
When it is run, it behaves just like the @code{guile} program except When it is run, it behaves just like the @code{guile} program except