add stack executable install for linux, mac

Author: Gershom

hptool/src/Config.hs

@@ -5,8 +5,8 @@ module Config
     ( askHpRelease
     , askGhcBinDistTarFile
     , askBuildConfig
-
     , addConfigOracle
+    , askStackExe
     )
     where
 
@@ -66,13 +66,25 @@ 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 -> Bool -> Rules BuildConfig
-addConfigOracle hpRel tarFile prefix includeExtra = 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

hptool/src/Main.hs

@@ -42,10 +42,10 @@ main = shakeArgsWith opts flags main'
         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\
@@ -57,7 +57,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\
@@ -67,8 +67,8 @@ main = shakeArgsWith opts flags main'
                  \    build-website       -- build the website\n"
         return Nothing
 
-    allRules tarfile flgs = do
-        buildConfig <- addConfigOracle hpRelease tarfile (prefixSetting flgs) (Full `elem` flgs)
+    allRules tarfile stackexe flgs = do
+        buildConfig <- addConfigOracle hpRelease tarfile stackexe (prefixSetting flgs) (Full `elem` flgs)
         ghcDistRules
         packageRules
         targetRules buildConfig

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{..}
@@ -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

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
@@ -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/Website.hs

@@ -137,15 +137,15 @@ extendedCtx name = mkStrContext ctx
     pCtx pName "package" = MuVariable pName
     pCtx pName "hackageUrl" =
         MuVariable $ "http://hackage.haskell.org/package/" ++ pName
-    pCtx pName "releases" = mapListStrContext pvCtx $ packageVersionInfo pName
+    pCtx pName "releases" = mapListStrContext pvCtx $ packageVersionInfo True pName
     pCtx _ _ = MuNothing
 
     pvCtx (c, _) "class" = MuVariable c
     pvCtx (_, v) "version" = MuVariable v
     pvCtx _ _ = MuNothing
 
-packageVersionInfo :: String -> [(String, String)]
-packageVersionInfo pName = curr $ zipWith comp vers (drop 1 vers ++ [Nothing])
+packageVersionInfo :: Bool -> String -> [(String, String)]
+packageVersionInfo searchFull pName = curr $ zipWith comp vers (drop 1 vers ++ [Nothing])
   where
     comp Nothing  _                         = ("missing", "—")
     comp (Just v) Nothing                   = ("update", showVersion v)