add Cabal description for GF

7 files changed, 169 insertions, 56 deletions

diff --git a/GF.cabal b/GF.cabal
new file mode 100644
index 000000000..11922cbda
--- /dev/null
+++ b/GF.cabal
@@ -0,0 +1,166 @@
+name: gf
+version: 3.0
+cabal-version: >= 1.2
+build-type: Simple
+license: GPL
+license-file: LICENSE
+synopsis: Grammatical Framework
+
+
+library
+  build-depends: base,
+                 array,
+                 containers,
+                 bytestring,
+                 random
+  ghc-options: -O2
+  hs-source-dirs: src-3.0
+  extensions: 
+  exposed-modules: 
+    GF.GFCC.API
+  other-modules:
+    GF.GFCC.Raw.AbsGFCCRaw
+    GF.GFCC.DataGFCC
+    GF.GFCC.CId
+    GF.GFCC.Raw.ParGFCCRaw
+    GF.GFCC.Macros
+    GF.GFCC.Generate
+    GF.GFCC.Linearize
+    GF.Command.LexGFShell
+    GF.Command.AbsGFShell
+    GF.Command.PrintGFShell
+    GF.Data.RedBlackSet
+    GF.Data.GeneralDeduction
+    GF.Infra.CompactPrint
+    GF.Text.UTF8
+    GF.Data.Utilities
+    GF.Data.SortedList
+    GF.Data.Assoc
+    GF.Infra.PrintClass
+    GF.Formalism.Utilities
+    GF.Parsing.FCFG.Range
+    GF.Formalism.FCFG
+    GF.Parsing.FCFG.PInfo
+    GF.Parsing.FCFG.Active
+    GF.GFCC.Raw.ConvertGFCC
+    GF.Data.ErrM
+    GF.Command.ParGFShell
+    GF.Command.PPrTree
+    GF.Parsing.FCFG
+
+
+executable gf3
+  build-depends: base,
+                 array,
+                 containers,
+                 bytestring,
+                 filepath,
+                 directory,
+                 random,
+                 old-time,
+                 process
+  if os(windows)
+    build-depends: Win32
+  else
+    build-depends: posix
+  ghc-options: -O2
+  hs-source-dirs: src-3.0
+  extensions:
+  main-is: GF.hs
+  other-modules:
+    GF.Source.ErrM
+    GF.Grammar.ReservedWords
+    GF.Data.BacktrackM
+    GF.Source.SharedString
+    GF.Source.LexGF
+    GF.Source.AbsGF
+    GF.Source.PrintGF
+    GF.JavaScript.AbsJS
+    GF.JavaScript.PrintJS
+    GF.GFCC.Raw.AbsGFCCRaw
+    GF.Command.LexGFShell
+    GF.Command.AbsGFShell
+    GF.Command.PrintGFShell
+    GF.Data.RedBlackSet
+    GF.Data.GeneralDeduction
+    GF.Infra.CompactPrint
+    GF.Text.UTF8
+    GF.Data.Utilities
+    GF.Data.SortedList
+    GF.Data.Assoc
+    GF.Infra.PrintClass
+    GF.GFCC.CId
+    GF.GFCC.Raw.ParGFCCRaw
+    GF.GFCC.Raw.PrintGFCCRaw
+    GF.Formalism.Utilities
+    GF.Parsing.FCFG.Range
+    GF.Formalism.FCFG
+    GF.Parsing.FCFG.PInfo
+    GF.GFCC.DataGFCC
+    GF.Parsing.FCFG.Active
+    GF.GFCC.Raw.ConvertGFCC
+    GF.GFCC.Macros
+    GF.GFCC.Generate
+    GF.GFCC.Linearize
+    GF.Conversion.SimpleToFCFG
+    GF.Data.ErrM
+    GF.Parsing.FCFG
+    GF.Command.ParGFShell
+    GF.Command.PPrTree
+    GF.GFCC.API
+    GF.GFCC.CheckGFCC
+    GF.Source.ParGF
+    GF.Data.Operations
+    GF.GFCC.GFCCtoHaskell
+    GF.GFCC.ShowLinearize
+    GF.GFCC.OptimizeGFCC
+    GF.Infra.Ident
+    GF.Grammar.Predef
+    GF.Data.Str
+    GF.Data.Zipper
+    GF.Today
+    GF.Infra.Option
+    GF.Infra.UseIO
+    GF.GFCC.GFCCtoJS
+    GF.GFCC.PrintGFCC
+    GF.Command.Commands
+    GF.Command.Interpreter
+    GF.Infra.Modules
+    GF.Grammar.Grammar
+    GF.Source.GrammarToSource
+    GF.Grammar.Values
+    GF.Grammar.PrGrammar
+    GF.Grammar.Macros
+    GF.Grammar.Lockfield
+    GF.Grammar.Refresh
+    GF.Grammar.MMacros
+    GF.Grammar.Abstract
+    GF.Grammar.Lookup
+    GF.Compile.RemoveLiT
+    GF.Grammar.LookAbs
+    GF.Compile.TC
+    GF.Grammar.Unify
+    GF.Compile.TypeCheck
+    GF.Compile.Update
+    GF.Compile.OptimizeGF
+    GF.Infra.CheckM
+    GF.Grammar.AppPredefined 
+    GF.Grammar.PatternMatch
+    GF.Compile.CheckGrammar
+    GF.Compile.BackOpt
+    GF.Compile.Extend
+    GF.Compile.Rename
+    GF.Compile.ReadFiles
+    GF.Compile.GrammarToGFCC
+    GF.Compile.Compute
+    GF.Compile.Optimize
+    GF.Compile.ModDeps
+    GF.Compile.Rebuild
+    GF.Source.SourceToGrammar
+    GF.Compile.GetGrammar
+    GF.Compile
+    GF.Command.Importing
+    GFC
+    GF.System.NoReadline
+    GF.System.Readline
+    GFI
diff --git a/src-3.0/Setup.lhs b/Setup.lhs
index e2c31e7ca..e2c31e7ca 100644
--- a/src-3.0/Setup.lhs
+++ b/Setup.lhs
diff --git a/src-3.0/GF-embed.cabal b/src-3.0/GF-embed.cabal
deleted file mode 100644
index 54dce00b6..000000000
--- a/src-3.0/GF-embed.cabal
+++ /dev/null
@@ -1,52 +0,0 @@
-Name: gf-embed
-Version: 2.8
-Cabal-version: >= 1.2
-Build-type: Simple
-License: GPL
-License-file: ../LICENSE
-Synopsis: Grammatical Framework embedded API.
-
-Flag split-base
-
-Library
-  Build-depends: mtl, haskell98
-  if flag(split-base)
-    Build-depends: base >= 3.0, array, containers, directory, random
-  else
-    Build-depends: base < 3.0
-  Ghc-options: -O2
-  Extensions: 
-  Exposed-Modules: 
-    GF.GFCC.API
-    -- needed by code generated by -haskell
-    GF.GFCC.DataGFCC
-    GF.GFCC.CId
-  Other-modules:
-    GF.Conversion.SimpleToFCFG
-    GF.Data.Assoc
-    GF.Data.Utilities
-    GF.Data.SortedList
-    GF.Data.BacktrackM
-    GF.Data.ErrM
-    GF.Data.GeneralDeduction
-    GF.Data.RedBlackSet
-    GF.Text.UTF8
-    GF.Infra.CompactPrint
-    GF.Infra.PrintClass
-    GF.Formalism.FCFG
-    GF.Formalism.Utilities
-    GF.Parsing.FCFG
-    GF.Parsing.FCFG.PInfo
-    GF.Parsing.FCFG.Range
-    GF.Parsing.FCFG.Active
-    GF.Command.PPrTree
-    GF.Command.AbsGFShell
-    GF.Command.PrintGFShell
-    GF.Command.ParGFShell
-    GF.Command.LexGFShell
-    GF.GFCC.Macros
-    GF.GFCC.Generate
-    GF.GFCC.Linearize
-    GF.GFCC.Raw.AbsGFCCRaw
-    GF.GFCC.Raw.ParGFCCRaw
-    GF.GFCC.Raw.ConvertGFCC
diff --git a/src-3.0/GF/Command/PrintGFShell.hs b/src-3.0/GF/Command/PrintGFShell.hs
index 31a4584b6..0a02e78e9 100644
--- a/src-3.0/GF/Command/PrintGFShell.hs
+++ b/src-3.0/GF/Command/PrintGFShell.hs
@@ -4,7 +4,7 @@ module GF.Command.PrintGFShell where
 -- pretty-printer generated by the BNF converter
 
 import GF.Command.AbsGFShell
-import Char
+import Data.Char
 
 -- the top-level printing method
 printTree :: Print a => a -> String
diff --git a/src-3.0/GF/Compile/GetGrammar.hs b/src-3.0/GF/Compile/GetGrammar.hs
index 8e6c887bf..4637da09a 100644
--- a/src-3.0/GF/Compile/GetGrammar.hs
+++ b/src-3.0/GF/Compile/GetGrammar.hs
@@ -35,7 +35,7 @@ import Data.Char (toUpper)
 import Data.List (nub)
 import qualified Data.ByteString.Char8 as BS
 import Control.Monad (foldM)
-import System (system)
+import System.Cmd (system)
 
 getSourceModule :: Options -> FilePath -> IOE SourceModule
 getSourceModule opts file0 = do
diff --git a/src-3.0/GF/Compile/ReadFiles.hs b/src-3.0/GF/Compile/ReadFiles.hs
index 2f485224c..f1f94c105 100644
--- a/src-3.0/GF/Compile/ReadFiles.hs
+++ b/src-3.0/GF/Compile/ReadFiles.hs
@@ -34,7 +34,6 @@ import Data.Char
 import Data.List
 import qualified Data.ByteString.Char8 as BS
 import qualified Data.Map as Map
-import System
 import System.Time
 import System.Directory
 import System.FilePath
diff --git a/src-3.0/GF/JavaScript/PrintJS.hs b/src-3.0/GF/JavaScript/PrintJS.hs
index 66e78346e..4e04e3cbf 100644
--- a/src-3.0/GF/JavaScript/PrintJS.hs
+++ b/src-3.0/GF/JavaScript/PrintJS.hs
@@ -4,7 +4,7 @@ module GF.JavaScript.PrintJS (printTree, Doc, Print(..)) where
 -- pretty-printer generated by the BNF converter
 
 import GF.JavaScript.AbsJS
-import Char
+import Data.Char
 
 -- the top-level printing method
 printTree :: Print a => a -> String