Add stack dev target

Author: jneira

install/src/Cabal.hs

@@ -36,15 +36,15 @@ execCabal :: CmdResult r => [String] -> Action r
 execCabal = command [] "cabal"
 
 execCabal_ :: [String] -> Action ()
-execCabal_ = command [] "cabal"
+execCabal_ = execCabal
 
 cabalBuildData :: Action ()
 cabalBuildData = do
   execCabal_ ["v2-build", "hoogle"]
   execCabal_ ["v2-exec", "hoogle", "generate"]
 
 getGhcPathOfOrThrowError :: VersionNumber -> Action GhcPath
-getGhcPathOfOrThrowError versionNumber =
+getGhcPathOfOrThrowError versionNumber = 
   getGhcPathOf versionNumber >>= \case
     Nothing -> do
       printInStars $ ghcVersionNotFoundFailMsg versionNumber
@@ -68,21 +68,21 @@ cabalInstallHie versionNumber = do
     , "--write-ghc-environment-files=never"
     , installDirOpt, localBin
     , "--max-backjumps=5000"
-    , "exe:haskell-ide"
+    , "exe:hie"
     , "--overwrite-policy=always"
     ]
     ++ installMethod
 
-  let minorVerExe = "haskell-ide-" ++ versionNumber <.> exe
-      majorVerExe = "haskell-ide-" ++ dropExtension versionNumber <.> exe
+  let minorVerExe = "hie-" ++ versionNumber <.> exe
+      majorVerExe = "hie-" ++ dropExtension versionNumber <.> exe  
 
   liftIO $ do
-    copyFile (localBin </> "haskell-ide" <.> exe) (localBin </> minorVerExe)
-    copyFile (localBin </> "haskell-ide" <.> exe) (localBin </> majorVerExe)
+    copyFile (localBin </> "hie" <.> exe) (localBin </> minorVerExe)
+    copyFile (localBin </> "hie" <.> exe) (localBin </> majorVerExe)
 
   printLine $   "Copied executables "
-             ++ ("haskell-ide-wrapper" <.> exe) ++ ", "
-             ++ ("haskell-ide" <.> exe) ++ ", "
+             ++ ("hie-wrapper" <.> exe) ++ ", "
+             ++ ("hie" <.> exe) ++ ", "
              ++ majorVerExe ++ " and "
              ++ minorVerExe
              ++ " to " ++ localBin

install/src/Help.hs

@@ -51,7 +51,7 @@ shortHelpMessage = do
     , cabalGhcsTarget
     ]
 
--- | A record that specifies for each build system which versions of @haskell-ide@ can be built.
+-- | A record that specifies for each build system which versions of @hie@ can be built.
 data BuildableVersions = BuildableVersions
   { stackVersions :: [VersionNumber]
   , cabalVersions :: [VersionNumber]
@@ -78,7 +78,7 @@ helpMessage versions@BuildableVersions {..} = do
     [emptyTarget]
     [ generalTargets
     , defaultTargets
-    , if isRunFromCabal then [cabalGhcsTarget] else []
+    , if isRunFromCabal then [cabalGhcsTarget] else [stackDevTarget]
     , [macosIcuTarget]
     ]
 
@@ -97,17 +97,17 @@ templateTarget = ("<target>", "")
 
 hieTarget :: String -> TargetDescription
 hieTarget version =
-  ("haskell-ide-" ++ version, "Builds haskell-ide for GHC version " ++ version)
+  ("hie-" ++ version, "Install hie for GHC version " ++ version)
 
 buildTarget :: TargetDescription
-buildTarget = ("haskell-ide", "Build haskell-ide with the latest available GHC and the data files")
+buildTarget = ("hie", "Install hie with the latest available GHC and the data files")
 
 buildLatestTarget :: TargetDescription
-buildLatestTarget = ("latest", "Build haskell-ide with the latest available GHC")
+buildLatestTarget = ("latest", "Install hie with the latest available GHC")
 
 buildDataTarget :: TargetDescription
 buildDataTarget =
-  ("data", "Get the required data-files for `haskell-ide` (Hoogle DB)")
+  ("data", "Get the required data-files for `hie` (Hoogle DB)")
 
 -- special targets
 
@@ -122,3 +122,6 @@ cabalGhcsTarget =
   ( "ghcs"
   , "Show all GHC versions that can be installed via `cabal-build`."
   )
+
+stackDevTarget :: TargetDescription
+stackDevTarget = ("dev", "Install hie with the default stack.yaml")

install/src/HieInstall.hs

@@ -53,7 +53,7 @@ defaultMain = do
   -- used for stack-based targets
   stackVersions <- getHieVersions
 
-  let versions = if isRunFromStack then stackVersions else cabalVersions
+  let versions = if isRunFromStack then stackVersions else cabalVersions 
 
   let toolsVersions = BuildableVersions stackVersions cabalVersions
 
@@ -65,7 +65,7 @@ defaultMain = do
     phony "submodules"  updateSubmodules
     phony "short-help"  shortHelpMessage
     phony "help"        (helpMessage toolsVersions)
-
+    
     phony "check" (if isRunFromStack then checkStack else checkCabal_)
 
     phony "data" $ do
@@ -75,18 +75,22 @@ defaultMain = do
 
     forM_
       versions
-      (\version -> phony ("haskell-ide-" ++ version) $ do
+      (\version -> phony ("hie-" ++ version) $ do
         need ["submodules"]
         need ["check"]
         if isRunFromStack then do
-          stackBuildHie version
-          stackInstallHie version
+          stackInstallHieWithErrMsg (Just version)
         else
           cabalInstallHie version
       )
 
-    phony "latest" (need ["haskell-ide-" ++ latestVersion])
-    phony "haskell-ide"  (need ["data", "latest"])
+    phony "latest" (need ["hie-" ++ latestVersion])
+    phony "hie"  (need ["data", "latest"])
+
+    -- stack specific targets
+    when isRunFromStack $ do
+
+      phony "dev" $ stackInstallHieWithErrMsg Nothing
 
     -- cabal specific targets
     when isRunFromCabal $ do

install/src/Stack.hs

@@ -15,21 +15,36 @@ import           Version
 import           Print
 import           Env
 
-stackBuildHie :: VersionNumber -> Action ()
-stackBuildHie versionNumber = execStackWithGhc_ versionNumber ["build"]
-  `actionOnException` liftIO (putStrLn stackBuildFailMsg)
+stackInstallHieWithErrMsg :: Maybe VersionNumber -> Action ()
+stackInstallHieWithErrMsg mbVersionNumber = 
+  stackInstallHie mbVersionNumber
+    `actionOnException` liftIO (putStrLn stackBuildFailMsg)
 
 -- | copy the built binaries into the localBinDir
-stackInstallHie :: VersionNumber -> Action ()
-stackInstallHie versionNumber = do
-  execStackWithGhc_ versionNumber ["install"]
+stackInstallHie :: Maybe VersionNumber -> Action ()
+stackInstallHie mbVersionNumber = do
+  versionNumber <- 
+    case mbVersionNumber of
+      Nothing -> do
+        execStackWithCfgFile_ "stack.yaml" ["install"]
+        getGhcVersionOfCfgFile "stack.yaml"
+      Just vn -> do
+        execStackWithGhc_ vn ["install"]                      
+        return vn
+  
   localBinDir <- getLocalBin
-  let hie = "haskell-ide" <.> exe
+  let hie = "hie" <.> exe
   liftIO $ do
     copyFile (localBinDir </> hie)
-             (localBinDir </> "haskell-ide-" ++ versionNumber <.> exe)
+             (localBinDir </> "hie-" ++ versionNumber <.> exe)
     copyFile (localBinDir </> hie)
-             (localBinDir </> "haskell-ide-" ++ dropExtension versionNumber <.> exe)
+             (localBinDir </> "hie-" ++ dropExtension versionNumber <.> exe)
+
+getGhcVersionOfCfgFile :: String -> Action VersionNumber
+getGhcVersionOfCfgFile stackFile = do
+  Stdout ghcVersion <- 
+    execStackWithCfgFile stackFile ["exec", "ghc", "--", "--numeric-version"]
+  return $ trim ghcVersion
 
 -- | check `stack` has the required version
 checkStack :: Action ()
@@ -53,14 +68,21 @@ stackBuildData = do
 
 -- | Execute a stack command for a specified ghc, discarding the output
 execStackWithGhc_ :: VersionNumber -> [String] -> Action ()
-execStackWithGhc_ versionNumber args = do
-  let stackFile = "stack-" ++ versionNumber ++ ".yaml"
-  command_ [] "stack" (("--stack-yaml=" ++ stackFile) : args)
+execStackWithGhc_ = execStackWithGhc
 
 -- | Execute a stack command for a specified ghc
 execStackWithGhc :: CmdResult r => VersionNumber -> [String] -> Action r
 execStackWithGhc versionNumber args = do
   let stackFile = "stack-" ++ versionNumber ++ ".yaml"
+  execStackWithCfgFile stackFile args
+
+-- | Execute a stack command for a specified stack.yaml file, discarding the output
+execStackWithCfgFile_ :: String -> [String] -> Action ()
+execStackWithCfgFile_ = execStackWithCfgFile
+
+-- | Execute a stack command for a specified stack.yaml file
+execStackWithCfgFile :: CmdResult r => String -> [String] -> Action r
+execStackWithCfgFile stackFile args = 
   command [] "stack" (("--stack-yaml=" ++ stackFile) : args)
 
 -- | Execute a stack command with the same resolver as the build script
@@ -69,7 +91,7 @@ execStackShake args = command [] "stack" ("--stack-yaml=install/shake.yaml" : ar
 
 -- | Execute a stack command with the same resolver as the build script, discarding the output
 execStackShake_ :: [String] -> Action ()
-execStackShake_ args = command_ [] "stack" ("--stack-yaml=install/shake.yaml" : args)
+execStackShake_ = execStackShake
 
 
 -- | Error message when the `stack` binary is an older version