diff --git a/Stackage/InstallInfo.hs b/Stackage/InstallInfo.hs index 92dbe885..9895fdf6 100644 --- a/Stackage/InstallInfo.hs +++ b/Stackage/InstallInfo.hs @@ -34,8 +34,6 @@ dropExcluded bs m0 = getInstallInfo :: SelectSettings -> IO InstallInfo getInstallInfo settings = do - putStrLn "Loading Haskell Platform" - core <- do putStrLn "Loading core packages from global database" getGlobalPackages $ selectGhcVersion settings @@ -108,14 +106,18 @@ getInstallInfo settings = do putStrLn $ "Inclusive/exclusive: " ++ incexc putStrLn "Creating hackage file (for publishing to Stackage server)" + let isHP = requireHaskellPlatform settings IO.withBinaryFile (incexc "hackage") IO.WriteMode $ \hackageH -> IO.withBinaryFile (incexc "create-snapshot.sh") IO.WriteMode - (createHackageFile isInc ii ghcVer date hackageH) + (createHackageFile isInc isHP ii ghcVer date hackageH) putStrLn "Creating desc file (for publishing to Stackage server)" System.IO.UTF8.writeFile (incexc "desc") $ concat [ "Stackage build for GHC " , ghcVer + , if requireHaskellPlatform settings + then " + Haskell Platform" + else "" , ", " , date , ", " diff --git a/Stackage/ServerFiles.hs b/Stackage/ServerFiles.hs index 8a2eb88a..3806dc76 100644 --- a/Stackage/ServerFiles.hs +++ b/Stackage/ServerFiles.hs @@ -17,16 +17,18 @@ import System.FilePath ((), (<.>)) import System.IO (Handle, hPutStrLn, hPutStr) createHackageFile :: Bool -- ^ inclusive? + -> Bool -- ^ haskell platform? -> InstallInfo -> String -- ^ GHC version -> String -- ^ date -> Handle -- ^ hackage -> Handle -- ^ tarballs -> IO () -createHackageFile isInc ii ghcVer date hackageH tarballH = do +createHackageFile isInc hp ii ghcVer date hackageH tarballH = do let stackageFP = concat [ "../ghc-" , ghcVer + , if hp then "hp" else "" , "-" , date , if isInc then "-inclusive" else "-exclusive" diff --git a/jenkins-build.sh b/jenkins-build.sh index da8a3416..bf1aaedb 100755 --- a/jenkins-build.sh +++ b/jenkins-build.sh @@ -4,7 +4,7 @@ cabal update (cd patching/ && ./scripts/create-tarballs.sh) cabal install cabal install Cabal-$(cabal --version | sed -n 's@using version \(.*\) of the Cabal library@\1@p') -./dist/build/stackage/stackage select --no-platform +./dist/build/stackage/stackage select $* ./dist/build/stackage/stackage check ./dist/build/stackage/stackage build ./dist/build/stackage/stackage test