git.iko.soy/Idris-dev
on master help sign in
Merge pull request #343 from chetant/mvn_mingw32
1b589f8Edwin Brady
Setup.hs+6−1
compare with master
unifiedsplit
@@ -21,7 +21,12 @@ import qualified Data.Text.IO as TIO
21-- After Idris is built, we need to check and install the prelude and other libs
21-- After Idris is built, we need to check and install the prelude and other libs
22
22
23make verbosity = P.runProgramInvocation verbosity . P.simpleProgramInvocation "make"
23make verbosity = P.runProgramInvocation verbosity . P.simpleProgramInvocation "make"
24−mvn verbosity = P.runProgramInvocation verbosity . P.simpleProgramInvocation "mvn"
24+mvn verbosity = P.runProgramInvocation verbosity . P.simpleProgramInvocation
25+#ifdef mingw32_HOST_OS
26+ "mvn.bat"
27+#else
28+ "mvn"
29+#endif
25
30
26#ifdef mingw32_HOST_OS
31#ifdef mingw32_HOST_OS
27-- make on mingw32 exepects unix style separators
32-- make on mingw32 exepects unix style separators
src/Util/System.hs+5−1
@@ -43,7 +43,11 @@ getCC = do env <- environment "IDRIS_CC"
43getMvn :: IO String
43getMvn :: IO String
44getMvn = do env <- environment "IDRIS_MVN"
44getMvn = do env <- environment "IDRIS_MVN"
45 case env of
45 case env of
46+#ifdef mingw32_HOST_OS
47+ Nothing -> return "mvn.bat"
48+#else
46 Nothing -> return "mvn"
49 Nothing -> return "mvn"
50+#endif
47 Just mvn -> return mvn
51 Just mvn -> return mvn
48
52
49tempfile :: IO (FilePath, Handle)
53tempfile :: IO (FilePath, Handle)
@@ -84,4 +88,4 @@ getIncFlags = do dir <- getDataDir
84 return $ "-I" ++ dir </> "rts"
88 return $ "-I" ++ dir </> "rts"
85
89
86getExecutablePom = do dir <- getDataDir
90getExecutablePom = do dir <- getDataDir
87− return $ dir </> "executable_pom.xml"
91+ return $ dir </> "executable_pom.xml"