diff --git a/LICENSE b/LICENSE new file mode 100644 --- /dev/null +++ b/LICENSE @@ -0,0 +1,31 @@ +Copyright Well-Typed LLP, 2011-2012, Tim Watson, 2012-2014 + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * Neither the name of the owner nor the names of other + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 --- a/LICENSE.md +++ /dev/null @@ -1,31 +0,0 @@ -Copyright Well-Typed LLP, 2011-2012, Tim Watson, 2012-2014 - -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - - * Neither the name of the owner nor the names of other - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -1,22 +1,61 @@ -### Cloud Haskell Build Umbrella +# Cloud Haskell meta-project -This repository contains tools to assist with building and -developing Cloud Haskell itself. +[![Build Status](https://travis-ci.org/haskell-distributed/cloud-haskell.svg?branch=master)](https://travis-ci.org/haskell-distributed/cloud-haskell) -### Status +[Cloud Haskell][cloud-haskell] is a set of libraries that bring +Erlang-style concurrency and distribution to Haskell programs. -Right now, there is a top-level Makefile that you can use to -obtain a copy of all the relevant git repositories and a build.mk -utility makefile that each project pulls in, which provides some -common build infrastructure (based on cabal sandboxes). +This repository includes references to all other official Cloud +Haskell packages for conveniently building them all from a single +location. Use this repository as a starting point for hacking on Cloud +Haskell packages (see [CONTRIBUTING](CONTRIBUTING.md)). -### Usage +Those users that do not use package snapshots (such as +[Stackage][stackage]) can use the `.cabal` file in this repository to +install a consistent set of versions of all Cloud Haskell packages. +Snapshot users don't normally need this `.cabal` file, and should +add Cloud Haskell packages directly as dependencies. -To install from hackage, simply `cabal install cloud-haskell`. +[cloud-haskell]: http://haskell-distributed.github.io/ +[stackage]: http://www.stackage.org/ -To install from sources, first of all, check out this repository from -github, then cd into the newly created directory and run `make` to get -a download of all the repositories. To then work with them, cd into a -specific repo/directory and use one of the various make targets. Right -now, you'll have to look at build.mk yourself and figure out the gory -details - we hope to improve on that soon! +## Usage + +### Installation from Hackage + +``` +$ cabal install cloud-haskell +``` + +### Building from source + +Clone this repository locally using `git` or [`hub`][hub]: + +``` +$ hub clone --recursive haskell-distributed/cloud-haskell +``` + +Then, + +``` +$ cd cloud-haskell +$ stack build +``` + +You will need [stack][stack] installed and reachable from your +`$PATH`. + +[hub]: https://hub.github.com/ +[stack]: https://github.com/commercialhaskell/stack + +### Updating the source + +To hack on the latest versions of all packages, + +``` +$ git submodule update --remote +``` + +## Contributing to Cloud Haskell + +See [CONTRIBUTING](CONTRIBUTING.md). diff --git a/cloud-haskell.cabal b/cloud-haskell.cabal --- a/cloud-haskell.cabal +++ b/cloud-haskell.cabal @@ -1,5 +1,5 @@ Name: cloud-haskell -Version: 0.2.0.0 +Version: 0.3.0.0 synopsis: The Cloud Haskell Application Platform Description: Cloud Haskell is a set of libraries that bring Erlang-style concurrency and distribution to Haskell programs. This @@ -19,9 +19,9 @@ Homepage: http://github.com/haskell-distributed/cloud-haskell Bug-Reports: http://cloud-haskell.atlassian.net/ License: BSD3 -License-file: LICENSE.md +License-file: LICENSE Author: Tim Watson -Maintainer: watson.timothy@gmail.com +Maintainer: Facundo Domínguez Category: Control Build-type: Simple Cabal-version: >=1.10 @@ -47,26 +47,25 @@ Manual: True Library - Build-depends: - rank1dynamic >= 0.2.0.0 && < 0.3, - distributed-static >= 0.3.0.0 && < 0.4, - network-transport >= 0.4.1.0 && < 0.5, - distributed-process >= 0.5.0 && < 0.6, - distributed-process-extras >= 0.1.1 && < 0.2, - distributed-process-async >= 0.2.0 && < 0.2, - distributed-process-client-server >= 0.1.1 && < 0.2, - distributed-process-supervisor >= 0.1.1 && < 0.2, - distributed-process-task >= 0.1.0 && < 0.2, - distributed-process-execution >= 0.1.0 && < 0.2 + Build-depends: + distributed-process == 0.6.*, + distributed-process-async == 0.2.*, + distributed-process-client-server == 0.1.*, + distributed-process-execution == 0.1.*, + distributed-process-extras == 0.2.*, + distributed-process-supervisor == 0.1.*, + distributed-process-task == 0.1.*, + distributed-static == 0.3.*, + network-transport == 0.4.*, + rank1dynamic == 0.3.* if flag(tcp) - Build-depends: network-transport-tcp >= 0.4.0 && < 0.5 + Build-depends: network-transport-tcp == 0.4.* if flag(simplelocalnet) - Build-depends: distributed-process-simplelocalnet >= 0.2.1.0 && < 0.3 + Build-depends: distributed-process-simplelocalnet == 0.2.* if flag(p2p) - Build-depends: distributed-process-p2p >= 0.1.2.2 + Build-depends: distributed-process-p2p == 0.1.* Default-language: Haskell2010 -