From 2210e94727e03cbc0f1e08c1ea9834abb9d1e4e7 Mon Sep 17 00:00:00 2001 From: "Julian K. Arni" Date: Mon, 20 Apr 2015 11:18:28 +0200 Subject: [PATCH] prepare merge --- .gitignore | 17 ---------- .travis.yml | 34 ------------------- CHANGELOG.md => servant-jquery/CHANGELOG.md | 0 LICENSE => servant-jquery/LICENSE | 0 README.md => servant-jquery/README.md | 0 Setup.hs => servant-jquery/Setup.hs | 0 TODO.md => servant-jquery/TODO.md | 0 docs.sh => servant-jquery/docs.sh | 0 .../examples}/README.md | 0 .../examples}/counter.hs | 0 .../examples}/counter.md | 0 .../examples}/www/api.js | 0 .../examples}/www/index.html | 0 .../examples}/www/jquery.min.js | 0 .../servant-jquery.cabal | 0 {src => servant-jquery/src}/Servant/JQuery.hs | 0 .../src}/Servant/JQuery/Internal.hs | 0 .../test}/Servant/JQuerySpec.hs | 0 .../test}/Servant/JQuerySpec/CustomHeaders.hs | 0 {test => servant-jquery/test}/Spec.hs | 0 20 files changed, 51 deletions(-) delete mode 100644 .gitignore delete mode 100644 .travis.yml rename CHANGELOG.md => servant-jquery/CHANGELOG.md (100%) rename LICENSE => servant-jquery/LICENSE (100%) rename README.md => servant-jquery/README.md (100%) rename Setup.hs => servant-jquery/Setup.hs (100%) rename TODO.md => servant-jquery/TODO.md (100%) rename docs.sh => servant-jquery/docs.sh (100%) rename {examples => servant-jquery/examples}/README.md (100%) rename {examples => servant-jquery/examples}/counter.hs (100%) rename {examples => servant-jquery/examples}/counter.md (100%) rename {examples => servant-jquery/examples}/www/api.js (100%) rename {examples => servant-jquery/examples}/www/index.html (100%) rename {examples => servant-jquery/examples}/www/jquery.min.js (100%) rename servant-jquery.cabal => servant-jquery/servant-jquery.cabal (100%) rename {src => servant-jquery/src}/Servant/JQuery.hs (100%) rename {src => servant-jquery/src}/Servant/JQuery/Internal.hs (100%) rename {test => servant-jquery/test}/Servant/JQuerySpec.hs (100%) rename {test => servant-jquery/test}/Servant/JQuerySpec/CustomHeaders.hs (100%) rename {test => servant-jquery/test}/Spec.hs (100%) diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 0855a79b..00000000 --- a/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -dist -cabal-dev -*.o -*.hi -*.chi -*.chs.h -*.dyn_o -*.dyn_hi -.virtualenv -.hpc -.hsenv -.cabal-sandbox/ -cabal.sandbox.config -cabal.config -*.prof -*.aux -*.hp diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a9862925..00000000 --- a/.travis.yml +++ /dev/null @@ -1,34 +0,0 @@ -language: haskell - -ghc: - - 7.8 - -before_install: - - git clone https://github.com/haskell-servant/servant.git - - git clone https://github.com/haskell-servant/servant-server.git - - cabal sandbox init - - cabal sandbox add-source servant/ - - cabal sandbox add-source servant-server/ - -install: - - cabal install --only-dependencies --enable-tests - -script: - - cabal configure --enable-tests --enable-library-coverage - - cabal build && cabal test - - cabal check - -after_script: - - cabal install hpc-coveralls - - hpc-coveralls --exclude-dir=test spec - -notifications: - irc: - channels: - - "irc.freenode.org#servant" - template: - - "%{repository}#%{build_number} - %{commit} on %{branch} by %{author}: %{message}" - - "Build details: %{build_url} - Change view: %{compare_url}" - skip_join: true - on_success: change - on_failure: always diff --git a/CHANGELOG.md b/servant-jquery/CHANGELOG.md similarity index 100% rename from CHANGELOG.md rename to servant-jquery/CHANGELOG.md diff --git a/LICENSE b/servant-jquery/LICENSE similarity index 100% rename from LICENSE rename to servant-jquery/LICENSE diff --git a/README.md b/servant-jquery/README.md similarity index 100% rename from README.md rename to servant-jquery/README.md diff --git a/Setup.hs b/servant-jquery/Setup.hs similarity index 100% rename from Setup.hs rename to servant-jquery/Setup.hs diff --git a/TODO.md b/servant-jquery/TODO.md similarity index 100% rename from TODO.md rename to servant-jquery/TODO.md diff --git a/docs.sh b/servant-jquery/docs.sh similarity index 100% rename from docs.sh rename to servant-jquery/docs.sh diff --git a/examples/README.md b/servant-jquery/examples/README.md similarity index 100% rename from examples/README.md rename to servant-jquery/examples/README.md diff --git a/examples/counter.hs b/servant-jquery/examples/counter.hs similarity index 100% rename from examples/counter.hs rename to servant-jquery/examples/counter.hs diff --git a/examples/counter.md b/servant-jquery/examples/counter.md similarity index 100% rename from examples/counter.md rename to servant-jquery/examples/counter.md diff --git a/examples/www/api.js b/servant-jquery/examples/www/api.js similarity index 100% rename from examples/www/api.js rename to servant-jquery/examples/www/api.js diff --git a/examples/www/index.html b/servant-jquery/examples/www/index.html similarity index 100% rename from examples/www/index.html rename to servant-jquery/examples/www/index.html diff --git a/examples/www/jquery.min.js b/servant-jquery/examples/www/jquery.min.js similarity index 100% rename from examples/www/jquery.min.js rename to servant-jquery/examples/www/jquery.min.js diff --git a/servant-jquery.cabal b/servant-jquery/servant-jquery.cabal similarity index 100% rename from servant-jquery.cabal rename to servant-jquery/servant-jquery.cabal diff --git a/src/Servant/JQuery.hs b/servant-jquery/src/Servant/JQuery.hs similarity index 100% rename from src/Servant/JQuery.hs rename to servant-jquery/src/Servant/JQuery.hs diff --git a/src/Servant/JQuery/Internal.hs b/servant-jquery/src/Servant/JQuery/Internal.hs similarity index 100% rename from src/Servant/JQuery/Internal.hs rename to servant-jquery/src/Servant/JQuery/Internal.hs diff --git a/test/Servant/JQuerySpec.hs b/servant-jquery/test/Servant/JQuerySpec.hs similarity index 100% rename from test/Servant/JQuerySpec.hs rename to servant-jquery/test/Servant/JQuerySpec.hs diff --git a/test/Servant/JQuerySpec/CustomHeaders.hs b/servant-jquery/test/Servant/JQuerySpec/CustomHeaders.hs similarity index 100% rename from test/Servant/JQuerySpec/CustomHeaders.hs rename to servant-jquery/test/Servant/JQuerySpec/CustomHeaders.hs diff --git a/test/Spec.hs b/servant-jquery/test/Spec.hs similarity index 100% rename from test/Spec.hs rename to servant-jquery/test/Spec.hs