@@ -35,7 +35,6 @@ import Data.String (fromString)
35import Data.Time.Clock
35import Data.Time.Clock
36import Data.Version (showVersion)
36import Data.Version (showVersion)
37import qualified Data.Map as M
37import qualified Data.Map as M
38−import qualified Data.ByteString.Lazy as BL
39import qualified Data.ByteString.Char8 as B
38import qualified Data.ByteString.Char8 as B
41import System.Directory (doesDirectoryExist, doesFileExist, getModificationTime, createDirectoryIfMissing)
40import System.Directory (doesDirectoryExist, doesFileExist, getModificationTime, createDirectoryIfMissing)
@@ -91,10 +90,10 @@ buildMakeActions outputDir filePathMap usePrefix =
91 externsFile = outputDir </> filePath </> "externs.purs"
90 externsFile = outputDir </> filePath </> "externs.purs"
92 min <$> getTimestamp srcFile <*> getTimestamp externsFile
91 min <$> getTimestamp srcFile <*> getTimestamp externsFile
94− readExterns :: P.ModuleName -> Make (FilePath, BL.ByteString)
93+ readExterns :: P.ModuleName -> Make (FilePath, P.Externs)
95 readExterns mn = do
94 readExterns mn = do
96 let path = outputDir </> (dotsTo '/' $ P.runModuleName mn) </> "externs.purs"
95 let path = outputDir </> (dotsTo '/' $ P.runModuleName mn) </> "externs.purs"
97− (path, ) <$> readTextFile' path
96+ (path, ) <$> readTextFile path
99 codegen :: CF.Module CF.Ann -> P.Environment -> P.Externs -> P.SupplyT Make ()
98 codegen :: CF.Module CF.Ann -> P.Environment -> P.Externs -> P.SupplyT Make ()
100 codegen m env exts = do
99 codegen m env exts = do
@@ -115,7 +114,7 @@ buildMakeActions outputDir filePathMap usePrefix =
115 lift $ do
114 lift $ do
116 writeTextFile srcFile src
115 writeTextFile srcFile src
117 writeTextFile headerFile hdr
116 writeTextFile headerFile hdr
118− writeTextFile externsFile $ B.unpack $ BL.toStrict exts
117+ writeTextFile externsFile exts
120 let supportDir = outputDir </> "PureScript"
119 let supportDir = outputDir </> "PureScript"
121 supportFilesExist <- dirExists supportDir
120 supportFilesExist <- dirExists supportDir
@@ -159,9 +158,6 @@ buildMakeActions outputDir filePathMap usePrefix =
159 readTextFile :: FilePath -> Make String
158 readTextFile :: FilePath -> Make String
160 readTextFile path = makeIO (const (ErrorMessage [] $ CannotReadFile path)) $ readUTF8File path
159 readTextFile path = makeIO (const (ErrorMessage [] $ CannotReadFile path)) $ readUTF8File path
162− readTextFile' :: FilePath -> Make BL.ByteString
163− readTextFile' path = makeIO (const (ErrorMessage [] $ CannotReadFile path)) $ BL.readFile path
165 writeTextFile :: FilePath -> String -> Make ()
161 writeTextFile :: FilePath -> String -> Make ()
166 writeTextFile path text = makeIO (const (ErrorMessage [] $ CannotWriteFile path)) $ do
162 writeTextFile path text = makeIO (const (ErrorMessage [] $ CannotWriteFile path)) $ do
167 mkdirp path
163 mkdirp path