Commit 3724a4fb authored by Bernd Brassel's avatar Bernd Brassel
Browse files

some corrections

parent 776e1257
Name: KiCS
Version: 0.9.1
Cabal-Version: == 1.6.*
Cabal-Version: >= 1.6.0.3
Author: Bernd Braßel
Maintainer: Bernd Braßel
Homepage: http://curry-language.org
......
import qualified Char
import qualified Debugger.ShowTerm as ST
import qualified Curry.Debugger.ShowTerm as ST
instance DI.GenTerm Float where
genTerm FloatUnderscore = DI.TermUnderscore (DI.SrcID "Prelude" 2)
......
module Curry.Files.KiCSDebugPath
(getMkstrict
,debugVersion
,module Curry.Files.ProphecyPath
,Curry.Files.KiCSDebugPath.getOracleLibDir
,getProphecy
) where
import Data.Version
import System.FilePath
import Paths_KiCS_debugger
import Curry.Files.ProphecyPath
import Curry.Files.ProphecyPath as O
debugVersion = showVersion version
......@@ -16,3 +17,9 @@ getMkstrict = do
execDir <- getBinDir
return (execDir </> "mkstrict")
getOracleLibDir = do
o <- O.getOracleLibDir
d <- getDataDir
return (o++searchPathSeparator:d </> "Curry" </> "Module")
Name: KiCS-debugger
Version: 0.1.0
Version: 0.1.1
Cabal-Version: >= 1.6
Author: Bernd Braßel
Maintainer: Bernd Braßel
......@@ -53,6 +53,80 @@ Library
Curry.Debugger.Tools.StrictEvaluation.Monad
Curry.Debugger.Tools.Observe.Monad
Curry.Module.OracleDequeue
Curry.Module.OracleIOExts
Curry.Module.OracleRedBlackTree
Curry.Module.OracleList
Curry.Module.OracleTraversal
Curry.Module.OracleFlexRigid
Curry.Module.OracleTime
Curry.Module.OracleRead
Curry.Module.OracleFloat
Curry.Module.OracleSetRBT
Curry.Module.OracleTrace
Curry.Module.OraclePretty
Curry.Module.OracleGraphInductive
Curry.Module.OracleCurryStringClassifier
Curry.Module.OracleFlatCurryTools
Curry.Module.OracleInteger
Curry.Module.OracleUnsafe
Curry.Module.OracleDirectory
Curry.Module.OracleFlatCurryShow
Curry.Module.OracleChar
Curry.Module.OracleSystem
Curry.Module.OraclePropertyFile
Curry.Module.OracleInteractive
Curry.Module.OracleTableRBT
Curry.Module.OracleSort
Curry.Module.OracleFlatCurryRead
Curry.Module.OracleSocket
Curry.Module.OracleXML
Curry.Module.OracleAbstractCurry
Curry.Module.OracleStyledText
Curry.Module.OracleFlatCurryXML
Curry.Module.OraclePrettyFlat
Curry.Module.OracleDistribution
Curry.Module.OracleAbstractCurryPrinter
Curry.Module.OracleReadShowTerm
Curry.Module.OracleAnsiCodes
Curry.Module.OracleFlatCurry
Curry.Module.OracleParser
Curry.Module.OracleFileGoodies
Curry.Module.OracleMaybe
Curry.Module.OracleCompactFlatCurry
Curry.Module.OracleRandom
Curry.Module.OracleCurrySyntax
Curry.Module.OracleIO
Curry.Module.OracleCSV
Curry.Module.OracleRandomExternal
Curry.Module.OracleGlobal
Curry.Module.OracleArray
Curry.Module.OracleAssertion
Curry.Module.OracleFiniteMap
Curry.Module.OracleMeta
Curry.Module.OraclePrelude
Curry.Module.OracleFlatCurryGoodies
Curry.Module.OracleEasyCheck
Curry.DebugModule.Dequeue
Curry.DebugModule.List
Curry.DebugModule.Time
Curry.DebugModule.Read
Curry.DebugModule.Float
Curry.DebugModule.Trace
Curry.DebugModule.Integer
Curry.DebugModule.Directory
Curry.DebugModule.Char
Curry.DebugModule.Interactive
Curry.DebugModule.Sort
Curry.DebugModule.XML
Curry.DebugModule.ReadShowTerm
Curry.DebugModule.AnsiCodes
Curry.DebugModule.FileGoodies
Curry.DebugModule.Maybe
Curry.DebugModule.CSV
Curry.DebugModule.RandomExternal
Curry.DebugModule.Prelude
Other-Modules:
Curry.Debugger.Logic
Curry.Debugger.BoolStack
......@@ -72,9 +146,9 @@ Executable mkstrict
base == 4.1.*,
haskell-src,
directory,
curry-base >= 0.2.6,
KiCS >= 0.9.0,
KiCS-prophecy >= 0.1.0
curry-base >= 0.2.7,
KiCS >= 0.9.1,
KiCS-prophecy >= 0.1.1
Other-Modules:
Curry.Module.SrcRef
Curry.Module.AbstractHaskell
......
......@@ -12,14 +12,14 @@ import Distribution.Simple.LocalBuildInfo
import Distribution.Simple.PreProcess
import Distribution.PackageDescription
import Distribution.Verbosity
import Distribution.ModuleName (ModuleName(..))
import Distribution.ModuleName hiding (main)
import Curry.Files.CymakePath
import Curry.Files.KiCSPath
import Curry.Files.ProphecyPath
withLibs :: Bool
withLibs = True
withLibs = False
kics, cymake, prophecy :: IO Program
kics = mkProg getKiCS
......@@ -42,7 +42,7 @@ main = do
defaultMainWithHooks simpleUserHooks
{hookedPrograms=mkstrict:kicsProg:cymakeProg:prophecyProg:
hookedPrograms simpleUserHooks
hookedPrograms simpleUserHooks
,confHook=myConfHook
,postConf=myPostConf
,hookedPreProcessors=[("curry",mkModule),
......@@ -62,8 +62,8 @@ myConfHook info flags = do
if not withLibs
then return lbi
else do
libPath <- getKiCSLibDir
dataPath <- getKiCSDataDir
print 13
libPath <- getKiCSLibDir
allFiles <- getDirectoryContents libPath
let stdfiles = filter (isSuffixOf ".fcy") allFiles
......@@ -72,14 +72,19 @@ myConfHook info flags = do
goodlibs = map takeBaseName goodfiles
libs = map (\ l -> modName ("Curry":"Module":["Oracle" ++ l])) stdlibs
++map (\ l -> modName ("Curry":"DebugModule":[l])) goodlibs
dbgPath = "Curry" </> "DebugModule"
mapM_ (\ lib -> copyFile (libPath </> lib) (dbgPath </> lib)) goodfiles
let dbgPath = "Curry" </> "DebugModule"
mapM_ (putStrLn . (" "++) . foldr (<.>) "" . components) libs
mapM_ (\ lib -> mayCopyFile (libPath </> lib) (dbgPath </> lib)) goodfiles
let require = requireProg flags lbi
prop <- require prophecy
mapM_ (mkOracleLib (unflag $ configVerbosity flags) prop) stdlibs
dataPath <- getKiCSDataDir
let package = localPkgDescr lbi
Just lib = library package
ex = exposedModules lib
......@@ -88,7 +93,14 @@ myConfHook info flags = do
llbi' = llbi{hsSourceDirs=dataPath:hsdirs}
lib' = Just lib{exposedModules=ex ++ libs,
libBuildInfo=llbi'}
return lbi{localPkgDescr=package{library=lib'}}
return (lbi{localPkgDescr=package{library=lib'}})
mayCopyFile :: FilePath -> FilePath -> IO ()
mayCopyFile src dest = do
ex <- doesFileExist dest
if ex then return () else copyFile src dest
unflag = fromFlagOrDefault silent
......@@ -215,7 +227,7 @@ runKicsFcy :: LocalBuildInfo -> FilePath -> FilePath -> Verbosity -> IO ()
runKicsFcy lbi infile outfile verb
| isPrefixOf "Curry/Module" infile
= do
libPath <- getOracleLibDir
libPath <- getOracleLibBaseDir
callKics ["-userlibpath",libPath ++ pathSeparator:"Curry/Module"]
| isPrefixOf "Curry/DebugModule" infile
= do
......
module Curry.Files.ProphecyPath
(getProphecy
,getOracleLibDir
,getOracleLibBaseDir
,prophecyVersion
) where
......@@ -14,4 +15,8 @@ getProphecy = do
execDir <- getBinDir
return (execDir </> "prophecy")
getOracleLibDir = getDataDir
getOracleLibBaseDir = getDataDir
getOracleLibDir = do
dir <- getDataDir
return (dir </> "Curry" </> "Module")
Name: KiCS-prophecy
Version: 0.1.0
Cabal-Version: == 1.6.*
Version: 0.1.1
Cabal-Version: >= 1.6
Author: Bernd Braßel
Maintainer: Bernd Braßel
Homepage: http://curry-language.org
......@@ -49,7 +49,7 @@ Executable prophecy
hs-source-dirs: ., .curry/kics
Build-Depends:
base == 4.1.*,
KiCS >= 0.9.0
KiCS >= 0.9.1
Other-Modules:
Curry.Module.AddWorld
Curry.Module.Wrapper
......
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