From: Ian Lynagh Date: Tue, 23 Feb 2010 15:05:22 +0000 (+0000) Subject: Fix the links to the base docs from the user guide X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=bfd7960566a3033182087a411016a04bd74f5eed;p=ghc-hetmet.git Fix the links to the base docs from the user guide --- diff --git a/aclocal.m4 b/aclocal.m4 index 540ec3e..275b2e4 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1327,4 +1327,12 @@ case "$1" in esac ]) +# LIBRARY_VERSION(lib) +# -------------------------------- +# Gets the version number of a library +AC_DEFUN([LIBRARY_VERSION],[ +LIBRARY_$1_VERSION=`grep -i "^version:" libraries/$1/$1.cabal | sed "s/.* //"` +AC_SUBST(LIBRARY_$1_VERSION) +]) + # LocalWords: fi diff --git a/configure.ac b/configure.ac index 4d83dbc..989a223 100644 --- a/configure.ac +++ b/configure.ac @@ -902,11 +902,13 @@ fi AC_SUBST(BUILD_DOCBOOK_PS) AC_SUBST(BUILD_DOCBOOK_PDF) +LIBRARY_VERSION(base) + if grep ' ' compiler/ghc.cabal.in 2>&1 >/dev/null; then AC_MSG_ERROR([compiler/ghc.cabal.in contains tab characters; please remove them]) fi -AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml distrib/ghc.iss distrib/configure.ac]) +AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal ghc.spec extra-gcc-opts docs/users_guide/ug-book.xml docs/users_guide/ug-ent.xml distrib/ghc.iss distrib/configure.ac]) AC_CONFIG_COMMANDS([mk/stamp-h],[echo timestamp > mk/stamp-h]) AC_OUTPUT diff --git a/docs/users_guide/ffi-chap.xml b/docs/users_guide/ffi-chap.xml index f9f52ae..69b79d7 100644 --- a/docs/users_guide/ffi-chap.xml +++ b/docs/users_guide/ffi-chap.xml @@ -19,7 +19,7 @@ Foreign function interface (FFI) The FFI libraries are documented in the accompanying library documentation; see for example the - Foreign module. + Foreign module. GHC extensions to the FFI Addendum @@ -498,7 +498,7 @@ int main(int argc, char *argv[]) threads, which are Haskell threads tied to a particular OS thread. For information on bound threads, see the documentation - for the Control.Concurrent + for the Control.Concurrent module. diff --git a/docs/users_guide/glasgow_exts.xml b/docs/users_guide/glasgow_exts.xml index f794c4d..cacf97d 100644 --- a/docs/users_guide/glasgow_exts.xml +++ b/docs/users_guide/glasgow_exts.xml @@ -1245,7 +1245,7 @@ then group by e This form of grouping is essentially the same as the one described above. However, since no function to use for the grouping has been supplied it will fall back on the groupWith function defined in - GHC.Exts. This + GHC.Exts. This is the form of the group statement that we made use of in the opening example. @@ -6697,7 +6697,7 @@ The arrows web page at With the flag, GHC supports the arrow notation described in the second of these papers, translating it using combinators from the -Control.Arrow +Control.Arrow module. What follows is a brief introduction to the notation; it won't make much sense unless you've read Hughes's paper. @@ -6812,7 +6812,7 @@ the arrow f, and matches its output against y. In the next line, the output is discarded. The arrow returnA is defined in the -Control.Arrow +Control.Arrow module as arr id. The above example is treated as an abbreviation for @@ -6829,7 +6829,7 @@ arr (\ x -> (x, x)) >>> Note that variables not used later in the composition are projected out. After simplification using rewrite rules (see ) defined in the -Control.Arrow +Control.Arrow module, this reduces to arr (\ x -> (x+1, x)) >>> @@ -7125,7 +7125,7 @@ additional restrictions: The module must import -Control.Arrow. +Control.Arrow. diff --git a/docs/users_guide/parallel.xml b/docs/users_guide/parallel.xml index 37cafd2..4e864f3 100644 --- a/docs/users_guide/parallel.xml +++ b/docs/users_guide/parallel.xml @@ -38,7 +38,7 @@ To the programmer, Concurrent Haskell introduces no new language constructs; rather, it appears simply as a library, + url="&libraryBaseLocation;/Control-Concurrent.html"> Control.Concurrent. The functions exported by this library include: diff --git a/docs/users_guide/ug-ent.xml b/docs/users_guide/ug-ent.xml.in similarity index 93% rename from docs/users_guide/ug-ent.xml rename to docs/users_guide/ug-ent.xml.in index 6f8bf65..a69b2a0 100644 --- a/docs/users_guide/ug-ent.xml +++ b/docs/users_guide/ug-ent.xml.in @@ -21,3 +21,4 @@ + diff --git a/docs/users_guide/using.xml b/docs/users_guide/using.xml index 329c31f..88e0ab2 100644 --- a/docs/users_guide/using.xml +++ b/docs/users_guide/using.xml @@ -1841,7 +1841,7 @@ f "2" = 2 special option or libraries compiled in a certain way. To get access to the support libraries for Concurrent Haskell, just import Control.Concurrent. More information on Concurrent Haskell is provided in the documentation for that module. + url="&libraryBaseLocation;/Control-Concurrent.html">Control.Concurrent. More information on Concurrent Haskell is provided in the documentation for that module. The following RTS option(s) affect the behaviour of Concurrent Haskell programs:RTS options, concurrent diff --git a/docs/users_guide/win32-dlls.xml b/docs/users_guide/win32-dlls.xml index 8cd73ec..5b3ddb1 100644 --- a/docs/users_guide/win32-dlls.xml +++ b/docs/users_guide/win32-dlls.xml @@ -71,7 +71,7 @@ Notice how the "%1" argument is quoted (or not). This problem doesn't just affect GHCi, it affects any GHC-compiled program that wants to catch console events. See the GHC.ConsoleHandler + url="&libraryBaseLocation;/GHC-ConsoleHandler.html">GHC.ConsoleHandler module.