git.iko.soy/stackage
on master help sign in
More replacement tarball tweaks
commitf8d7858fb8d2d904939b40abb8dd72899780d5c1 authorMichael Snoyman <michael@snoyman.com> dateSun 1 Sep 2013, 13:20 (13 years ago) parent529a846
6 files changed+11−10
compare with master
unifiedsplit
Stackage/Build.hs+1−1 Stackage/CheckPlan.hs+4−3 Stackage/Select.hs+1−1 Stackage/Test.hs+1−1 Stackage/Util.hs+3−3 app/stackage.hs+1−1
Stackage/Build.hs+1−1
@@ -81,7 +81,7 @@ build settings' bp = do
8181
8282 putStrLn "Beginning Stackage build"
8383 ph <- withBinaryFile "build.log" WriteMode $ \handle -> do
84− packageList <- mapM (replaceTarball settings) $ bpPackageList bp
84+ packageList <- mapM (replaceTarball $ tarballDir settings) $ bpPackageList bp
8585 let args = addCabalArgs settings BSBuild
8686 $ "install"
8787 : ("--cabal-lib-version=" ++ libVersion)
Stackage/CheckPlan.hs+4−3
@@ -17,18 +17,19 @@ import System.Process (readProcessWithExitCode)
1717data Mismatch = OnlyDryRun String | OnlySimpleList String
1818 deriving Show
1919
20−checkPlan :: BuildPlan -> IO ()
21−checkPlan bp = do
20+checkPlan :: BuildSettings -> BuildPlan -> IO ()
21+checkPlan settings bp = do
2222 _ <- checkCabalVersion
2323
2424 putStrLn "Checking build plan"
25+ packages <- mapM (replaceTarball $ tarballDir settings) (bpPackageList bp)
2526 (ec, dryRun', stderr) <- readProcessWithExitCode "cabal"
2627 ( addCabalArgsOnlyGlobal
2728 $ "install"
2829 : "--dry-run"
2930 : "--max-backjumps=-1"
3031 : "--reorder-goals"
31− : bpPackageList bp
32+ : packages
3233 ) ""
3334 when (ec /= ExitSuccess || "Warning:" `isPrefixOf` stderr) $ do
3435 putStr stderr
Stackage/Select.hs+1−1
@@ -44,7 +44,7 @@ defaultSelectSettings version = SelectSettings
4444 , useGlobalDatabase = False
4545 , skippedTests = empty
4646 , selectGhcVersion = version
47− , selectTarballDir = "tarballs"
47+ , selectTarballDir = "patching/tarballs"
4848 }
4949
5050select :: SelectSettings -> IO BuildPlan
Stackage/Test.hs+1−1
@@ -97,7 +97,7 @@ runTestSuite settings testdir (packageName, SelectedPackageInfo {..}) = do
9797 runGhcPackagePath = runGen True
9898
9999 passed <- handle (\TestException -> return False) $ do
100− package' <- replaceTarball settings package
100+ package' <- replaceTarball (tarballDir settings) package
101101 getHandle WriteMode $ run "cabal" ["unpack", package'] testdir
102102 getHandle AppendMode $ run "cabal" (addCabalArgs settings BSTest ["configure", "--enable-tests"]) dir
103103 when spiHasTests $ do
Stackage/Util.hs+3−3
@@ -158,13 +158,13 @@ fixBuildSettings settings' = do
158158
159159-- | Check if a tarball exists in the tarball directory and, if so, use that
160160-- instead of the given name.
161−replaceTarball :: BuildSettings
161+replaceTarball :: FilePath -- ^ tarball directory
162162 -> String
163163 -> IO String
164−replaceTarball bs pkgname = do
164+replaceTarball tarballdir pkgname = do
165165 exists <- doesFileExist fp
166166 if exists
167167 then canonicalizePath fp
168168 else return pkgname
169169 where
170− fp = tarballDir bs </> pkgname <.> "tar.gz"
170+ fp = tarballdir </> pkgname <.> "tar.gz"
app/stackage.hs+1−1
@@ -100,7 +100,7 @@ main = do
100100 , useGlobalDatabase = globalDB
101101 }
102102 writeBuildPlan buildPlanDest bp
103− ("check":rest) -> withBuildSettings rest $ const checkPlan
103+ ("check":rest) -> withBuildSettings rest checkPlan
104104 ("build":rest) -> withBuildSettings rest build
105105 ("test":rest) -> withBuildSettings rest runTestSuites
106106 ("tarballs":rest) -> withBuildSettings rest $ const makeTarballs