diff options
| author | hallgren <hallgren@chalmers.se> | 2012-02-23 16:46:21 +0000 |
|---|---|---|
| committer | hallgren <hallgren@chalmers.se> | 2012-02-23 16:46:21 +0000 |
| commit | e30eeb4918ed970040ab5209d36c14335881b5b5 (patch) | |
| tree | 048823262d6c3f68fa4c2036a50a3faa57770b46 /src/server | |
| parent | 4ba99446636fc3b937b95362a86db84538b8a1c4 (diff) | |
src/server/ContentService.hs: fix compilaton problem
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/ContentService.hs | 2 | ||||
| -rw-r--r-- | src/server/gf-server.cabal | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/server/ContentService.hs b/src/server/ContentService.hs index 297b3c881..0f2eb6508 100644 --- a/src/server/ContentService.hs +++ b/src/server/ContentService.hs @@ -14,11 +14,13 @@ import qualified Codec.Binary.UTF8.String as UTF8 (encodeString, decodeString) import Control.Monad import Control.Exception +import Control.Concurrent(forkIO) import System.Environment(getArgs) import System.Time import System.Locale import System.FilePath import Database.HSQL.MySQL +import Database.HSQL.Types(toSqlValue) logFile :: FilePath logFile = "content-error.log" diff --git a/src/server/gf-server.cabal b/src/server/gf-server.cabal index c3cadd84f..b92d882df 100644 --- a/src/server/gf-server.cabal +++ b/src/server/gf-server.cabal @@ -8,10 +8,13 @@ synopsis: FastCGI Server for Grammatical Framework flag fastcgi Description: Build the fastcgi service (requires the fastcgi package) + (In Ubuntu: apt-get install libghc-fastcgi-dev) Default: False flag content - Description: Build content service (requires fastcgi and hsql-mysql packages) + Description: + Build content service (requires fastcgi and hsql-mysql packages) + (In Ubuntu: apt-get install libghc-fastcgi-dev libghc-hsql-mysql-dev) Default: False executable pgf-http @@ -53,6 +56,7 @@ executable pgf-service if flag(fastcgi) build-depends: fastcgi >= 3001.0.2.2 + -- Install it in Ubuntu with: apt-get install libghc-fastcgi-dev buildable: True else buildable: False @@ -78,8 +82,11 @@ executable pgf-service executable content-service if flag(content) - build-depends: base >=4.2 && <5, - fastcgi >= 3001.0.2.2, hsql-mysql, hsql, old-locale + build-depends: base >=4.2 && <5, old-locale, + fastcgi >= 3001.0.2.2, + -- In Ubuntu: apt-get install libghc-fastcgi-dev + hsql-mysql, hsql + -- In Ubuntu: apt-get install libghc-hsql-mysql-dev buildable: True else buildable: False |