aboutsummaryrefslogtreecommitdiff
path: root/Distribution
diff options
context:
space:
mode:
authorDaniel Gröber <dxld@darkboxed.org>2017-09-25 13:53:13 +0200
committerDaniel Gröber <dxld@darkboxed.org>2017-09-25 13:53:13 +0200
commit2e9e036cb54b580e886dd11917df71961735adfa (patch)
tree74d6df5b94b82e63bef8879b128e1e07ecf7e45e /Distribution
parentebe84d580e5f9897b312d7e6748341331e4c4863 (diff)
Execute deprecations
Diffstat (limited to 'Distribution')
-rw-r--r--Distribution/Helper.hs37
1 files changed, 4 insertions, 33 deletions
diff --git a/Distribution/Helper.hs b/Distribution/Helper.hs
index 6c31208..ec79b85 100644
--- a/Distribution/Helper.hs
+++ b/Distribution/Helper.hs
@@ -64,10 +64,8 @@ module Distribution.Helper (
-- * Managing @dist/@
, prepare
- , prepare'
, reconfigure
, writeAutogenFiles
- , writeAutogenFiles'
-- * $libexec related error handling
, LibexecNotFoundError(..)
@@ -347,43 +345,16 @@ getSomeConfigState = ask >>= \QueryEnv {..} -> do
return $ SomeLocalBuildInfo
pkgDbs eps srcDirs ghcOpts ghcSrcOpts ghcPkgOpts ghcMergedPkgOpts ghcLangOpts pkgLics fls cfls ndcfls (comp, compVer)
-prepare :: MonadIO m
- => (FilePath -> [String] -> String -> IO String)
- -> FilePath
- -> FilePath
- -> m ()
-prepare readProc projdir distdir = liftIO $ do
- exe <- findLibexecExe
- void $ readProc exe [projdir, distdir] ""
-
-{-# DEPRECATED prepare
- "Will be replaced by prepare' in the next major release" #-}
-
-- | Make sure the appropriate helper executable for the given project is
-- installed and ready to run queries.
-prepare' :: MonadIO m => QueryEnv -> m ()
-prepare' qe =
+prepare :: MonadIO m => QueryEnv -> m ()
+prepare qe =
liftIO $ void $ invokeHelper qe []
-writeAutogenFiles :: MonadIO m
- => (FilePath -> [String] -> String -> IO String)
- -> FilePath
- -- ^ Path to project directory, i.e. the one containing the
- -- @project.cabal@ file
- -> FilePath
- -- ^ Path to the @dist/@ directory
- -> m ()
-writeAutogenFiles readProc projdir distdir = liftIO $ do
- exe <- findLibexecExe
- void $ readProc exe [projdir, distdir, "write-autogen-files"] ""
-
-{-# DEPRECATED writeAutogenFiles
- "Will be replaced by writeAutogenFiles' in the next major release" #-}
-
-- | Create @cabal_macros.h@ and @Paths_\<pkg\>@ possibly other generated files
-- in the usual place.
-writeAutogenFiles' :: MonadIO m => QueryEnv -> m ()
-writeAutogenFiles' qe =
+writeAutogenFiles :: MonadIO m => QueryEnv -> m ()
+writeAutogenFiles qe =
liftIO $ void $ invokeHelper qe ["write-autogen-files"]
-- | Get the path to the sandbox package-db in a project