Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/MicroCabal/Backend/MHS.hs
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,16 @@ mhsBuildExe env (Section _ _ gflds) (Section _ name flds) = do
gcs = getFieldStrings gflds [] "c-sources"
cs = getFieldStrings flds [] "c-sources"
csrc = gcs ++ cs
-- js-sources are embedded by mhs for targets that support it
gjs = getFieldStrings gflds [] "js-sources"
js = getFieldStrings flds [] "js-sources"
jsrc = concatMap (\ f -> ["-js", f]) (gjs ++ js)
mkdir env $ distDir env </> binMhs
mainIs' <- findMainIs env srcDirs mainIs
stdArgs <- setupStdArgs env flds
let args = unwords $ stdArgs ++
csrc ++
jsrc ++
["-z", "-a.","-o" ++ bin, mainIs']
message env 0 $ "Build " ++ bin ++ " with mhs"
mhs env args
Expand Down
16 changes: 16 additions & 0 deletions src/MicroCabal/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -433,13 +433,15 @@ installExe env glob sect@(Section _ name _) = do
message env 0 $ "Installing executable " ++ name
installIncludeFiles env glob sect
installCFiles env glob sect
installJSFiles env glob sect
installPkgExe (backend env) env glob sect

installLib :: Env -> Section -> Section -> IO ()
installLib env glob sect@(Section _ name _) = do
message env 0 $ "Installing library " ++ name
installIncludeFiles env glob sect
installCFiles env glob sect
installJSFiles env glob sect
installPkgLib (backend env) env glob sect

installDataFiles :: Env -> Section -> IO ()
Expand Down Expand Up @@ -470,6 +472,20 @@ installIncludeFiles env glob (Section _ _ flds) = do
mkdir env incDir
copyFiles env inc files incDir

-- js-sources are copied to the jsbits directory of the package,
-- mhs embeds them in the output for targets that support it (e.g., emscripten).
installJSFiles :: Env -> Section -> Section -> IO ()
installJSFiles env glob (Section _ _ flds) = do
let js = getFieldStrings flds [] "js-sources"
dataPrefix = makeDataPrefix env glob
jsDir = dataPrefix </> "jsbits"
case js of
[] -> return ()
files -> do
message env 1 $ "Installing JavaScript files " ++ unwords files
mkdir env jsDir
mapM_ (\ f -> cp env f jsDir) files

installCFiles :: Env -> Section -> Section -> IO ()
installCFiles env glob (Section _ _ flds) = do
let cs = getFieldStrings flds [] "c-sources"
Expand Down