git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Merge pull request #46 from drewolson/relative_paths_in_replace
c3cd93aAndy Arvanitis
app/Main.hs+3−4
@@ -54,7 +54,7 @@ jsonToModule :: Value -> Module Ann
54jsonToModule value =
54jsonToModule value =
55 case parse moduleFromJSON value of
55 case parse moduleFromJSON value of
56 Success (_, r) -> r
56 Success (_, r) -> r
57− _ -> error "failed"
57+ _ -> error "failed"
58
58
59main :: IO ()
59main :: IO ()
60main = do
60main = do
@@ -164,13 +164,12 @@ writeSupportFiles baseOutpath = do
164 let goModSource = path </> "go.mod"
164 let goModSource = path </> "go.mod"
165 goModSourceExists <- doesFileExist goModSource
165 goModSourceExists <- doesFileExist goModSource
166 when (not goModSourceExists) $ do
166 when (not goModSourceExists) $ do
167− currentDir <- getCurrentDirectory
168 project <- projectEnv
167 project <- projectEnv
169 let project' = T.unpack project
168 let project' = T.unpack project
170 outputdir' = tail $ T.unpack outputdir
169 outputdir' = tail $ T.unpack outputdir
171 modText' = T.replace "$PROJECT" project $ T.decodeUtf8 modText
170 modText' = T.replace "$PROJECT" project $ T.decodeUtf8 modText
172− replaceLoader = project' </> ffiLoader' <> "=" <> currentDir </> subdir
171+ replaceLoader = project' </> ffiLoader' <> "=." </> subdir
173− replaceOutput = project' </> modPrefix' <> "=" <> currentDir </> outputdir'
172+ replaceOutput = project' </> modPrefix' <> "=." </> outputdir'
174 B.writeFile goModSource $ T.encodeUtf8 modText'
173 B.writeFile goModSource $ T.encodeUtf8 modText'
175 callProcess "go" ["mod", "edit", "-replace", replaceLoader]
174 callProcess "go" ["mod", "edit", "-replace", replaceLoader]
176 callProcess "go" ["mod", "edit", "-replace", replaceOutput]
175 callProcess "go" ["mod", "edit", "-replace", replaceOutput]