[commit: ghc] master: Build system: cabalise deriveConstants + genprimopcode (314395e)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/314395e00be10e6343840c215a4779aeec2542df/ghc

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

commit 314395e00be10e6343840c215a4779aeec2542df
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Mon Oct 26 13:30:07 2015 +0100

    Build system: cabalise deriveConstants + genprimopcode
    
    This is needed for #10374 (but doesn't fix it yet).
    
    Also rename DeriveConstants.hs to Main.hs, because the build
    system has trouble with Main modules not called Main.hs.
    
    Differential Revision: https://phabricator.haskell.org/D1380


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

314395e00be10e6343840c215a4779aeec2542df
 utils/deriveConstants/{DeriveConstants.hs => Main.hs}     |  0
 .../deriveConstants.cabal}                                | 10 ++++------
 utils/deriveConstants/ghc.mk                              |  7 ++++---
 .../ghctags.cabal => genprimopcode/genprimopcode.cabal}   | 15 +++++++--------
 utils/genprimopcode/ghc.mk                                |  7 ++++---
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/utils/deriveConstants/DeriveConstants.hs b/utils/deriveConstants/Main.hs
similarity index 100%
rename from utils/deriveConstants/DeriveConstants.hs
rename to utils/deriveConstants/Main.hs
diff --git a/utils/dll-split/dll-split.cabal b/utils/deriveConstants/deriveConstants.cabal
similarity index 78%
copy from utils/dll-split/dll-split.cabal
copy to utils/deriveConstants/deriveConstants.cabal
index 290af06..72afb72 100644
--- a/utils/dll-split/dll-split.cabal
+++ b/utils/deriveConstants/deriveConstants.cabal
@@ -1,4 +1,4 @@
-Name: dll-split
+Name: deriveConstants
 Version: 0.1
 Copyright: XXX
 License: BSD3
@@ -6,17 +6,15 @@ License: BSD3
 Author: XXX
 Maintainer: XXX
 Synopsis: XXX
-Description:
-	XXX
+Description: XXX
 Category: Development
 build-type: Simple
 cabal-version: >=1.10
 
-Executable dll-split
+Executable deriveConstants
     Default-Language: Haskell2010
     Main-Is: Main.hs
-
     Build-Depends: base       >= 4   && < 5,
                    containers,
+                   process,
                    filepath
-
diff --git a/utils/deriveConstants/ghc.mk b/utils/deriveConstants/ghc.mk
index 968282e..e278999 100644
--- a/utils/deriveConstants/ghc.mk
+++ b/utils/deriveConstants/ghc.mk
@@ -10,10 +10,11 @@
 #
 # -----------------------------------------------------------------------------
 
-utils/deriveConstants_dist_MODULES = DeriveConstants
-utils/deriveConstants_dist_PROGNAME = deriveConstants
+utils/deriveConstants_USES_CABAL           = YES
+utils/deriveConstants_PACKAGE              = deriveConstants
+utils/deriveConstants_dist_PROGNAME        = deriveConstants
+utils/deriveConstants_dist_INSTALL         = NO
 utils/deriveConstants_dist_INSTALL_INPLACE = YES
-utils/deriveConstants_HC_OPTS += -package process -package containers
 
 $(eval $(call build-prog,utils/deriveConstants,dist,0))
 
diff --git a/utils/ghctags/ghctags.cabal b/utils/genprimopcode/genprimopcode.cabal
similarity index 62%
copy from utils/ghctags/ghctags.cabal
copy to utils/genprimopcode/genprimopcode.cabal
index 7901aa2..adc5230 100644
--- a/utils/ghctags/ghctags.cabal
+++ b/utils/genprimopcode/genprimopcode.cabal
@@ -1,4 +1,4 @@
-Name: ghctags
+Name: genprimopcode
 Version: 0.1
 Copyright: XXX
 License: BSD3
@@ -11,13 +11,12 @@ Category: Development
 build-type: Simple
 cabal-version: >=1.10
 
-Executable ghctags
+Executable genprimopcode
     Default-Language: Haskell2010
-
     Main-Is: Main.hs
-
+    Other-Modules: Lexer
+                   Parser
+                   ParserM
+                   Syntax
     Build-Depends: base       >= 4   && < 5,
-                   containers,
-                   Cabal      >= 1.22 && <1.24,
-                   ghc
-
+                   array
diff --git a/utils/genprimopcode/ghc.mk b/utils/genprimopcode/ghc.mk
index 4b9ebef..790c75d 100644
--- a/utils/genprimopcode/ghc.mk
+++ b/utils/genprimopcode/ghc.mk
@@ -10,9 +10,10 @@
 #
 # -----------------------------------------------------------------------------
 
-utils/genprimopcode_dist_MODULES = Lexer Main ParserM Parser Syntax
-utils/genprimopcode_dist_PROGNAME = genprimopcode
-utils/genprimopcode_dist_HC_OPTS = -package array
+utils/genprimopcode_USES_CABAL           = YES
+utils/genprimopcode_PACKAGE              = genprimopcode
+utils/genprimopcode_dist_PROGNAME        = genprimopcode
+utils/genprimopcode_dist_INSTALL         = NO
 utils/genprimopcode_dist_INSTALL_INPLACE = YES
 
 $(eval $(call build-prog,utils/genprimopcode,dist,0))