diff --git a/yesod/main.hs b/yesod/main.hs index 7e7ef772..c7a1fafe 100755 --- a/yesod/main.hs +++ b/yesod/main.hs @@ -6,6 +6,8 @@ import System.Exit (exitWith, ExitCode (ExitSuccess)) import System.Process (rawSystem) import Yesod.Core (yesodVersion) import Control.Monad (unless) +import qualified Paths_yesod +import Data.Version (showVersion) #ifndef WINDOWS import Build (touch) @@ -46,7 +48,9 @@ main = do rawSystem' cmd ["configure", "--enable-tests", "-flibrary-only"] rawSystem' cmd ["build"] rawSystem' cmd ["test"] - ["version"] -> putStrLn $ "yesod-core version:" ++ yesodVersion + ["version"] -> do + putStrLn $ "yesod-core version:" ++ yesodVersion + putStrLn $ "yesod version:" ++ showVersion Paths_yesod.version "configure":rest -> rawSystem cmd ("configure":rest) >>= exitWith ["add-handler"] -> addHandler ["keter"] -> keter cmd False diff --git a/yesod/yesod.cabal b/yesod/yesod.cabal index a16030e5..45d4f740 100644 --- a/yesod/yesod.cabal +++ b/yesod/yesod.cabal @@ -1,5 +1,5 @@ name: yesod -version: 1.1.1 +version: 1.1.1.1 license: MIT license-file: LICENSE author: Michael Snoyman @@ -118,6 +118,7 @@ executable yesod Build Keter AddHandler + Paths_yesod source-repository head type: git