Merge pull request #1379 from jneira/cabal3-build

Add support for building with cabal-3.0.0.0

Author: fendor

install/src/Cabal.hs

@@ -26,8 +26,8 @@ execCabal_ = command_ [] "cabal"
 
 cabalBuildData :: Action ()
 cabalBuildData = do
-  execCabal_ ["new-build", "hoogle"]
-  execCabal_ ["new-exec", "hoogle", "generate"]
+  execCabal_ ["v2-build", "hoogle"]
+  execCabal_ ["v2-exec", "hoogle", "generate"]
 
 cabalBuildHie :: VersionNumber -> Action ()
 cabalBuildHie versionNumber = do
@@ -37,18 +37,26 @@ cabalBuildHie versionNumber = do
       error (ghcVersionNotFoundFailMsg versionNumber)
     Just p -> return p
   execCabal_
-    ["new-build", "-w", ghcPath, "--write-ghc-environment-files=never", "--max-backjumps=5000"]
+    ["v2-build", "-w", ghcPath, "--write-ghc-environment-files=never", "--max-backjumps=5000", "--disable-tests"]
 
 cabalInstallHie :: VersionNumber -> Action ()
 cabalInstallHie versionNumber = do
   localBin <- getLocalBin
-  execCabal_
-    [ "new-install"
+  cabalVersion <- getCabalVersion
+
+  let isCabal3 = checkVersion [3,0,0,0] cabalVersion
+      installDirOpt | isCabal3 = "--installdir"
+                    | otherwise = "--symlink-bindir"
+      installMethod | isWindowsSystem && isCabal3 = ["--install-method=copy"]
+                    | otherwise = []
+  execCabal_ $
+    [ "v2-install"
     , "--write-ghc-environment-files=never"
-    , "--symlink-bindir=" ++ localBin
+    , installDirOpt ++ "=" ++ localBin
     , "exe:hie"
     , "--overwrite-policy=always"
     ]
+    ++ installMethod
   liftIO $ do
     copyFile (localBin </> "hie" <.> exe)
              (localBin </> "hie-" ++ versionNumber <.> exe)
@@ -66,7 +74,7 @@ installCabal = do
   -- install `cabal-install` if not already installed
   unless cabalExeOk $ execStackShake_ ["install", "cabal-install"]
 
--- | check `stack` has the required version
+-- | check `cabal` has the required version
 checkCabal :: Action ()
 checkCabal = do
   cabalVersion <- getCabalVersion
@@ -77,22 +85,25 @@ checkCabal = do
 getCabalVersion :: Action String
 getCabalVersion = trimmedStdout <$> execCabal ["--numeric-version"]
 
--- TODO: this restriction will be gone in the next release of cabal
 validateCabalNewInstallIsSupported :: Action ()
-validateCabalNewInstallIsSupported = when isWindowsSystem $ do
-  printInStars cabalInstallNotSuportedFailMsg
-  error cabalInstallNotSuportedFailMsg
+validateCabalNewInstallIsSupported = do
+  cabalVersion <- getCabalVersion
+  let isUnsupportedVersion =
+        not $ checkVersion requiredCabalVersionForWindows cabalVersion 
+  when (isWindowsSystem && isUnsupportedVersion) $ do
+    printInStars cabalInstallNotSuportedFailMsg
+    error cabalInstallNotSuportedFailMsg
 
--- | Error message when a windows system tries to install HIE via `cabal new-install`
+-- | Error message when a windows system tries to install HIE via `cabal v2-install`
 cabalInstallNotSuportedFailMsg :: String
 cabalInstallNotSuportedFailMsg =
   "This system has been identified as a windows system.\n"
-    ++ "Unfortunately, `cabal new-install` is currently not supported on windows.\n"
-    ++ "Please use one of the stack-based targets.\n\n"
+    ++ "Unfortunately, `cabal v2-install` is supported since version "++ cabalVersion ++".\n"
+    ++ "Please upgrade your cabal executable or use one of the stack-based targets.\n\n"
     ++ "If this system has been falsely identified, please open an issue at:\n\thttps://github.com/haskell/haskell-ide-engine\n"
+  where cabalVersion = versionToString requiredCabalVersionForWindows
 
-
--- | Error message when the `stack` binary is an older version
+-- | Error message when the `cabal` binary is an older version
 cabalInstallIsOldFailMsg :: String -> String
 cabalInstallIsOldFailMsg cabalVersion =
   "The `cabal` executable is outdated.\n"
@@ -106,3 +117,6 @@ cabalInstallIsOldFailMsg cabalVersion =
 
 requiredCabalVersion :: RequiredVersion
 requiredCabalVersion = [2, 4, 1, 0]
+
+requiredCabalVersionForWindows :: RequiredVersion
+requiredCabalVersionForWindows = [3, 0, 0, 0]