git.iko.soy/stackage
on master help sign in
Haskell Platform tweaks
commit58edb793d371bf4891d63a2eba871ac93b90af3f authorMichael Snoyman <michael@snoyman.com> dateTue 19 Aug 2014, 13:23 (12 years ago) parentdecbff1
3 files changed+9−5
compare with master
unifiedsplit
Stackage/InstallInfo.hs+5−3 Stackage/ServerFiles.hs+3−1 jenkins-build.sh+1−1
Stackage/InstallInfo.hs+5−3
@@ -34,8 +34,6 @@ dropExcluded bs m0 =
3434
3535getInstallInfo :: SelectSettings -> IO InstallInfo
3636getInstallInfo settings = do
37− putStrLn "Loading Haskell Platform"
38−
3937 core <- do
4038 putStrLn "Loading core packages from global database"
4139 getGlobalPackages $ selectGhcVersion settings
@@ -108,14 +106,18 @@ getInstallInfo settings = do
108106 putStrLn $ "Inclusive/exclusive: " ++ incexc
109107
110108 putStrLn "Creating hackage file (for publishing to Stackage server)"
109+ let isHP = requireHaskellPlatform settings
111110 IO.withBinaryFile (incexc </> "hackage") IO.WriteMode $ \hackageH ->
112111 IO.withBinaryFile (incexc </> "create-snapshot.sh") IO.WriteMode
113− (createHackageFile isInc ii ghcVer date hackageH)
112+ (createHackageFile isInc isHP ii ghcVer date hackageH)
114113
115114 putStrLn "Creating desc file (for publishing to Stackage server)"
116115 System.IO.UTF8.writeFile (incexc </> "desc") $ concat
117116 [ "Stackage build for GHC "
118117 , ghcVer
118+ , if requireHaskellPlatform settings
119+ then " + Haskell Platform"
120+ else ""
119121 , ", "
120122 , date
121123 , ", "
Stackage/ServerFiles.hs+3−1
@@ -17,16 +17,18 @@ import System.FilePath ((</>), (<.>))
1717import System.IO (Handle, hPutStrLn, hPutStr)
1818
1919createHackageFile :: Bool -- ^ inclusive?
20+ -> Bool -- ^ haskell platform?
2021 -> InstallInfo
2122 -> String -- ^ GHC version
2223 -> String -- ^ date
2324 -> Handle -- ^ hackage
2425 -> Handle -- ^ tarballs
2526 -> IO ()
26−createHackageFile isInc ii ghcVer date hackageH tarballH = do
27+createHackageFile isInc hp ii ghcVer date hackageH tarballH = do
2728 let stackageFP = concat
2829 [ "../ghc-"
2930 , ghcVer
31+ , if hp then "hp" else ""
3032 , "-"
3133 , date
3234 , if isInc then "-inclusive" else "-exclusive"
jenkins-build.sh+1−1
@@ -4,7 +4,7 @@ cabal update
44(cd patching/ && ./scripts/create-tarballs.sh)
55cabal install
66cabal install Cabal-$(cabal --version | sed -n 's@using version \(.*\) of the Cabal library@\1@p')
7−./dist/build/stackage/stackage select --no-platform
7+./dist/build/stackage/stackage select $*
88./dist/build/stackage/stackage check
99./dist/build/stackage/stackage build
1010./dist/build/stackage/stackage test