[commit: packages/hoopl] master: sync up and mergewith upstream (dcd563d)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/dcd563d69f9bcc614c73a40b9f8bfca684281d22

>---------------------------------------------------------------

commit dcd563d69f9bcc614c73a40b9f8bfca684281d22
Merge: 48da9a5 96c32cc
Author: Ning Wang <email at ningwang.org>
Date:   Tue May 5 10:53:48 2015 -0700

    sync up and mergewith upstream



>---------------------------------------------------------------

dcd563d69f9bcc614c73a40b9f8bfca684281d22
 README                | 32 --------------------------------
 README.md             | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 changelog.md          | 11 +++++++----
 hoopl.cabal           |  4 ++--
 src/Compiler/Hoopl.hs |  2 +-
 5 files changed, 58 insertions(+), 39 deletions(-)

diff --cc README.md
index 0000000,042c57b..c648876
mode 000000,100644..100644
--- a/README.md
+++ b/README.md
@@@ -1,0 -1,43 +1,48 @@@
+ The `hoopl` Package  [![Hackage](https://img.shields.io/hackage/v/hoopl.svg)](https://hackage.haskell.org/package/hoopl) [![Build Status](https://travis-ci.org/haskell/hoopl.svg)](https://travis-ci.org/haskell/hoopl)
+ ===================
+ 
+ ## Hoopl: A Higher-Order OPtimization Library
+ 
+ API documentation can be found on [Hackage](https://hackage.haskell.org/package/hoopl).
+ 
+ | Directory      | Contents
+ | -------------- | ---------
+ | `paper/`       | A paper about Hoopl
+ | `prototypes/`  | A sampling of prototypes and early designs
+ | `src/`         | The current official sources to the Cabal package
+ | `testing/`     | Tests, including a sample client.  See [`testing/README`](testing/README)
+ 
+ ### Development Notes
+ 
+ To build the library, change to the src directory and run
+ 
+     cabal configure --prefix=$HOME --user   # we have no idea what this means
+     cabal build
+     cabal install --enable-documentation
+ 
++To run the tests in the folder testing/, change to the src directory and run 
++
++    cabal configure --enable-tests
++    cabal test
++
+ You'll need a Haskell Platform, which should include appropriate
+ versions of Cabal and GHC.
+ 
+ ### Checklist for Making Releases
+ 
+ In order to facilitate GHC development's workflow, the version in [`hoopl.cabal`](hoopl.cabal) is to be bumped as soon as a change requires a respective version bump (according to the PVP) relative to the last released `hoopl` version.
+ 
+ 1. Make sure `hoopl` passes Travis for all GHC versions in the build-matrix
+ 2. Update Changelog (& `git commit`)
+ 3. Generate source tarball via `cabal sdist` and upload a candidate to Hackage (see note below), and inspect the result. 
+ 4. If everything checks out, make an annotated and GPG-signed Git release tag: `git tag -a -s v${VER} -m "hoopl ${VER}"`
+ 5. Publish (there's a button for that on Hackage) the package candidate
+ 6. Work on next release
+ 
+ Note: To upload to Hackage,
+ 
+     cabal sdist
+     cabal upload dist/hoopl-*.tar.gz
+ 
+ However, it's recommended use the Hackage feature for
+ [uploading a candidate](http://hackage.haskell.org/packages/candidates/upload).
diff --cc changelog.md
index 9718736,0182960..b8a6d5c
--- a/changelog.md
+++ b/changelog.md
@@@ -1,15 -1,8 +1,18 @@@
  # Changelog for [`hoopl` package](http://hackage.haskell.org/package/hoopl)
  
- ## 3.10.2.1 *Apr 2015*
++## 3.10.1.1 *Apr 2015*
++
 + - Add #if CABAL macro to several hoopl source files such that the Cabal generated macro is not included when building in ghci
++
 + - Change the test code (testing/*) to compare the converted graphs against the expected graphs in AST form 
++
 + - Update the cabal file to run tests and generate a test coverage report 
 + 
- ## 3.10.2.0 *Apr 2015*
++ - Unhide gSplice of Hoopl.Graph
 +
-  - Re-export runWithFuel from Compiler.Hoopl.
+ ## 3.10.1.0 *Apr 2015*
  
- ## 3.10.1.0  **TBA**
+  - Re-export runWithFuel from Compiler.Hoopl.
  
   - Remove redundant constraints
  
diff --cc src/Compiler/Hoopl.hs
index 27a81a2,7858f42..7a9cd89
--- a/src/Compiler/Hoopl.hs
+++ b/src/Compiler/Hoopl.hs
@@@ -29,7 -29,7 +29,7 @@@ import Compiler.Hoopl.Dataflow hiding 
  import Compiler.Hoopl.Debug
  import Compiler.Hoopl.Fuel hiding (withFuel, getFuel, setFuel)
  import Compiler.Hoopl.Block
- import Compiler.Hoopl.Graph hiding (splice{-, gSplice-})
 -import Compiler.Hoopl.Graph hiding (splice, gSplice)
++import Compiler.Hoopl.Graph hiding (splice)
  import Compiler.Hoopl.Label hiding (uniqueToLbl, lblToUnique)
  import Compiler.Hoopl.MkGraph
  import Compiler.Hoopl.Pointed