Preparations for release of GF 3.3

+ Changing version numbers and dates here and there.
+ Simplify build-binary-dist.sh since pgf-http need not be built anymore.
+ Use--gf-lib-path to make the sample grammars for minibar compile even if GF
  is not installed.

7 files changed, 9 insertions, 39 deletions

diff --git a/WebSetup.hs b/WebSetup.hs
index 3deba51ea..5eec3dd91 100644
--- a/WebSetup.hs
+++ b/WebSetup.hs
@@ -50,6 +50,7 @@ setupWeb gf args dest pkg lbi =
       where
         tmp_dir = gfo_dir</>tmp
         cmd = gf++" -make -s -optimize-pgf --gfo-dir="++tmp_dir++
+              " --gf-lib-path=dist/build/rgl"++
            -- " --output-dir="++grammars_dir++  -- has no effect?!
               " "++src
 
diff --git a/build-binary-dist.sh b/build-binary-dist.sh
index 2c014f57c..439d7e6dc 100644
--- a/build-binary-dist.sh
+++ b/build-binary-dist.sh
@@ -13,23 +13,10 @@ langs=""                           # which languages?
 set -e                             # Stop if an error occurs
 set -x                             # print commands before exuting them
 
-cabal install    # gf needs to be installed before building gf-server below
-
-runhaskell Setup.hs configure --user --prefix $prefix
+runhaskell Setup.hs configure --user --prefix $prefix -fserver
 runhaskell Setup.hs build $langs
 runhaskell Setup.hs copy --destdir=$destdir $langs
 
-(
-cd src/server
-
-## If you don't already have the packages gf-server depends on, this is
-## the easiest way to install them:
-#cabal install
-
-runhaskell Setup.hs configure --user --prefix $prefix
-runhaskell Setup.hs build
-runhaskell Setup.hs copy --destdir=$destdir
-)
 tar -C $destdir/$prefix -zcf $targz .
 echo "Created $targz, rename it to something more informative"
 rm -r $destdir
diff --git a/doc/gf-quickstart.html b/doc/gf-quickstart.html
index 58f47e30f..b19a3f83b 100644
--- a/doc/gf-quickstart.html
+++ b/doc/gf-quickstart.html
@@ -13,7 +13,7 @@
 <p>
 Aarne Ranta
 <p>
-October 2011 for GF 3.2.10
+October 2011 for GF 3.3
 
 <p>
 
@@ -129,9 +129,9 @@ You can use this in Haskell and Java programs, and also on web services, such as
 The quickest way to provide a GF web service is to start GF with the <tt>-server</tt> option:
 <pre>
   $ gf -server
-  This is GF version 3.2.10.
+  This is GF version 3.3
   Built on linux/i386 with ghc-7.0, flags: interrupt server cclazy
-  Document root = /usr/local/share/gf-3.2.10/www
+  Document root = /usr/local/share/gf-3.3/www
   Starting HTTP server, open http://localhost:41296/ in your web browser.
 </pre>
 You can view it locally by pointing your
diff --git a/download/index-3.3.t2t b/download/index-3.3.t2t
index 170b7b6bc..561979e5e 100644
--- a/download/index-3.3.t2t
+++ b/download/index-3.3.t2t
@@ -11,7 +11,7 @@ Grammatical Framework Download and Installation
 What's new? See the [Release notes release-3.3.html].
 
 
-== Latest released binary packages ==
+== Binary packages ==
 
 **TO BE UPDATED**
 
diff --git a/gf.cabal b/gf.cabal
index 105415964..9d6176db7 100644
--- a/gf.cabal
+++ b/gf.cabal
@@ -1,5 +1,5 @@
 name: gf
-version: 3.2.10-darcs
+version: 3.3
 
 cabal-version: >= 1.8
 build-type: Custom
diff --git a/index.html b/index.html
index 92cc8e34c..8b7c1ff66 100644
--- a/index.html
+++ b/index.html
@@ -11,9 +11,9 @@
 <IMG SRC="doc/Logos/gf0.png" alt="">
 <H1>Grammatical Framework</H1>
 <P>
-Version 3.2
+Version 3.3
 <br>
-December 2010
+October 2011
 
 <P>
 <font size=+2>
diff --git a/src/runtime/haskell/PGF/SortTop.hs b/src/runtime/haskell/PGF/SortTop.hs
index 275698af6..b5b5f4857 100644
--- a/src/runtime/haskell/PGF/SortTop.hs
+++ b/src/runtime/haskell/PGF/SortTop.hs
@@ -2,25 +2,12 @@ module PGF.SortTop
     ( forExample
      ) where
 
-import PGF.Linearize
-import PGF.Macros
-import System.IO
 import PGF.CId
 import PGF.Data
-import PGF.Macros
 import PGF.Expr
-import Data.Array.IArray
-import Data.List
-import Control.Monad
 import qualified Data.Map as Map
-import qualified Data.IntMap as IntMap
 import qualified Data.Set as Set
 import Data.Maybe
-import System.Environment (getArgs)
-import Data.Binary
-
-
-
 
 
 arguments :: Type -> [CId]
@@ -89,8 +76,3 @@ returnCat abs cid =
 forExample :: PGF -> IO [[((CId,CId),[CId])]]
 forExample pgf = let abs = abstract pgf 
        in showInOrder abs Set.empty (Set.fromList $ Map.keys $ funs abs) Set.empty 
-
-
-
-
-