@@ -39,8 +39,6 @@ main = do
3939 when outputDirExists $ removeDirectoryRecursive outputDir
4040 createDirectory outputDir
4141
42− fetchPackages
43−
4442 let srcDir = outputDir </> "src"
4543 createDirectory srcDir
4644
@@ -51,6 +49,8 @@ main = do
5149 setCurrentDirectory outputDir
5250 callProcess "pcc" []
5351
52+ fetchPackages
53+
5454 let tests = filter (`notElem` skipped) passingTestCases
5555
5656 -- Run the tests
@@ -95,34 +95,29 @@ repo :: String
9595repo = "git://github.com/pure11/"
9696
9797-------------------------------------------------------------------------------
98−packages :: [(String, String)]
98+packages :: [String]
9999-------------------------------------------------------------------------------
100100packages =
101− [ ("purescript-eff", "")
102− , ("purescript-prelude", "")
103− , ("purescript-assert", "")
104− , ("purescript-st", "")
105− , ("purescript-console", "")
106− , ("purescript-functions", "")
107− , ("purescript-partial", "")
108− , ("purescript-newtype", "")
109− , ("purescript-control", "")
110− , ("purescript-invariant", "")
111− , ("purescript-monoid", "")
112− , ("purescript-generics-rep", "")
101+ [ "eff"
102+ , "prelude"
103+ , "assert"
104+ , "st"
105+ , "console"
106+ , "functions"
107+ , "partial"
108+ , "newtype"
109+ , "control"
110+ , "invariant"
111+ , "monoid"
112+ , "generics-rep"
113113 ]
114114
115115-------------------------------------------------------------------------------
116116fetchPackages :: IO ()
117117-------------------------------------------------------------------------------
118118fetchPackages = do
119− (outputDir, baseDir) <- testsDir
120− let packageDir = outputDir </> "packages"
121− createDirectory packageDir
122− setCurrentDirectory packageDir
123− forM_ packages $ \package -> let branch = snd package in
124− callProcess "git" $ ["clone"] ++ (if null branch then [] else ["--branch", branch]) ++ [repo ++ (fst package) ++ ".git"]
125− setCurrentDirectory baseDir
119+ mapM (callProcess "psc-package" . (\p -> ["install", p])) packages
120+ return ()
126121
127122-------------------------------------------------------------------------------
128123skipped :: [String]