Commit 6773f2dd authored by Bernd Brassel's avatar Bernd Brassel
Browse files

still some bugs with cabal fixed

parent 3724a4fb
Name: KiCS
Version: 0.9.1
Version: 0.9.2
Cabal-Version: >= 1.6.0.3
Author: Bernd Braßel
Maintainer: Bernd Braßel
......
......@@ -20,6 +20,6 @@ getMkstrict = do
getOracleLibDir = do
o <- O.getOracleLibDir
d <- getDataDir
return (o++searchPathSeparator:d </> "Curry" </> "Module")
return [o,d </> "Curry" </> "Module"]
......@@ -102,8 +102,8 @@ data DebugOptions =
debugOn :: Bool,
oracleTransformation,
bioTransformation,
debugtool,
oracleLibDir :: String} deriving Show
debugtool :: String,
oracleLibPath :: [String]} deriving Show
data Options = Opts{ filename, mainFunc, mainModule,
frontend, ghcOpts, stdLibDir
......@@ -125,8 +125,8 @@ addFileDirToPath fn = case takeDirectory fn of "" -> id; dir -> (dir:)
libpath :: Options -> [String]
libpath opts@Opts{userlibpath=up,filename=fn,stdLibDir=std,
debugOptions=Right DebugOptions{debugOn=True,oracleLibDir=o}} =
addFileDirToPath fn $ up ++ [std,o]
debugOptions=Right DebugOptions{debugOn=True,oracleLibPath=o}} =
addFileDirToPath fn $ up ++ (std:o)
libpath opts@Opts{userlibpath=up,filename=fn,stdLibDir=std} =
addFileDirToPath fn $ up ++ [std]
......@@ -330,7 +330,7 @@ getDebugOptions opts = do
debugtool="Observations",
oracleTransformation=p,
bioTransformation=m,
oracleLibDir=o})
oracleLibPath=o})
updDebugOpts :: (DebugOptions -> DebugOptions) -> Options -> (Options -> IO a) -> IO a
updDebugOpts _ opts@Opts{debugOptions=Left True} cont = do
......
......@@ -135,7 +135,7 @@ getFlatCurryFileName opts@(Opts{filename=basename}) = do
notUptodate opts@(Opts{filename=foundBasename})
| isPrefixOf (stdLibDir opts) founddir ||
either (const False)
((`isPrefixOf` founddir) . oracleLibDir)
(any (`isPrefixOf` founddir) . oracleLibPath)
(debugOptions opts)
= return False
| otherwise = do
......
......@@ -309,8 +309,6 @@ callFrontendWithParams target params progname = do
showFrontendParams =
(if quiet params then runQuiet else "")
++ (maybe "" (" -o "++) (outfile params))
++ (maybe "" (\p -> " --fullpath " ++ concat (intersperse ":" p))
(fullPath params))
runQuiet = if isPakcs then " --quiet "
else " --no-verb --no-warn --no-overlap-warn " -- kics
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment