summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhallgren <hallgren@chalmers.se>2016-06-16 15:09:45 +0000
committerhallgren <hallgren@chalmers.se>2016-06-16 15:09:45 +0000
commitc49b920ecfbdfab2c04a1b44139291b7335fcaac (patch)
tree646f0825eb08622d68033549d1d2f40a927860f5
parente608a63f808cd062a2485dbd3aea157f014d3582 (diff)
A few documentation updates
gf.cabal: include more GHC versions in the Tested-Width field.
-rw-r--r--doc/gf-developers.t2t33
-rw-r--r--gf.cabal3
-rw-r--r--src/www/gf-web-api-examples.html4
-rw-r--r--src/www/gf-web-api.t2t2
4 files changed, 32 insertions, 10 deletions
diff --git a/doc/gf-developers.t2t b/doc/gf-developers.t2t
index b525e0a4b..021c13b98 100644
--- a/doc/gf-developers.t2t
+++ b/doc/gf-developers.t2t
@@ -465,11 +465,16 @@ support by doing
```
cabal install -fserver -fc-runtime
```
-from the top directory. This give you two new things:
+from the top directory. This give you three new things:
- ``PGF2``: a module to import in Haskell programs, providing a binding to
the C run-time system.
+- The GF shell can be started with ``gf -cshell`` or ``gf -crun`` to use
+ the C run-time system instead of the Haskell run-time system.
+ Only limited functionality is available when running the shell in these
+ modes (use the ``help`` command in the shell for details).
+
- ``gf -server`` mode is extended with new requests to call the C run-time
system, e.g. ``c-parse``, ``c-linearize`` and ``c-translate``.
@@ -482,7 +487,9 @@ directories, respecively. Compile them by following the instructions in
the ``INSTALL`` files in those directories.
-== Creating .deb packages for Ubuntu ==
+== Creating binary distribution packages ==
+
+=== Creating .deb packages for Ubuntu ===
This was tested on Ubuntu 14.04 for the release of GF 3.6, and the
resulting ``.deb`` packages appears to work on Ubuntu 12.04, 13.10 and 14.04.
@@ -492,13 +499,13 @@ tested them on Ubuntu 12.04 and 14.04.
Under Ubuntu, Haskell executables are statically linked against other Haskell
libraries, so the .deb packages are fairly self-contained.
-=== Preparations ===
+==== Preparations ====
```
sudo apt-get install dpkg-dev debhelper
```
-=== Creating the package ===
+==== Creating the package ====
Make sure the ``debian/changelog`` starts with an entry that describes the
version you are building. Then run
@@ -507,7 +514,13 @@ version you are building. Then run
make deb
```
-== Creating OS X Installer packages ==
+If get error messages about missing dependencies
+(e.g. ``autoconf``, ``automake``, ``libtool-bin``, ``python-dev``,
+``java-sdk``, ``txt2tags``)
+use ``apt-get intall`` to install them, then try again.
+
+
+=== Creating OS X Installer packages ===
Run
@@ -515,7 +528,15 @@ Run
make pkg
```
-== Creating .rpm packages for Fedora ==
+=== Creating binary tar distributions ===
+
+Run
+
+```
+make bintar
+```
+
+=== Creating .rpm packages for Fedora ===
This is possible, but the procedure has not been automated.
It involves using the cabal-rpm tool,
diff --git a/gf.cabal b/gf.cabal
index 05e1b7fa1..20b100d99 100644
--- a/gf.cabal
+++ b/gf.cabal
@@ -11,7 +11,7 @@ description: GF, Grammatical Framework, is a programming language for multilingu
homepage: http://www.grammaticalframework.org/
bug-reports: http://code.google.com/p/grammatical-framework/issues/list
maintainer: Thomas Hallgren
-tested-with: GHC==7.4.2, GHC==7.6.3, GHC==7.8.3
+tested-with: GHC==7.4.2, GHC==7.6.3, GHC==7.8.3, GHC==7.10.2, GHC==8.0.1
data-dir: src
data-files: tools/gf.el
@@ -19,6 +19,7 @@ data-files: tools/gf.el
tools/dark-filetypes.GF.conf
tools/light-filetypes.GF.conf
www/*.html
+ www/*.css
www/P/*.png
www/gfse/*.html
www/gfse/*.css
diff --git a/src/www/gf-web-api-examples.html b/src/www/gf-web-api-examples.html
index 204a48a9d..736fd85be 100644
--- a/src/www/gf-web-api-examples.html
+++ b/src/www/gf-web-api-examples.html
@@ -43,7 +43,7 @@ availiable in the GF shell is also available via the GF web services API.
<p>
The
-<a href="http://code.google.com/p/grammatical-framework/wiki/GFWebServiceAPI">GF
+<a href="gf-web-api.html">GF
Web Service API page</a> describes the calls supported by the GF web service
API. Below, we illustrate these calls by examples, and also show
how to make these calls from JavaScript using the API defined in
@@ -178,6 +178,6 @@ full API.
</dl>
<hr>
<div class=modtime><small>
-<!-- hhmts start -->Last modified: Sat Jun 21 14:57:43 CEST 2014 <!-- hhmts end -->
+<!-- hhmts start -->Last modified: Thu Jun 16 17:08:04 CEST 2016 <!-- hhmts end -->
</small></div>
<address><a href="http://www.cse.chalmers.se/~hallgren/">TH</a></address>
diff --git a/src/www/gf-web-api.t2t b/src/www/gf-web-api.t2t
index 1bb8d006c..c58a2e81e 100644
--- a/src/www/gf-web-api.t2t
+++ b/src/www/gf-web-api.t2t
@@ -337,7 +337,7 @@ See the source code for details.
GF includes two implementations of the PGF API: the traditional
Haskell implementation and the newer C implementation. The commands documented
above all use the Haskell implementation.
-The following command use the C implementation instead:
+The following commands use the C implementation instead:
- ``c-parse``, ``c-linearize``, ``c-linearizeAll``, ``c-translate``,
``c-lookupmorpho``, ``c-flush``, ``c-grammar``, ``c-abstrtree``,