initial split release patch

Author: U-CIQDEV\gbazerman

hptool/src/Config.hs

@@ -67,8 +67,8 @@ askBuildConfig :: Action BuildConfig
 askBuildConfig = readOracle "BuildConfig" (BuildConfigQ ())
 
 
-addConfigOracle :: Release -> FilePath -> Maybe FilePath -> Rules BuildConfig
-addConfigOracle hpRel tarFile prefix = do
+addConfigOracle :: Release -> FilePath -> Maybe FilePath -> Bool -> Rules BuildConfig
+addConfigOracle hpRel tarFile prefix includeExtra = do
     _ <- addOracle $
             \(HpReleaseQ _) -> return $ show hpRel
     _ <- addOracle $
@@ -77,12 +77,12 @@ addConfigOracle hpRel tarFile prefix = do
             \(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

@@ -23,14 +23,16 @@ 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 Info)
+                     "Do a full (rather than minimal) build of the platform."
         ]
 
 main :: IO ()
@@ -66,7 +68,7 @@ main = shakeArgsWith opts flags main'
         return Nothing
 
     allRules tarfile flgs = do
-        buildConfig <- addConfigOracle hpRelease tarfile (prefixSetting flgs)
+        buildConfig <- addConfigOracle hpRelease tarfile (prefixSetting flgs) (Full `elem` flgs)
         ghcDistRules
         packageRules
         targetRules buildConfig
@@ -82,13 +84,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 +110,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 +121,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/Posix.hs

@@ -86,7 +86,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 +98,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

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 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/Package.hs

@@ -50,7 +50,8 @@ packageRules = do
 
     listBuild %> \out -> do
         hpRel <- askHpRelease
-        let pkgs = platformPackages hpRel
+        bc <- askBuildConfig
+        let pkgs = platformPackages (bcIncludeExtra bc) hpRel
         need $ map packageDepsFile pkgs
         nodes <- mapM buildNode pkgs
         writeFileLinesChanged out $ flattenSCCs $ stronglyConnComp nodes
@@ -87,7 +88,7 @@ installAction depFile hpRel = do
 
     constraints =
         map (\p -> pkgName p ++ "==" ++ showVersion (pkgVersion p)) $
-            allPackages hpRel
+            (allPackages True) hpRel
 
     decode out = case drop 1 $ lines out of
         ("All the requested packages are already installed:":_) ->
@@ -100,5 +101,4 @@ installAction depFile hpRel = do
                             ++ unwords (filter (not . (`elem` packages)) deps)
         _ -> Left out
 
-    packages = map show $ allPackages hpRel
-
+    packages = map show $ (allPackages False) hpRel

hptool/src/PlatformDB.hs

@@ -1,8 +1,10 @@
 module PlatformDB
-    ( release, deltaFrom,
+    ( release, releaseWithMinimal, deltaFrom,
       incGHC, incGHCLib, incGHCTool, incLib, incTool,
       notWindows, onlyWindows,
 
+      allRelIncludes,
+
       allPackages,
       corePackages,
       platformPackages,
@@ -16,9 +18,17 @@ import Data.List (partition)
 import Types
 import Utils (version)
 
--- | Construct a release
+-- | both minimal and extra platform includes
+allRelIncludes :: Release -> [Include]
+allRelIncludes r = relMinimalIncludes r ++ relIncludes r
+
+-- | Construct a release with a minimal partition
+releaseWithMinimal :: String -> [Include] -> [Include] -> Release
+releaseWithMinimal vstr minimalIncs incs = Release (HpVersion $ version vstr) minimalIncs incs
+
+-- | Construct a release, when there is not a seperate minimal selection of includes with the main ones.
 release :: String -> [Include] -> Release
-release vstr incs = Release (HpVersion $ version vstr) incs
+release vstr incs = Release (HpVersion $ version vstr) incs []
 
 -- | Construct list of Includes as a delta to packages in another release
 deltaFrom :: Release -> [Include] -> [Include]
@@ -69,20 +79,20 @@ notWindows (it, pkg) = (IncIfNotWindows it, pkg)
 onlyWindows :: Include -> Include
 onlyWindows (it, pkg) = (IncIfWindows it, pkg)
 
+-- | Bool indicates if including extra packages
+packagesByIncludeFilter :: (IncludeType -> Bool) -> Bool -> Release -> [Package]
+packagesByIncludeFilter f extraPkgs = map snd . filter (f . fst) . if extraPkgs then allRelIncludes else relMinimalIncludes
 
-packagesByIncludeFilter :: (IncludeType -> Bool) -> Release -> [Package]
-packagesByIncludeFilter f = map snd . filter (f . fst) . relIncludes
-
--- | All packages in the release
-allPackages :: Release -> [Package]
-allPackages = packagesByIncludeFilter $ const True
+-- | All packages in the release, bool indicates if including extra packages
+allPackages :: Bool -> Release -> [Package]
+allPackages = packagesByIncludeFilter (const True)
 
 -- | Includes that are part of the core (expected to come with GHC)
-corePackages :: Release -> [Package]
+corePackages :: Bool -> Release -> [Package]
 corePackages = packagesByIncludeFilter isGhc
 
 -- | Includes that come from the platform (added beyond the GHC default)
-platformPackages :: Release -> [Package]
+platformPackages :: Bool -> Release -> [Package]
 platformPackages = packagesByIncludeFilter (not . isGhc)
 
 -- | Tests of Include

hptool/src/Releases.hs

@@ -3,6 +3,7 @@ module Releases
     , module Releases2013
     , module Releases2014
     , module Releases2015
+    , module Releases2016
     , releases
     )
 
@@ -12,6 +13,7 @@ import Releases2012
 import Releases2013
 import Releases2014
 import Releases2015
+import Releases2016
 import Types
 
 releases :: [Release]
@@ -20,4 +22,5 @@ releases = concat
     , releases2013
     , releases2014
     , releases2015
+    , releases2016
     ]