GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 19:42:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

src/server/ContentService.hs: fix compilaton problem

Browse Source
This commit is contained in:
hallgren
2012-02-23 16:46:21 +00:00
parent 3daf76c559
commit 9dbe4ba41a
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/ContentService.hs
View File

@@ -14,11 +14,13 @@ import qualified Codec.Binary.UTF8.String as UTF8 (encodeString, decodeString)
import Control.Monad import Control.Monad
import Control.Exception import Control.Exception
import Control.Concurrent(forkIO)
import System.Environment(getArgs) import System.Environment(getArgs)
import System.Time import System.Time
import System.Locale import System.Locale
import System.FilePath import System.FilePath
import Database.HSQL.MySQL import Database.HSQL.MySQL
import Database.HSQL.Types(toSqlValue)
logFile :: FilePath logFile :: FilePath
logFile = "content-error.log" logFile = "content-error.log"

13
src/server/gf-server.cabal
View File

@@ -8,10 +8,13 @@ synopsis: FastCGI Server for Grammatical Framework
flag fastcgi flag fastcgi
Description: Build the fastcgi service (requires the fastcgi package) Description: Build the fastcgi service (requires the fastcgi package)
(In Ubuntu: apt-get install libghc-fastcgi-dev)
Default: False Default: False
flag content 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 Default: False
executable pgf-http executable pgf-http
@@ -53,6 +56,7 @@ executable pgf-service
if flag(fastcgi) if flag(fastcgi)
build-depends: fastcgi >= 3001.0.2.2 build-depends: fastcgi >= 3001.0.2.2
-- Install it in Ubuntu with: apt-get install libghc-fastcgi-dev
buildable: True buildable: True
else else
buildable: False buildable: False
@@ -78,8 +82,11 @@ executable pgf-service
executable content-service executable content-service
if flag(content) if flag(content)
build-depends: base >=4.2 && <5, build-depends: base >=4.2 && <5, old-locale,
fastcgi >= 3001.0.2.2, hsql-mysql, hsql, 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 buildable: True
else else
buildable: False buildable: False