From 8df3b458d446297557575511701169bcef229e6f Mon Sep 17 00:00:00 2001 From: "John J. Camilleri" Date: Mon, 15 Oct 2018 21:05:55 +0200 Subject: [PATCH] `cabal sdist` doesn't throw an error anymore This was making it impossible to install gf as external source in cabal sandbox --- Setup.hs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Setup.hs b/Setup.hs index 0cbb64480..505eb9813 100644 --- a/Setup.hs +++ b/Setup.hs @@ -11,12 +11,6 @@ import WebSetup noRGLmsg :: IO () noRGLmsg = putStrLn "Notice: the RGL is not built as part of GF anymore. See https://github.com/GrammaticalFramework/gf-rgl" --- | Cabal doesn't know how to correctly create the source distribution, so --- we print an error message with the correct instructions when someone tries --- `cabal sdist`. -sdistError :: PackageDescription -> Maybe LocalBuildInfo -> UserHooks -> SDistFlags -> IO () -sdistError _ _ _ _ = fail "Use `make sdist` to create the source distribution file" - main :: IO () main = defaultMainWithHooks simpleUserHooks { preBuild = gfPreBuild @@ -24,7 +18,7 @@ main = defaultMainWithHooks simpleUserHooks , preInst = gfPreInst , postInst = gfPostInst , postCopy = gfPostCopy - , sDistHook = sdistError + , sDistHook = gfSDist } where gfPreBuild args = gfPre args . buildDistPref @@ -48,6 +42,11 @@ main = defaultMainWithHooks simpleUserHooks saveCopyPath args flags (pkg,lbi) copyWeb flags (pkg,lbi) + -- `cabal sdist` will not make a proper dist archive, for that see `make sdist` + -- However this function should exit quietly to allow building gf in sandbox + gfSDist pkg lbi hooks flags = do + return () + saveInstallPath :: [String] -> InstallFlags -> (PackageDescription, LocalBuildInfo) -> IO () saveInstallPath args flags bi = do let