diff options
| author | Daniel Gröber <dxld@darkboxed.org> | 2015-03-12 12:25:05 +0100 |
|---|---|---|
| committer | Daniel Gröber <dxld@darkboxed.org> | 2015-03-12 12:25:05 +0100 |
| commit | 9097e9abbb4deee4fa740142b27a7696f2647861 (patch) | |
| tree | ac3b82b68e5bb923c2ef92b19dded0d7ab977138 | |
| parent | fb614e639314abe3bf3cf93667708ac6d0749644 (diff) | |
A bunch of fixes
| -rw-r--r-- | .travis.yml | 6 | ||||
| -rw-r--r-- | Distribution/Helper.hs | 5 | ||||
| -rw-r--r-- | cabal-helper.cabal | 12 |
3 files changed, 19 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index d3fc908..63fa1e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,12 @@ install: script: - touch ChangeLog # Create ChangeLog if we're not on the release branch - cabal check + + - cabal sdist + - export SRC_TGZ="$PWD/dist/$(cabal info . | awk '{print $2 ".tar.gz";exit}')" + - rm -rf /tmp/cabal-helper* && cd /tmp + - tar -xf $SRC_TGZ && cd cabal-helper*/ + - if [ -n "$(ghc --version | awk '{ print $8 }' | sed -n '/^7.8/p')" ]; then export WERROR="--ghc-option=-Werror"; fi - cabal configure --enable-tests $WERROR - cabal build diff --git a/Distribution/Helper.hs b/Distribution/Helper.hs index a57ea93..e97d656 100644 --- a/Distribution/Helper.hs +++ b/Distribution/Helper.hs @@ -32,6 +32,11 @@ module Distribution.Helper ( , ghcSrcOptions , ghcPkgOptions + -- * Result types + , ChModuleName(..) + , ChComponentName(..) + , ChEntrypoint(..) + -- * Managing @dist/@ , reconfigure , writeAutogenFiles diff --git a/cabal-helper.cabal b/cabal-helper.cabal index 77fc078..fdb985e 100644 --- a/cabal-helper.cabal +++ b/cabal-helper.cabal @@ -1,5 +1,5 @@ name: cabal-helper -version: 0.1.0.0 +version: 0.2.0.0 synopsis: Simple interface to Cabal's configuration state used by ghc-mod description: @cabal-helper@ provides a library which wraps the internal use of executables @@ -9,8 +9,8 @@ description: @cabal-helper@ uses a wrapper executable to compile the actual cabal-helper executable at runtime while linking against an arbitrary version of Cabal. This runtime-compiled helper executable is then used to extract - various bits and peices from Cabal on disk state (dist/setup-config) written - by it's configure command. + various bits and peices from Cabal\'s on disk state (dist/setup-config) + written by it's configure command. In addition to this the wrapper executable also supports installing any version of Cabal from hackage in case it cannot be found in any available @@ -31,6 +31,7 @@ maintainer: dxld@darkboxed.org category: Distribution build-type: Simple cabal-version: >=1.10 +extra-source-files: CabalHelper/Main.hs source-repository head type: git @@ -48,12 +49,15 @@ library , mtl , process - Executable cabal-helper-wrapper Default-Language: Haskell2010 Other-Extensions: TemplateHaskell Main-Is: CabalHelper/Wrapper.hs Other-Modules: Paths_cabal_helper + CabalHelper.Types + CabalHelper.Common + CabalHelper.GuessGhc + CabalHelper.Data GHC-Options: -Wall X-Install-Target: $libexecdir Build-Depends: base >= 4.5 && < 5 |