diff --git a/leksah-server.cabal b/leksah-server.cabal --- a/leksah-server.cabal +++ b/leksah-server.cabal @@ -1,10 +1,10 @@ name: leksah-server -version: 0.10.0 -cabal-version: >= 1.2 +version: 0.10.0.3 +cabal-version: >= 1.8 build-type: Simple license: GPL license-file: LICENSE -copyright: 2007-2009 Juergen Nicklisch-Franken, Hamish Mackenzie +copyright: 2007-2011 Juergen Nicklisch-Franken, Hamish Mackenzie maintainer: maintainer@leksah.org stability: provisional homepage: http://leksah.org @@ -15,7 +15,7 @@ category: IDE author: Juergen "jutaro" Nicklisch-Franken, Hamish Mackenzie data-dir: "" -tested-with: GHC ==6.10 || ==6.12 +tested-with: GHC ==6.10 || ==6.12 || ==7.0 data-files: data/prefscoll.lkshp flag curl @@ -127,6 +127,9 @@ hs-source-dirs: src ghc-prof-options: -auto-all -prof -- ghc-shared-options: -auto-all -prof + build-depends: base >= 4.0.0.0 && <4.4, hslogger >= 1.0.7 && <1.2, deepseq >=1.1 && <1.2, + process-leksah >=1.0.1.3 && <1.1 + if flag(threaded) ghc-options: -threaded diff --git a/src/IDE/Core/CTypes.hs b/src/IDE/Core/CTypes.hs --- a/src/IDE/Core/CTypes.hs +++ b/src/IDE/Core/CTypes.hs @@ -3,7 +3,7 @@ ----------------------------------------------------------------------------- -- -- Module : IDE.Core.CTypes --- Copyright : 2007-2010 Juergen Nicklisch-Franken, Hamish Mackenzie +-- Copyright : 2007-2011 Juergen Nicklisch-Franken, Hamish Mackenzie -- License : GPL -- -- Maintainer : maintainer@leksah.org diff --git a/src/IDE/Core/Serializable.hs b/src/IDE/Core/Serializable.hs --- a/src/IDE/Core/Serializable.hs +++ b/src/IDE/Core/Serializable.hs @@ -7,7 +7,7 @@ ----------------------------------------------------------------------------- -- -- Module : IDE.Core.Serializable --- Copyright : 2007-2010 Juergen Nicklisch-Franken, Hamish Mackenzie +-- Copyright : 2007-2011 Juergen Nicklisch-Franken, Hamish Mackenzie -- License : GPL -- -- Maintainer : Jutaro diff --git a/src/IDE/HeaderParser.hs b/src/IDE/HeaderParser.hs --- a/src/IDE/HeaderParser.hs +++ b/src/IDE/HeaderParser.hs @@ -1,7 +1,7 @@ ----------------------------------------------------------------------------- -- -- Module : IDE.HeaderParser --- Copyright : 2007-2010 Juergen Nicklisch-Franken, Hamish Mackenzie +-- Copyright : 2007-2011 Juergen Nicklisch-Franken, Hamish Mackenzie -- License : GPL -- -- Maintainer : maintainer@leksah.org @@ -26,12 +26,12 @@ import Control.Monad.Trans (liftIO) import Data.Maybe (mapMaybe) import Outputable(pprHsVar,showSDoc) -import IDE.Utils.FileUtils (figureOutGhcOpts) +import IDE.Utils.FileUtils (figureOutHaddockOpts, figureOutGhcOpts) parseTheHeader :: FilePath -> IO ServerAnswer parseTheHeader filePath = do text <- readFile filePath - opts <- figureOutGhcOpts + opts <- figureOutHaddockOpts parseResult <- liftIO $ myParseHeader filePath text opts case parseResult of Left str -> return (ServerFailed str) diff --git a/src/IDE/Metainfo/Collector.hs b/src/IDE/Metainfo/Collector.hs --- a/src/IDE/Metainfo/Collector.hs +++ b/src/IDE/Metainfo/Collector.hs @@ -2,7 +2,7 @@ ----------------------------------------------------------------------------- -- -- Module : Main --- Copyright : 2007-2010 Juergen Nicklisch-Franken, Hamish Mackenzie +-- Copyright : 2007-2011 Juergen Nicklisch-Franken, Hamish Mackenzie -- License : GPL -- -- Maintainer : maintainer@leksah.org diff --git a/src/IDE/Metainfo/SourceCollectorH.hs b/src/IDE/Metainfo/SourceCollectorH.hs --- a/src/IDE/Metainfo/SourceCollectorH.hs +++ b/src/IDE/Metainfo/SourceCollectorH.hs @@ -2,7 +2,7 @@ ----------------------------------------------------------------------------- -- -- Module : IDE.Metainfo.SourceCollectorH --- Copyright : 2007-2010 Juergen Nicklisch-Franken, Hamish Mackenzie +-- Copyright : 2007-2011 Juergen Nicklisch-Franken, Hamish Mackenzie -- License : GPL -- -- Maintainer : maintainer@leksah.org diff --git a/src/IDE/Metainfo/SourceDB.hs b/src/IDE/Metainfo/SourceDB.hs --- a/src/IDE/Metainfo/SourceDB.hs +++ b/src/IDE/Metainfo/SourceDB.hs @@ -2,7 +2,7 @@ ----------------------------------------------------------------------------- -- -- Module : IDE.Metainfo.SourceDB --- Copyright : 2007-2010 Juergen Nicklisch-Franken, Hamish Mackenzie +-- Copyright : 2007-2011 Juergen Nicklisch-Franken, Hamish Mackenzie -- License : GPL -- -- Maintainer : maintainer@leksah.org diff --git a/src/IDE/Metainfo/WorkspaceCollector.hs b/src/IDE/Metainfo/WorkspaceCollector.hs --- a/src/IDE/Metainfo/WorkspaceCollector.hs +++ b/src/IDE/Metainfo/WorkspaceCollector.hs @@ -2,7 +2,7 @@ ----------------------------------------------------------------------------- -- -- Module : IDE.Metainfo.WorkspaceCollector --- Copyright : 2007-2010 Juergen Nicklisch-Franken, Hamish Mackenzie +-- Copyright : 2007-2011 Juergen Nicklisch-Franken, Hamish Mackenzie -- License : GPL -- -- Maintainer : maintainer@leksah.org diff --git a/src/IDE/StrippedPrefs.hs b/src/IDE/StrippedPrefs.hs --- a/src/IDE/StrippedPrefs.hs +++ b/src/IDE/StrippedPrefs.hs @@ -1,7 +1,7 @@ ----------------------------------------------------------------------------- -- -- Module : IDE.StrippedPrefs --- Copyright : 2007-2010 Juergen Nicklisch-Franken, Hamish Mackenzie +-- Copyright : 2007-2011 Juergen Nicklisch-Franken, Hamish Mackenzie -- License : GPL -- -- Maintainer : maintainer@leksah.org diff --git a/src/IDE/Utils/FileUtils.hs b/src/IDE/Utils/FileUtils.hs --- a/src/IDE/Utils/FileUtils.hs +++ b/src/IDE/Utils/FileUtils.hs @@ -2,7 +2,7 @@ ----------------------------------------------------------------------------- -- -- Module : IDE.Utils.FileUtils --- Copyright : 2007-2010 Juergen Nicklisch-Franken, Hamish Mackenzie +-- Copyright : 2007-2011 Juergen Nicklisch-Franken, Hamish Mackenzie -- License : GPL -- -- Maintainer : maintainer@leksah.org @@ -312,7 +312,7 @@ return (Set.fromList nameList)) $ \ _ -> return (Set.empty) -cabalFileName :: FilePath -> IO (Maybe String) +cabalFileName :: FilePath -> IO (Maybe FilePath) cabalFileName filePath = catch (do exists <- doesDirectoryExist filePath if exists diff --git a/src/IDE/Utils/GHCUtils.hs b/src/IDE/Utils/GHCUtils.hs --- a/src/IDE/Utils/GHCUtils.hs +++ b/src/IDE/Utils/GHCUtils.hs @@ -2,7 +2,7 @@ ----------------------------------------------------------------------------- -- -- Module : IDE.Utils.GHCUtils --- Copyright : 2007-2010 Juergen Nicklisch-Franken, Hamish Mackenzie +-- Copyright : 2007-2011 Juergen Nicklisch-Franken, Hamish Mackenzie -- License : GPL -- -- Maintainer : Jutaro diff --git a/src/IDE/Utils/Server.hs b/src/IDE/Utils/Server.hs --- a/src/IDE/Utils/Server.hs +++ b/src/IDE/Utils/Server.hs @@ -2,7 +2,7 @@ ----------------------------------------------------------------------------- -- -- Module : IDE.Utils.Server --- Copyright : 2007-2010 Juergen Nicklisch-Franken, Hamish Mackenzie +-- Copyright : 2007-2011 Juergen Nicklisch-Franken, Hamish Mackenzie -- License : GPL -- -- Maintainer : maintainer@leksah.org diff --git a/src/IDE/Utils/Utils.hs b/src/IDE/Utils/Utils.hs --- a/src/IDE/Utils/Utils.hs +++ b/src/IDE/Utils/Utils.hs @@ -2,7 +2,7 @@ ----------------------------------------------------------------------------- -- -- Module : IDE.Utils.Utils --- Copyright : 2007-2010 Juergen Nicklisch-Franken, Hamish Mackenzie +-- Copyright : 2007-2011 Juergen Nicklisch-Franken, Hamish Mackenzie -- License : GPL -- -- Maintainer : maintainer@leksah.org diff --git a/src/IDE/Utils/VersionUtils.hs b/src/IDE/Utils/VersionUtils.hs --- a/src/IDE/Utils/VersionUtils.hs +++ b/src/IDE/Utils/VersionUtils.hs @@ -2,7 +2,7 @@ ----------------------------------------------------------------------------- -- -- Module : IDE.Utils.VersionUtils --- Copyright : 2007-2010 Juergen Nicklisch-Franken, Hamish Mackenzie +-- Copyright : 2007-2011 Juergen Nicklisch-Franken, Hamish Mackenzie -- License : GPL Nothing -- -- Maintainer : maintainer@leksah.org diff --git a/src/LeksahEcho.hs b/src/LeksahEcho.hs --- a/src/LeksahEcho.hs +++ b/src/LeksahEcho.hs @@ -1,7 +1,7 @@ ----------------------------------------------------------------------------- -- -- Module : Main --- Copyright : 2007-2010 Juergen Nicklisch-Franken, Hamish Mackenzie +-- Copyright : 2007-2011 Juergen Nicklisch-Franken, Hamish Mackenzie -- License : GPL -- -- Maintainer : maintainer@leksah.org