From 3d939a9500a8991802807784160ac4c2f8989c10 Mon Sep 17 00:00:00 2001 From: hallgren Date: Tue, 15 Dec 2009 15:27:26 +0000 Subject: [PATCH] Update version number 3.0 to 3.1 in a number of places --- GF.cabal | 2 +- doc/gf-developers.html | 4 ++-- doc/gf-developers.txt | 4 ++-- doc/gf-refman.html | 9 +++------ index.html | 2 +- src/server/MorphoService.hs | 4 ++-- src/server/gf-server.cabal | 4 ++-- 7 files changed, 13 insertions(+), 16 deletions(-) diff --git a/GF.cabal b/GF.cabal index f049165a5..a77152134 100644 --- a/GF.cabal +++ b/GF.cabal @@ -1,5 +1,5 @@ name: gf -version: 3.0 +version: 3.1 cabal-version: >= 1.2 build-type: Simple license: GPL diff --git a/doc/gf-developers.html b/doc/gf-developers.html index ec7dfaaba..c67f46f16 100644 --- a/doc/gf-developers.html +++ b/doc/gf-developers.html @@ -384,8 +384,8 @@ Windows this is c:\Program Files\Haskell\bin. If you want to install in some other place then use the `--prefix` option during the configuration phase.

-The compiled GF Resource Grammar Library will be installed in /usr/local/share/gf-3.0/lib -on Linux and in c:\Program Files\Haskell\gf-3.0\lib on Windows. Again the location could +The compiled GF Resource Grammar Library will be installed in /usr/local/share/gf-3.1/lib +on Linux and in c:\Program Files\Haskell\gf-3.1\lib on Windows. Again the location could be changed using the `--prefix` option.

diff --git a/doc/gf-developers.txt b/doc/gf-developers.txt index 872d6ef65..c7643ef07 100644 --- a/doc/gf-developers.txt +++ b/doc/gf-developers.txt @@ -303,8 +303,8 @@ files in your system. For example on Linux this is usualy /usr/local/bin and on Windows this is c:\Program Files\Haskell\bin. If you want to install in some other place then use the ```--prefix``` option during the configuration phase. -The compiled GF Resource Grammar Library will be installed in /usr/local/share/gf-3.0/lib -on Linux and in c:\Program Files\Haskell\gf-3.0\lib on Windows. Again the location could +The compiled GF Resource Grammar Library will be installed in /usr/local/share/gf-3.1/lib +on Linux and in c:\Program Files\Haskell\gf-3.1\lib on Windows. Again the location could be changed using the ```--prefix``` option. == Clean == diff --git a/doc/gf-refman.html b/doc/gf-refman.html index b84079ecf..104f644c7 100644 --- a/doc/gf-refman.html +++ b/doc/gf-refman.html @@ -1,12 +1,11 @@ - GF Language Reference Manual

GF Language Reference Manual

-Aarne Ranta
+Aarne Ranta
February 2008

@@ -116,8 +115,8 @@ compiler versions, if they involve changes of behaviour having to do with the language specification.

-This manual is meant to be fully compatible with GF version 3.0 -(forthcoming). Main discrepancies with version 2.8 are indicated, +This manual is meant to be fully compatible with GF version 3.0. +Main discrepancies with version 2.8 are indicated, as well as with the reference article on GF,

@@ -4540,6 +4539,4 @@ All other symbols are terminals.

- - diff --git a/index.html b/index.html index 7f7e9d318..f1525fa85 100644 --- a/index.html +++ b/index.html @@ -15,7 +15,7 @@

Grammatical Framework

-Version 3.0 +Version 3.1

December 2009 diff --git a/src/server/MorphoService.hs b/src/server/MorphoService.hs index 016fc982a..5c173c868 100644 --- a/src/server/MorphoService.hs +++ b/src/server/MorphoService.hs @@ -27,10 +27,10 @@ import URLEncoding -- FIXME !!!!!! grammarFile :: FilePath -grammarFile = "/usr/local/share/gf-3.0/lib/alltenses/ParadigmsFin.gfo" +grammarFile = "/usr/local/share/gf-3.1/lib/alltenses/ParadigmsFin.gfo" grammarPath :: FilePath -grammarPath = "/usr/local/share/gf-3.0/lib/prelude" +grammarPath = "/usr/local/share/gf-3.1/lib/prelude" main :: IO () main = do initFastCGI diff --git a/src/server/gf-server.cabal b/src/server/gf-server.cabal index 4bd5c59fd..05cbebf76 100644 --- a/src/server/gf-server.cabal +++ b/src/server/gf-server.cabal @@ -12,7 +12,7 @@ executable pgf-server directory, filepath, containers, - gf >= 3.0, + gf >= 3.1, cgi >= 3001.1.7.0, fastcgi >= 3001.0.2.1, json >= 0.3.3, @@ -34,7 +34,7 @@ executable morpho-server directory, filepath, containers, - gf >= 3.0, + gf >= 3.1, cgi >= 3001.1.7.0, fastcgi >= 3001.0.2.1, json >= 0.3.3,