bfc32ac · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

on master help sign in

Fix #3397 - ibcsubdir was broken

bfc32acEcho Nolan10 years ago

src/Idris/Imports.hs+1−1

@@ -48,7 +48,7 @@ ibcPath :: FilePath -> Bool -> FilePath -> FilePath

48ibcPath ibcsd use_ibcsd fp = let (d_fp, n_fp) = splitFileName fp

49 d = if (not use_ibcsd) || ibcsd == ""

50 then d_fp

51− else d_fp </> ibcsd

51+ else ibcsd </> d_fp

52 n = dropExtension n_fp

53 in d </> n <.> "ibc"

src/Idris/Package.hs+4−1

@@ -64,7 +64,10 @@ buildPkg :: [Opt] -- ^ Command line options

64buildPkg copts warnonly (install, fp) = do

65 pkgdesc <- parseDesc fp

66 dir <- getCurrentDirectory

67− let idx = PkgIndex (pkgIndex (pkgname pkgdesc))

67+ let idx' = pkgIndex $ pkgname pkgdesc

68+ idx = PkgIndex $ case opt getIBCSubDir copts of

69+ (ibcsubdir:_) -> ibcsubdir </> idx'

70+ [] -> idx'

68 oks <- mapM (testLib warnonly (pkgname pkgdesc)) (libdeps pkgdesc)

71 oks <- mapM (testLib warnonly (pkgname pkgdesc)) (libdeps pkgdesc)

69 when (and oks) $ do

72 when (and oks) $ do

70 m_ist <- inPkgDir pkgdesc $ do

73 m_ist <- inPkgDir pkgdesc $ do