git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Merge pull request #46 from drewolson/relative_paths_in_replace

Use relative paths for replace directives

commitc3cd93aa4d6afb8a00cd82357452b9363eedff7a authorAndy Arvanitis <andyarvanitis@gmail.com> dateSun 12 Jan 2020, 19:02 (7 years ago) parentb5b16351194619
1 file changed+3−4
app/Main.hs+3−4
app/Main.hs+3−4
@@ -54,7 +54,7 @@ jsonToModule :: Value -> Module Ann
5454jsonToModule value =
5555 case parse moduleFromJSON value of
5656 Success (_, r) -> r
57− _ -> error "failed"
57+ _ -> error "failed"
5858
5959main :: IO ()
6060main = do
@@ -164,13 +164,12 @@ writeSupportFiles baseOutpath = do
164164 let goModSource = path </> "go.mod"
165165 goModSourceExists <- doesFileExist goModSource
166166 when (not goModSourceExists) $ do
167− currentDir <- getCurrentDirectory
168167 project <- projectEnv
169168 let project' = T.unpack project
170169 outputdir' = tail $ T.unpack outputdir
171170 modText' = T.replace "$PROJECT" project $ T.decodeUtf8 modText
172− replaceLoader = project' </> ffiLoader' <> "=" <> currentDir </> subdir
173− replaceOutput = project' </> modPrefix' <> "=" <> currentDir </> outputdir'
171+ replaceLoader = project' </> ffiLoader' <> "=." </> subdir
172+ replaceOutput = project' </> modPrefix' <> "=." </> outputdir'
174173 B.writeFile goModSource $ T.encodeUtf8 modText'
175174 callProcess "go" ["mod", "edit", "-replace", replaceLoader]
176175 callProcess "go" ["mod", "edit", "-replace", replaceOutput]