add minimal/full info to build products

Author: U-CIQDEV\gbazerman

hptool/src/OS/Mac.hs

@@ -79,7 +79,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"
@@ -140,7 +140,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 +153,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

@@ -71,7 +71,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"
 

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

@@ -84,7 +84,7 @@ expandNsisInfo :: (Monad m) => Release -> BuildConfig -> MuContext m
 expandNsisInfo rls BuildConfig{..} = mkStrContext ex
   where
     ex "productFile" = MuVariable . toNative $
-        winProductFile hpver bcArch `relativeToDir` 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"

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
-