Merge branch 'master' of https://github.com/yesodweb/yesod
This commit is contained in:
Björn Buckwalter
commit
a1d4f5ee00
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
[submodule "scripts"]
|
||||
path = scripts
|
||||
url = git://github.com/yesodweb/scripts.git
|
||||
31
README.md
31
README.md
@ -1,17 +1,17 @@
|
||||
A next generation web framework using the Haskell programming language, featuring:
|
||||
|
||||
A next generation web framework using the Haskell programming language,
|
||||
featuring:
|
||||
|
||||
* safety & security guaranteed at compile time
|
||||
* performance
|
||||
* fast, compiled code
|
||||
* a greater concurrent load than any other web application server
|
||||
* developer productivity: tools for all your basic web development needs
|
||||
* developer productivity: tools for all your basic web development
|
||||
needs
|
||||
|
||||
## Learn more: http://yesodweb.com/
|
||||
|
||||
|
||||
## Installation: http://www.yesodweb.com/page/five-minutes
|
||||
|
||||
|
||||
## Create a new project after installing
|
||||
|
||||
yesod init
|
||||
@ -19,13 +19,18 @@ A next generation web framework using the Haskell programming language, featurin
|
||||
|
||||
## Installing the latest development version from github
|
||||
|
||||
Yesod is built upon many smaller packages, all of which can be installed with:
|
||||
Yesod is built upon many smaller packages, all of which can be installed
|
||||
with:
|
||||
|
||||
cabal update
|
||||
~~~ { .bash }
|
||||
cabal update
|
||||
|
||||
REPOS="hamlet persistent wai yesod"
|
||||
for repo in $REPOS
|
||||
do
|
||||
git clone http://github.com/yesodweb/$repo
|
||||
(cd $repo && ./install-all.sh)
|
||||
done
|
||||
for repo in hamlet persistent wai yesod; do
|
||||
git clone http://github.com/yesodweb/$repo
|
||||
(
|
||||
cd $repo
|
||||
git submodule update --init
|
||||
./script/install
|
||||
)
|
||||
done
|
||||
~~~
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
#!/bin/bash -e
|
||||
|
||||
# allow a CABAL env var to override
|
||||
CABAL=${CABAL:-cabal}
|
||||
|
||||
# install testing dependencies
|
||||
$CABAL install HUnit QuickCheck 'hspec >= 0.6.1 && < 0.7' shelltestrunner
|
||||
|
||||
pkgs=( yesod-core
|
||||
yesod-json
|
||||
yesod-static
|
||||
yesod-persistent
|
||||
yesod-newsfeed
|
||||
yesod-form
|
||||
yesod-auth
|
||||
yesod-sitemap
|
||||
yesod
|
||||
)
|
||||
|
||||
# install each sub-respository
|
||||
for pkg in "${pkgs[@]}"; do
|
||||
echo "Installing $pkg..."
|
||||
|
||||
(
|
||||
cd "./$pkg"
|
||||
|
||||
if [ "$1" = "--clean" ]; then
|
||||
$CABAL clean
|
||||
fi
|
||||
|
||||
if ! $CABAL configure --ghc-options="-Wall -Werror"; then
|
||||
$CABAL install --only-dependencies
|
||||
$CABAL configure --ghc-options="-Wall -Werror"
|
||||
fi
|
||||
$CABAL build
|
||||
|
||||
$CABAL configure --enable-tests
|
||||
$CABAL build
|
||||
$CABAL test
|
||||
|
||||
$CABAL check
|
||||
if [ "$1" != "--fast" ]; then
|
||||
$CABAL haddock --executables
|
||||
fi
|
||||
./Setup.lhs install
|
||||
)
|
||||
done
|
||||
1
scripts
Submodule
1
scripts
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit fc9feeee6d330d4df7d4aab7c015387da93f0192
|
||||
@ -419,7 +419,7 @@ fileAFormReq fs = AForm $ \(master, langs) menvs ints -> do
|
||||
{ fvLabel = toHtml $ renderMessage master langs $ fsLabel fs
|
||||
, fvTooltip = fmap (toHtml . renderMessage master langs) $ fsTooltip fs
|
||||
, fvId = id'
|
||||
, fvInput = [whamlet|
|
||||
, fvInput = [WHAMLET|
|
||||
<input type=file name=#{name} ##{id'}>
|
||||
|]
|
||||
, fvErrors = errs
|
||||
@ -448,7 +448,7 @@ fileAFormOpt fs = AForm $ \(master, langs) menvs ints -> do
|
||||
{ fvLabel = toHtml $ renderMessage master langs $ fsLabel fs
|
||||
, fvTooltip = fmap (toHtml . renderMessage master langs) $ fsTooltip fs
|
||||
, fvId = id'
|
||||
, fvInput = [whamlet|
|
||||
, fvInput = [WHAMLET|
|
||||
<input type=file name=#{name} ##{id'}>
|
||||
|]
|
||||
, fvErrors = errs
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
name: yesod-form
|
||||
version: 0.3.2
|
||||
version: 0.3.2.1
|
||||
license: BSD3
|
||||
license-file: LICENSE
|
||||
author: Michael Snoyman <michael@snoyman.com>
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
{-# LANGUAGE QuasiQuotes #-}
|
||||
{-# LANGUAGE TemplateHaskell #-}
|
||||
{-# LANGUAGE ScopedTypeVariables #-}
|
||||
{-# LANGUAGE CPP #-}
|
||||
module Devel
|
||||
( devel
|
||||
) where
|
||||
@ -35,6 +36,12 @@ import Text.Shakespeare.Text (st)
|
||||
|
||||
import Build (recompDeps, getDeps,findHaskellFiles)
|
||||
|
||||
#if __GLASGOW_HASKELL__ >= 700
|
||||
#define ST st
|
||||
#else
|
||||
#define ST $st
|
||||
#endif
|
||||
|
||||
lockFile :: FilePath
|
||||
lockFile = "dist/devel-terminate"
|
||||
|
||||
@ -137,7 +144,7 @@ showPkgName :: D.PackageId -> String
|
||||
showPkgName = (\(D.PackageName n) -> n) . D.pkgName
|
||||
|
||||
develFile :: D.PackageId -> T.Text
|
||||
develFile pid = [st|
|
||||
develFile pid = [ST|
|
||||
{-# LANGUAGE PackageImports #-}
|
||||
import "#{showPkgName pid}" Application (withDevelAppPort)
|
||||
import Data.Dynamic (fromDynamic)
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
name: yesod
|
||||
version: 0.9.2.1
|
||||
version: 0.9.2.2
|
||||
license: BSD3
|
||||
license-file: LICENSE
|
||||
author: Michael Snoyman <michael@snoyman.com>
|
||||
@ -100,7 +100,7 @@ executable yesod
|
||||
, attoparsec-text >= 0.8.5 && < 0.9
|
||||
, http-types >= 0.6.1 && < 0.7
|
||||
, blaze-builder >= 0.2 && < 0.4
|
||||
, filepath >= 1.2 && < 1.3
|
||||
, filepath >= 1.1 && < 1.3
|
||||
, process
|
||||
ghc-options: -Wall -threaded
|
||||
main-is: main.hs
|
||||
|
||||
Loading…
Reference in New Issue
Block a user