haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into yesod-1.4

Browse Source
This commit is contained in:
Michael Snoyman 2014-09-03 09:03:18 +03:00
commit 8cbcc5fab3
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yesod-bin/input/done.cg
View File

@ -24,4 +24,4 @@ Take part in the community: http://yesodweb.com/page/community
Start your project:
cd PROJECTNAME && cabal sandbox init && cabal install --enable-tests . yesod-platform yesod-bin --max-backjumps=-1 --reorder-goals && yesod devel
cd PROJECTNAME && cabal sandbox init && cabal install -j --enable-tests . yesod-platform yesod-bin --max-backjumps=-1 --reorder-goals && yesod devel

16
yesod-bin/main.hs
View File

@ -155,6 +155,12 @@ keterOptions = Keter <$> switch ( long "nobuild" <> short 'n' <> help "Skip rebu
defaultRescan :: Int
defaultRescan = 10
#if MIN_VERSION_optparse_applicative(0,10,0)
option' = option auto
#else
option' = option
#endif
develOptions :: Parser Command
develOptions = Devel <$> switch ( long "disable-api" <> short 'd'
<> help "Disable fast GHC API rebuilding")
@ -162,7 +168,7 @@ develOptions = Devel <$> switch ( long "disable-api" <> short 'd'
<> help "Run COMMAND after rebuild succeeds")
<*> optStr ( long "failure-hook" <> short 'f' <> metavar "COMMAND"
<> help "Run COMMAND when rebuild fails")
<*> option ( long "event-timeout" <> short 't' <> value defaultRescan <> metavar "N"
<*> option' ( long "event-timeout" <> short 't' <> value defaultRescan <> metavar "N"
<> help ("Force rescan of files every N seconds (default "
++ show defaultRescan
++ ", use -1 to rely on FSNotify alone)") )
@ -172,9 +178,9 @@ develOptions = Devel <$> switch ( long "disable-api" <> short 'd'
<> help "ignore file changes in DIR" )
)
<*> extraCabalArgs
<*> option ( long "port" <> short 'p' <> value 3000 <> metavar "N"
<*> option' ( long "port" <> short 'p' <> value 3000 <> metavar "N"
<> help "Devel server listening port" )
<*> option ( long "proxy-timeout" <> short 'x' <> value 0 <> metavar "N"
<*> option' ( long "proxy-timeout" <> short 'x' <> value 0 <> metavar "N"
<> help "Devel server timeout before returning 'not ready' message (in seconds, 0 for none)" )
<*> switch ( long "disable-reverse-proxy" <> short 'n'
<> help "Disable reverse proxy" )
@ -189,7 +195,11 @@ extraCabalArgs = many (strOption ( long "extra-cabal-arg" <> short 'e' <> metava
-- | Optional @String@ argument
optStr :: Mod OptionFields (Maybe String) -> Parser (Maybe String)
optStr m =
#if MIN_VERSION_optparse_applicative(0,10,0)
nullOption (success . str) $ value Nothing <> m
#else
nullOption $ value Nothing <> reader (success . str) <> m
#endif
where
#if MIN_VERSION_optparse_applicative(0,6,0)
success = ReadM . Right

2
yesod-bin/yesod-bin.cabal
View File

@ -1,5 +1,5 @@
name: yesod-bin
version: 1.2.12.5
version: 1.2.12.7
license: MIT
license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com>