From fbc012c348dfb4708b27f28f7e8c4a667546e91d Mon Sep 17 00:00:00 2001 From: Alp Mestanogullari Date: Wed, 10 Dec 2014 16:51:05 +0100 Subject: [PATCH] adapt to servant/servant-server split, prepare release --- Setup.hs | 2 ++ docs.sh | 52 ++++++++++++++++++++++++++++++++++++++++++++ servant-client.cabal | 9 ++++---- 3 files changed, 59 insertions(+), 4 deletions(-) create mode 100644 Setup.hs create mode 100644 docs.sh diff --git a/Setup.hs b/Setup.hs new file mode 100644 index 00000000..9a994af6 --- /dev/null +++ b/Setup.hs @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain diff --git a/docs.sh b/docs.sh new file mode 100644 index 00000000..a4f6827e --- /dev/null +++ b/docs.sh @@ -0,0 +1,52 @@ +SERVANT_DIR=/tmp/servant-client-gh-pages + +# Make a temporary clone + +rm -rf $SERVANT_DIR + +git clone . $SERVANT_DIR + +cd $SERVANT_DIR + +# Make sure to pull the latest + +git remote add haskell-servant git@github.com:haskell-servant/servant-client.git + +git fetch haskell-servant + +git reset --hard haskell-servant/gh-pages + +# Clear everything away + +git rm -rf $SERVANT_DIR/* + +# Switch back and build the haddocks + +cd - + +cabal configure --builddir=$SERVANT_DIR + +cabal haddock --hoogle --hyperlink-source --html-location='https://hackage.haskell.org/package/$pkg-$version/docs' --builddir=$SERVANT_DIR + +commit_hash=$(git rev-parse HEAD) + +# Move the HTML docs to the root + +cd $SERVANT_DIR + +rm * +rm -rf build +mv doc/html/servant-client/* . +rm -r doc/ + +# Add everything + +git add . + +git commit -m "Built from $commit_hash" + +# Push to update the pages + +git push haskell-servant HEAD:gh-pages + +rm -rf $SERVANT_DIR diff --git a/servant-client.cabal b/servant-client.cabal index fac8899a..1c942eac 100644 --- a/servant-client.cabal +++ b/servant-client.cabal @@ -1,6 +1,6 @@ name: servant-client -version: 0.2 -synopsis: automatical derivation of haskell functions that let you query servant webservices +version: 0.2.1 +synopsis: automatical derivation of querying functions for servant webservices description: This library lets you derive automatically Haskell functions that let you query each endpoint of a webservice. @@ -47,7 +47,7 @@ library , http-types , network-uri >= 2.6 , safe - , servant >= 0.2 + , servant >= 0.2.1 , string-conversions , text , transformers @@ -72,7 +72,8 @@ test-suite spec , http-types , network >= 2.6 , QuickCheck - , servant >= 0.2 + , servant >= 0.2.1 , servant-client + , servant-server >= 0.2.1 , wai , warp