diff --git a/src/MicroCabal/Backend/MHS.hs b/src/MicroCabal/Backend/MHS.hs index 1ca6759..32ccf09 100644 --- a/src/MicroCabal/Backend/MHS.hs +++ b/src/MicroCabal/Backend/MHS.hs @@ -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 diff --git a/src/MicroCabal/Main.hs b/src/MicroCabal/Main.hs index e876805..98f4a48 100644 --- a/src/MicroCabal/Main.hs +++ b/src/MicroCabal/Main.hs @@ -433,6 +433,7 @@ 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 () @@ -440,6 +441,7 @@ 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 () @@ -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"