@@ -39,8 +39,6 @@ main = do
39 when outputDirExists $ removeDirectoryRecursive outputDir
39 when outputDirExists $ removeDirectoryRecursive outputDir
40 createDirectory outputDir
40 createDirectory outputDir
44 let srcDir = outputDir </> "src"
42 let srcDir = outputDir </> "src"
45 createDirectory srcDir
43 createDirectory srcDir
@@ -51,6 +49,8 @@ main = do
51 setCurrentDirectory outputDir
49 setCurrentDirectory outputDir
52 callProcess "pcc" []
50 callProcess "pcc" []
54 let tests = filter (`notElem` skipped) passingTestCases
54 let tests = filter (`notElem` skipped) passingTestCases
56 -- Run the tests
56 -- Run the tests
@@ -95,34 +95,29 @@ repo :: String
95repo = "git://github.com/pure11/"
95repo = "git://github.com/pure11/"
97-------------------------------------------------------------------------------
97-------------------------------------------------------------------------------
98−packages :: [(String, String)]
98+packages :: [String]
99-------------------------------------------------------------------------------
99-------------------------------------------------------------------------------
100packages =
100packages =
101− [ ("purescript-eff", "")
101+ [ "eff"
102− , ("purescript-prelude", "")
102+ , "prelude"
103− , ("purescript-assert", "")
103+ , "assert"
104− , ("purescript-st", "")
104+ , "st"
105− , ("purescript-console", "")
105+ , "console"
106− , ("purescript-functions", "")
106+ , "functions"
107− , ("purescript-partial", "")
107+ , "partial"
108− , ("purescript-newtype", "")
108+ , "newtype"
109− , ("purescript-control", "")
109+ , "control"
110− , ("purescript-invariant", "")
110+ , "invariant"
111− , ("purescript-monoid", "")
111+ , "monoid"
112− , ("purescript-generics-rep", "")
112+ , "generics-rep"
115-------------------------------------------------------------------------------
115-------------------------------------------------------------------------------
116fetchPackages :: IO ()
116fetchPackages :: IO ()
117-------------------------------------------------------------------------------
117-------------------------------------------------------------------------------
118fetchPackages = do
118fetchPackages = do
119− (outputDir, baseDir) <- testsDir
119+ mapM (callProcess "psc-package" . (\p -> ["install", p])) packages
120− let packageDir = outputDir </> "packages"
120+ return ()
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
127-------------------------------------------------------------------------------
122-------------------------------------------------------------------------------
128skipped :: [String]
123skipped :: [String]