From 2c5aaf8ccade84756cc6cbb64ef79446f8567f66 Mon Sep 17 00:00:00 2001
From: Daniel Gröber <dxld@darkboxed.org>
Date: Thu, 5 May 2016 22:53:03 +0200
Subject: Build with Cabal HEAD as part of regular test suite

---
 cabal-helper.cabal | 55 +++++++++++++++++++++++++++++++-----------------------
 1 file changed, 32 insertions(+), 23 deletions(-)

(limited to 'cabal-helper.cabal')

diff --git a/cabal-helper.cabal b/cabal-helper.cabal
index 58bac7b..4d18a71 100644
--- a/cabal-helper.cabal
+++ b/cabal-helper.cabal
@@ -49,7 +49,7 @@ library
   default-language:    Haskell2010
   GHC-Options:         -Wall
   Build-Depends:       base >= 4.5 && < 5
-                     , Cabal >= 1.14 && < 1.25
+                     , Cabal >= 1.14 && < 1.26
                      , directory
                      , filepath
                      , transformers
@@ -73,7 +73,7 @@ Executable cabal-helper-wrapper
   X-Install-Target:    $libexecdir
   Build-Depends:       base >= 4.5 && < 5
                      , bytestring
-                     , Cabal >= 1.14 && < 1.25
+                     , Cabal >= 1.14 && < 1.26
                      , directory
                      , filepath
                      , process
@@ -83,22 +83,6 @@ Executable cabal-helper-wrapper
                      , utf8-string
                      , ghc-prim
 
-Executable cabal-helper-main
-  if flag(dev)
-    Buildable:         True
-  else
-    Buildable:         False
-  Default-Language:    Haskell98
-  Main-Is:             CabalHelper/Main.hs
-  Other-Modules:
-  GHC-Options:         -Wall -fno-warn-unused-imports -optP-DCABAL_MAJOR=1 -optP-DCABAL_MINOR=24 -optP-DCABAL_HELPER=1 -optP-DCABAL_HELPER_DEV=1
-  Build-Depends:       base
-                     , Cabal
-                     , containers
-                     , bytestring
-                     , filepath
-                     , directory
-
 Test-Suite spec
   Default-Language:    Haskell2010
   Type:                exitcode-stdio-1.0
@@ -118,7 +102,7 @@ Test-Suite spec
                      , cabal-helper
                      , extra
                      , unix
-                     , Cabal >= 1.14 && < 1.25
+                     , Cabal >= 1.14 && < 1.26
                      , directory
                      , filepath
                      , transformers
@@ -130,7 +114,32 @@ Test-Suite spec
                      , template-haskell
                      , temporary
 
-flag dev
-  description: Build development components
-  default:     False
-  manual:      True
\ No newline at end of file
+custom-setup
+  setup-depends: base,
+                 Cabal,
+                 filepath
+
+-- TODO: Use cabal_macros.h to replace -D flags by including it in
+-- CabalHelper.Data
+--
+-- Executable cabal-helper-main
+--   if flag(dev)
+--     Buildable:         True
+--   else
+--     Buildable:         False
+--   Default-Language:    Haskell2010
+--   Default-Extensions:  NondecreasingIndentation
+--   Main-Is:             CabalHelper/Main.hs
+--   Other-Modules:
+--   GHC-Options:         -Wall -fno-warn-unused-imports -optP-DCABAL_MAJOR=1 -optP-DCABAL_MINOR=25 -optP-DCABAL_HELPER=1 -optP-DCABAL_HELPER_DEV=1
+--   Build-Depends:       base
+--                      , Cabal
+--                      , containers
+--                      , bytestring
+--                      , filepath
+--                      , directory
+--
+-- flag dev
+--   description: Build development components
+--   default:     False
+--   manual:      True
-- 
cgit v1.2.3