git.iko.soy/stackage
on master help sign in
Haskell Platform tweaks
58edb79Michael Snoyman
Stackage/InstallInfo.hs+5−3
compare with master
unifiedsplit
@@ -34,8 +34,6 @@ dropExcluded bs m0 =
34
34
35getInstallInfo :: SelectSettings -> IO InstallInfo
35getInstallInfo :: SelectSettings -> IO InstallInfo
36getInstallInfo settings = do
36getInstallInfo settings = do
37− putStrLn "Loading Haskell Platform"
38−
39 core <- do
37 core <- do
40 putStrLn "Loading core packages from global database"
38 putStrLn "Loading core packages from global database"
41 getGlobalPackages $ selectGhcVersion settings
39 getGlobalPackages $ selectGhcVersion settings
@@ -108,14 +106,18 @@ getInstallInfo settings = do
108 putStrLn $ "Inclusive/exclusive: " ++ incexc
106 putStrLn $ "Inclusive/exclusive: " ++ incexc
109
107
110 putStrLn "Creating hackage file (for publishing to Stackage server)"
108 putStrLn "Creating hackage file (for publishing to Stackage server)"
109+ let isHP = requireHaskellPlatform settings
111 IO.withBinaryFile (incexc </> "hackage") IO.WriteMode $ \hackageH ->
110 IO.withBinaryFile (incexc </> "hackage") IO.WriteMode $ \hackageH ->
112 IO.withBinaryFile (incexc </> "create-snapshot.sh") IO.WriteMode
111 IO.withBinaryFile (incexc </> "create-snapshot.sh") IO.WriteMode
113− (createHackageFile isInc ii ghcVer date hackageH)
112+ (createHackageFile isInc isHP ii ghcVer date hackageH)
114
113
115 putStrLn "Creating desc file (for publishing to Stackage server)"
114 putStrLn "Creating desc file (for publishing to Stackage server)"
116 System.IO.UTF8.writeFile (incexc </> "desc") $ concat
115 System.IO.UTF8.writeFile (incexc </> "desc") $ concat
117 [ "Stackage build for GHC "
116 [ "Stackage build for GHC "
118 , ghcVer
117 , ghcVer
118+ , if requireHaskellPlatform settings
119+ then " + Haskell Platform"
120+ else ""
119 , ", "
121 , ", "
120 , date
122 , date
121 , ", "
123 , ", "
Stackage/ServerFiles.hs+3−1
@@ -17,16 +17,18 @@ import System.FilePath ((</>), (<.>))
17import System.IO (Handle, hPutStrLn, hPutStr)
17import System.IO (Handle, hPutStrLn, hPutStr)
18
18
19createHackageFile :: Bool -- ^ inclusive?
19createHackageFile :: Bool -- ^ inclusive?
20+ -> Bool -- ^ haskell platform?
20 -> InstallInfo
21 -> InstallInfo
21 -> String -- ^ GHC version
22 -> String -- ^ GHC version
22 -> String -- ^ date
23 -> String -- ^ date
23 -> Handle -- ^ hackage
24 -> Handle -- ^ hackage
24 -> Handle -- ^ tarballs
25 -> Handle -- ^ tarballs
25 -> IO ()
26 -> IO ()
26−createHackageFile isInc ii ghcVer date hackageH tarballH = do
27+createHackageFile isInc hp ii ghcVer date hackageH tarballH = do
27 let stackageFP = concat
28 let stackageFP = concat
28 [ "../ghc-"
29 [ "../ghc-"
29 , ghcVer
30 , ghcVer
31+ , if hp then "hp" else ""
30 , "-"
32 , "-"
31 , date
33 , date
32 , if isInc then "-inclusive" else "-exclusive"
34 , if isInc then "-inclusive" else "-exclusive"
jenkins-build.sh+1−1
@@ -4,7 +4,7 @@ cabal update
4(cd patching/ && ./scripts/create-tarballs.sh)
4(cd patching/ && ./scripts/create-tarballs.sh)
5cabal install
5cabal install
6cabal install Cabal-$(cabal --version | sed -n 's@using version \(.*\) of the Cabal library@\1@p')
6cabal 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 $*
8./dist/build/stackage/stackage check
8./dist/build/stackage/stackage check
9./dist/build/stackage/stackage build
9./dist/build/stackage/stackage build
10./dist/build/stackage/stackage test
10./dist/build/stackage/stackage test