Merge pull request #233 from haskell/minimal-full-split

Platform Changes for the Get Haskell Experience

Author: gbaz

hptool/src/Config.hs

@@ -5,8 +5,8 @@ module Config
     ( askHpRelease
     , askGhcBinDistTarFile
     , askBuildConfig
-
     , addConfigOracle
+    , askStackExe
     )
     where
 
@@ -66,23 +66,35 @@ newtype BuildConfigQ = BuildConfigQ ()
 askBuildConfig :: Action BuildConfig
 askBuildConfig = readOracle "BuildConfig" (BuildConfigQ ())
 
+newtype StackExeQ = StackExeQ ()
+    deriving (Show,Typeable,Eq,Hashable,Binary,NFData)
+
+-- | Provide the stack executable
+-- The filepath will be tracked as a dependency
+askStackExe :: Action FilePath
+askStackExe = do
+    stackexe <- askOracle $ StackExeQ ()
+    need [stackexe]
+    return stackexe
 
-addConfigOracle :: Release -> FilePath -> Maybe FilePath -> Rules BuildConfig
-addConfigOracle hpRel tarFile prefix = do
+addConfigOracle :: Release -> FilePath -> FilePath -> Maybe FilePath -> Bool -> Rules BuildConfig
+addConfigOracle hpRel tarFile stackexe prefix includeExtra = do
     _ <- addOracle $
             \(HpReleaseQ _) -> return $ show hpRel
     _ <- addOracle $
             \(GhcBinDistTarFileQ _) -> return tarFile
+    _ <- addOracle $
+            \(StackExeQ _) -> return stackexe
     _ <- addOracle $
             \(BuildConfigQ _) -> either fail (return . show) buildConfig
     either fail return buildConfig
   where
-    buildConfig = extractBuildConfig hpRel tarFile prefix
+    buildConfig = extractBuildConfig hpRel tarFile prefix includeExtra
 
 
-extractBuildConfig :: Release -> FilePath -> Maybe FilePath
+extractBuildConfig :: Release -> FilePath -> Maybe FilePath -> Bool
                         -> Either String BuildConfig
-extractBuildConfig hpRel tarFile prefix =
+extractBuildConfig hpRel tarFile prefix bcIncludeExtra =
     if ok then Right $ BuildConfig {..}
           else Left $ "extractBuildConfig tar file unparseable: " ++ base
   where

hptool/src/GhcDist.hs

@@ -49,7 +49,7 @@ ghcInstall postUntarAction base mfPrefix = do
     makeDirectory untarDir
 
     command_ [Cwd untarDir]
-        "tar" ["xf", tarFile ® untarDir]
+        "tar" ["xf", tarFile `relativeToDir` untarDir]
 
     case postUntarAction of
         GhcInstallConfigure -> ghcInstallConfigure base mfPrefix conf distDir
@@ -59,7 +59,7 @@ ghcInstall postUntarAction base mfPrefix = do
 ghcInstallConfigure :: FilePath -> Maybe (BuildConfig -> FilePath) -> GhcInstallAction
 ghcInstallConfigure base mfPrefix conf distDir = do
     let (prefix, destDir) = layout (($ conf) <$> mfPrefix)
-        destArg = maybe [] (\_ -> ["DESTDIR=" ++ base ® distDir]) mfPrefix
+        destArg = maybe [] (\_ -> ["DESTDIR=" ++ base `relativeToDir` distDir]) mfPrefix
         settingsFile = destDir </> "lib" </> show (bcGhcVersion conf) </> "settings"
 
     configCmd <- liftIO $ absolutePath $ distDir </> "configure"

hptool/src/HaddockMaster.hs

@@ -81,11 +81,11 @@ isForOS os i = okForAll
 
 allCoreLibs :: Release -> BuildConfig -> [Package]
 allCoreLibs hpRel bc = packagesByIncludeFilter
-    (\i -> isForOS (bcOs bc) i && isLib i && isGhc i) hpRel
+    (\i -> isForOS (bcOs bc) i && isLib i && isGhc i) (bcIncludeExtra bc) hpRel
 
 allPlatformLibs :: Release -> BuildConfig -> [Package]
 allPlatformLibs hpRel bc = packagesByIncludeFilter
-    (\i -> isForOS (bcOs bc) i && isLib i && not (isGhc i)) hpRel
+    (\i -> isForOS (bcOs bc) i && isLib i && not (isGhc i)) (bcIncludeExtra bc) hpRel
 
 
 haddockReadArg :: HaddockPkgLoc -> String
@@ -130,4 +130,3 @@ extractField field out =  ex . lines $ out
         _ -> ex ls
 
     fieldColon = field ++ ":"
-

hptool/src/Main.hs

@@ -8,6 +8,7 @@ import Development.Shake
 import Development.Shake.FilePath
 import System.Console.GetOpt
 import qualified System.Info (os, arch)
+import System.IO
 
 import Config
 import Dirs
@@ -23,27 +24,29 @@ import Types
 import Target
 import Website
 
-data Flags = Info | Prefix String
+data Flags = Info | Prefix String | Full
   deriving Eq
 
 flags :: [OptDescr (Either a Flags)]
 flags = [ Option ['i'] ["info"] (NoArg $ Right Info)
                      "Show info on what gets included in this HP release"
         , Option [] ["prefix"] (ReqArg (Right . Prefix) "DIR")
                      "Set installation prefix (only for Posix builds)"
+        , Option ['f'] ["full"] (NoArg $ Right Full)
+                     "Do a full (rather than minimal) build of the platform."
         ]
 
 main :: IO ()
-main = shakeArgsWith opts flags main'
+main = hSetEncoding stdout utf8 >> shakeArgsWith opts flags main'
   where
     main' flgs args =
         if Info `elem` flgs
             then info
             else case args of
-                (tarfile:what) -> return $ Just $ do
-                    allRules tarfile flgs
-                    want $ if null what then ["build-all"] else what
-                [] -> usage
+                (tarfile:stackexe:buildType) -> return $ Just $ do
+                    allRules tarfile stackexe flgs
+                    want $ if null buildType then ["build-all"] else buildType
+                _ -> usage
 
     info = do
         putStrLn $ "This hptool is built to construct " ++ hpFullName ++ "\n\
@@ -55,7 +58,7 @@ main = shakeArgsWith opts flags main'
 
     usage = do
         putStrLn "usage: hptool --info\n\
-                 \       hptool [opts] <ghc-bindist.tar.bz> [target...]\n\
+                 \       hptool [opts] <ghc-bindist.tar.bz> <stack executable> [target...]\n\
                  \  where target is one of:\n\
                  \    build-all           -- build everything (default)\n\
                  \    build-source        -- build the source tar ball\n\
@@ -65,8 +68,8 @@ main = shakeArgsWith opts flags main'
                  \    build-website       -- build the website\n"
         return Nothing
 
-    allRules tarfile flgs = do
-        buildConfig <- addConfigOracle hpRelease tarfile (prefixSetting flgs)
+    allRules tarfile stackexe flgs = do
+        buildConfig <- addConfigOracle hpRelease tarfile stackexe (prefixSetting flgs) (Full `elem` flgs)
         ghcDistRules
         packageRules
         targetRules buildConfig
@@ -82,13 +85,15 @@ main = shakeArgsWith opts flags main'
 
     opts = shakeOptions
 
-    hpRelease = hp_7_10_3
+    hpRelease = hp_8_0_0
     hpFullName = show $ relVersion hpRelease
     srcTarFile = productDir </> hpFullName <.> "tar.gz"
 
 
 whatIsIncluded :: Release -> [String]
-whatIsIncluded = map concat . map includeToString . relIncludes where
+whatIsIncluded rel = ("-- Minimal Platform:":minimalIncludes) ++ ("-- Full Platform:":fullIncludes) where
+    minimalIncludes = map (concat . includeToString) $ relMinimalIncludes rel
+    fullIncludes    = map (concat . includeToString) $ relIncludes rel where
     includeToString (IncGHC, p)      = "GHC:    " : [show p]
     includeToString (IncGHCLib, p)   = "GHCLib: " : [show p]
     includeToString (IncLib, p)      = "LIB:    " : [show p]
@@ -106,7 +111,7 @@ buildRules hpRelease srcTarFile bc = do
     "build-product" ~> need [osProduct]
     "build-local" ~> need [dir ghcLocalDir]
     "build-website" ~> need [dir websiteDir]
-    forM_ (platformPackages hpRelease) $ \pkg -> do
+    forM_ (platformPackages True hpRelease) $ \pkg -> do
         let full = "build-package-" ++ show pkg
         let short = "build-package-" ++ pkgName pkg
         short ~> need [full]
@@ -117,5 +122,3 @@ buildRules hpRelease srcTarFile bc = do
     osRules hpRelease bc
   where
     OS{..} = osFromConfig bc
-
-

hptool/src/OS/Internal.hs

@@ -36,7 +36,7 @@ data OS = OS
     ,   osGhcTargetInstall :: GhcInstall
 
         -- | Where each package is installed
-    ,   osPackageTargetDir :: (PackagePattern p) => p -> FilePath
+    ,   osPackageTargetDir :: forall p. (PackagePattern p) => p -> FilePath
 
         -- | Set True if GHC in this build supports creating shared libs
     ,   osDoShared :: Bool
@@ -126,6 +126,6 @@ genericOS BuildConfig{..} = OS{..}
         osProduct %> \out -> do
             need [targetDir, vdir ghcVirtualTarget]
             command_ [Cwd buildRoot]
-                "tar" ["czf", out ® buildRoot, targetDir ® buildRoot]
+                "tar" ["czf", out `relativeToDir` buildRoot, targetDir `relativeToDir` buildRoot]
 
     osPackageConfigureExtraArgs _pkg = []

hptool/src/OS/Mac.hs

@@ -16,6 +16,7 @@ import Paths
 import Templates
 import Types
 import Utils
+import Config
 
 macOsFromConfig :: BuildConfig -> OS
 macOsFromConfig BuildConfig{..} = OS{..}
@@ -79,7 +80,7 @@ macOsFromConfig BuildConfig{..} = OS{..}
             copyFile' f $ hpDocDir </> takeFileName f
 
     productName =
-        "Haskell Platform " ++ showVersion hpVersion ++ archBits bcArch
+        "Haskell Platform " ++ showVersion hpVersion ++ (if bcIncludeExtra then " Full" else " Minimal") ++ archBits bcArch
 
     osProduct = productDir </> productName <.> "pkg"
     signedProduct = productDir </> (productName ++ "-signed") <.> "pkg"
@@ -109,7 +110,8 @@ macOsFromConfig BuildConfig{..} = OS{..}
             makeDirectory hpBinDir
             need [dir extrasDir]
             binFiles <- getDirectoryFiles "" [extrasDir </> "bin/*"]
-            forM_ binFiles $ \f -> do
+            stackFile <- askStackExe
+            forM_ (stackFile:binFiles) $ \f -> do
                 if takeExtension f == ".hs"
                     then compileToBin f $ hpBinDir </> takeBaseName f
                     else copyFile'    f $ hpBinDir </> takeFileName f
@@ -140,7 +142,7 @@ macOsFromConfig BuildConfig{..} = OS{..}
             command_ []
                 "pkgbuild"
                 [ "--identifier", "org.haskell.HaskellPlatform.Libraries."
-                                  ++ hpPkgMajorVer ++ ".pkg"
+                                  ++ hpPkgMajorVer ++ (if bcIncludeExtra then "-full" else "-minimal") ++ ".pkg"
                 , "--version", hpPkgMinorVer
                 , "--install-location", "/Library/Haskell"
                 , "--root", "build/target/Library/Haskell"
@@ -153,7 +155,7 @@ macOsFromConfig BuildConfig{..} = OS{..}
             command_ []
                 "productbuild"
                 [ "--identifier", "org.haskell.HaskellPlatform."
-                                  ++ hpPkgMajorVer ++ ".pkg"
+                                  ++ hpPkgMajorVer ++ (if bcIncludeExtra then "-full" else "-minimal") ++ ".pkg"
                 , "--version", hpPkgMinorVer
                 , "--resources", osxInstallResources
                 , "--distribution", osxInstallerDist

hptool/src/OS/Posix.hs

@@ -12,6 +12,7 @@ import Development.Shake
 import Development.Shake.FilePath
 
 import Dirs
+import Config
 import OS.Internal
 import Paths
 import Templates
@@ -71,7 +72,7 @@ posixOS BuildConfig{..} = OS{..}
     installScript = extrasDir </> "installer" </> "install-haskell-platform.sh"
 
     productName =
-        "haskell-platform-" ++ showVersion hpVersion ++ "-unknown-posix-" ++ bcArch
+        "haskell-platform-" ++ showVersion hpVersion ++ "-unknown-posix-" ++ (if bcIncludeExtra then "-full-" else "-minimal-") ++ bcArch
 
     genericExtrasSrc = "hptool/os-extras/posix"
 
@@ -86,7 +87,7 @@ posixOS BuildConfig{..} = OS{..}
             need [ usrLocalTar, dir extrasDir]
             command_ [] "cp" [ installScript, productDir ]
             command_ [Cwd productDir]
-                "tar" ["czf", out ® targetDir, installFile, usrLocalTar ® productDir ]
+                "tar" ["czf", out `relativeToDir` targetDir, installFile, usrLocalTar `relativeToDir` productDir ]
             mapM_ putNormal
                 [ replicate 72 '-'
                 , "To install this build:"
@@ -98,7 +99,7 @@ posixOS BuildConfig{..} = OS{..}
         usrLocalTar %> \out -> do
             need [targetDir, vdir ghcVirtualTarget]
             command_ [Cwd targetDir]
-                "tar" ["czf", out ® targetDir, hpTargetDir ® targetDir]
+                "tar" ["czf", out `relativeToDir` targetDir, hpTargetDir `relativeToDir` targetDir]
 
         versionFile %> \out -> do
             writeFileChanged out $ unlines
@@ -115,7 +116,8 @@ posixOS BuildConfig{..} = OS{..}
             makeDirectory hpBinDir
             need [dir extrasDir]
             binFiles <- getDirectoryFiles "" [extrasDir </> "bin/*"]
-            forM_ binFiles $ \f -> do
+            stackFile <- askStackExe
+            forM_ (stackFile:binFiles) $ \f -> do
                 copyFile' f $ hpBinDir </> takeFileName f
             return Nothing
 

hptool/src/OS/Win.hs

@@ -120,7 +120,7 @@ winOsFromConfig BuildConfig{..} = os
 
     osDocAction = return ()
 
-    osProduct = winProductFile hpVersion bcArch
+    osProduct = winProductFile bcIncludeExtra hpVersion bcArch
 
     osRules _rel bc = do
         winRules

hptool/src/OS/Win/WinNsis.hs

@@ -44,8 +44,8 @@ genNsisData = do
                      getDirContentsR winTargetDir
       where
         makeNativeRelPaths =
-            map (\(d,fs) -> ( toNative $ d ® winTargetDir
-                            , map (toNative . (® winTargetDir)) fs))
+            map (\(d,fs) -> ( toNative $ d `relativeToDir` winTargetDir
+                            , map (toNative . (`relativeToDir` winTargetDir)) fs))
 
     genData tmpl file dirs = do
         ctx <- mu <$> pure tmpl <*> pure dirs
@@ -84,13 +84,13 @@ expandNsisInfo :: (Monad m) => Release -> BuildConfig -> MuContext m
 expandNsisInfo rls BuildConfig{..} = mkStrContext ex
   where
     ex "productFile" = MuVariable . toNative $
-        winProductFile hpver bcArch ® installerPartsDir
+        winProductFile bcIncludeExtra hpver bcArch `relativeToDir` installerPartsDir
         -- NSIS tool needs to run from the installerPartsDir
     ex "build64bit" = MuBool is64
     ex "is32or64" = MuVariable $ if is64 then "64" else "32"
     ex "programFiles64" = MuVariable $ if is64 then "64" else ""
     ex "targetFiles" = MuVariable . toNative $
-        winTargetDir ® takeDirectory nsisFile
+        winTargetDir `relativeToDir` takeDirectory nsisFile
         -- NSIS is run from where nsisFile is, so make relative to that
 
     ex _ = MuNothing

hptool/src/OS/Win/WinPaths.hs

@@ -145,14 +145,14 @@ winDocTargetDir :: FilePath
 winDocTargetDir = winTargetDir </> "doc"
 
 -- | The installer file name, dependent on the HP version and architecture
-winProductFileName :: Version -> String -> FilePath
-winProductFileName hpv arch =
+winProductFileName :: Bool -> Version -> String -> FilePath
+winProductFileName isFull hpv arch =
     ("HaskellPlatform-" ++ versionAndArch ++ "-setup") <.> "exe"
-  where versionAndArch = showVersion hpv ++ '-' : arch
+  where versionAndArch = showVersion hpv ++ (if isFull then "-full" else "-minimal") ++ '-' : arch
 
 -- | Directory where the installer file is built.
-winProductFile :: Version -> String -> FilePath
-winProductFile hpv arch = productDir </> winProductFileName hpv arch
+winProductFile :: Bool -> Version -> String -> FilePath
+winProductFile isFull hpv arch = productDir </> winProductFileName isFull hpv arch
 
 -- | Relative to the install dir
 winGhcPackageDbDir :: FilePath
@@ -166,4 +166,3 @@ winGhcTargetPackageDbDir = winTargetDir </> winGhcPackageDbDir
 winNeeds :: [FilePath]
 winNeeds = [ nsisFile, nsisInstDat, nsisUninstDat ]
            ++ winInstExtras
-