This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "snap-core".
The branch, master has been updated
via d6ac45b33e5f167a3fdabd6961cc085704a37621 (commit)
via 91d07caf7e9889a05d1a04c59683234b546f887f (commit)
from 367ae078f0af5409469f2e61f1373e697169ed8e (commit)
Summary of changes:
src/Snap/Starter.hs | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d6ac45b33e5f167a3fdabd6961cc085704a37621
Merge: 91d07ca 367ae07
Author: Mighty Byte <[email protected]>
Date: Sun May 23 10:29:11 2010 -0400
Merge branch 'master' of git.snapframework.com:snap-core
Conflicts:
src/Snap/Starter.hs
diff --cc src/Snap/Starter.hs
index 8ebcea0,98174c0..f65997e
--- a/src/Snap/Starter.hs
+++ b/src/Snap/Starter.hs
@@@ -66,18 -100,19 +100,18 @@@ cabalFile projName isBareBones = unline
," bytestring >= 0.9.1 && <0.10,"
," snap-core >= 0.1 && <0.2,"
," snap-server >= 0.1 && <0.2,"
- ," heist >= 0.1 && <0.2,"
- ," filepath >= 1.1 && <1.2"
+ ] ++ (if isBareBones then [] else [" heist >= 0.1 && <0.2,"]) ++
+ [" filepath >= 1.1 && <1.2"
,""
," ghc-options: -O2 -Wall -fwarn-tabs -funbox-strict-fields -threaded
-fno-warn-unused-imports"
- ,""
- ," Extensions: OverloadedStrings"
]
------------------------------------------------------------------------------
- mainFile :: String
- mainFile = unlines
+ mainFile :: Bool -> String
+ mainFile isBareBones = unlines $
- ["module Main where"
+ ["{-# LANGUAGE OverloadedStrings #-}"
+ ,"module Main where"
,""
,"import System"
,"import Control.Applicative"
commit 91d07caf7e9889a05d1a04c59683234b546f887f
Author: Mighty Byte <[email protected]>
Date: Sun May 23 10:26:59 2010 -0400
Specify OverloadedStrings in Main.hs rather than the .cabal file to
make ghci work.
diff --git a/src/Snap/Starter.hs b/src/Snap/Starter.hs
index a3605da..8ebcea0 100644
--- a/src/Snap/Starter.hs
+++ b/src/Snap/Starter.hs
@@ -70,15 +70,14 @@ cabalFile projName = unlines
," filepath >= 1.1 && <1.2"
,""
," ghc-options: -O2 -Wall -fwarn-tabs -funbox-strict-fields -threaded
-fno-warn-unused-imports"
- ,""
- ," Extensions: OverloadedStrings"
]
------------------------------------------------------------------------------
mainFile :: String
mainFile = unlines
- ["module Main where"
+ ["{-# LANGUAGE OverloadedStrings #-}"
+ ,"module Main where"
,""
,"import System"
,"import Control.Applicative"
-----------------------------------------------------------------------
hooks/post-receive
--
snap-core
_______________________________________________
Snap mailing list
[email protected]
http://mailman-mail5.webfaction.com/listinfo/snap
