Build hpc with Cabal

diff --git a/utils/Makefile b/utils/Makefile
index ea6f904..30bbea1 100644 (file)
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -3,13 +3,13 @@ include $(TOP)/mk/boilerplate.mk
 
 ifeq "$(DOING_BIN_DIST)" "YES"
 # We're doing a binary-dist, descend into a subset of the dirs.
-SUBDIRS = mkdirhier hp2ps parallel unlit hpc pwd
+SUBDIRS = mkdirhier hp2ps parallel unlit pwd
 else
 ifeq "$(BootingFromHc)" "YES"
 SUBDIRS = mkdependC mkdirhier runstdtest genapply genprimopcode unlit
 else
 SUBDIRS = mkdependC mkdirhier runstdtest hp2ps \
-         parallel unlit genprimopcode genapply hpc pwd
+         parallel unlit genprimopcode genapply pwd
 endif
 ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 # lndir doesn't build on Windows
@@ -53,9 +53,9 @@ boot ::
        $(MAKE) -C genprimopcode
 endif
 
-WITH_BOOTSTRAPPING_COMPILER = installPackage ghc-pkg hsc2hs
+WITH_BOOTSTRAPPING_COMPILER = installPackage ghc-pkg hsc2hs hpc
 
-WITH_STAGE1 = installPackage ghc-pkg hasktags runghc
+WITH_STAGE1 = installPackage ghc-pkg hasktags runghc hpc
 ifneq "$(NO_INSTALL_HSC2HS)" "YES"
 WITH_STAGE1 += hsc2hs
 endif

diff --git a/utils/hpc/Makefile b/utils/hpc/Makefile
index ac1bf22..0f34de9 100644 (file)
--- a/utils/hpc/Makefile
+++ b/utils/hpc/Makefile
@@ -1,34 +1,5 @@
+
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/cabal.mk
 
-# Beyond stage 1, honour any Mac OS X depolyment target options.  If we use 
-# these options in stage 1 we get a linker error if the bootstrap compiler is
-#  for a more recent OS version
-ifeq "$(stage)" "2"
-SRC_CC_OPTS += $(MACOSX_DEPLOYMENT_CC_OPTS)
-SRC_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
-SRC_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
-endif
-
-# We have two version: the inplace version compiled by the bootstrap compiler
-#   and the install version compiled by the stage 1 compiler
-ifeq "$(stage)" "2"
-HS_PROG                = hpc$(exeext)
-else
-HS_PROG                = hpc-inplace$(exeext)
-endif
-INSTALL_PROGS  += $(HS_PROG)
-HPC_LIB         = $(TOP)/libraries/hpc
-
-SRC_HC_OPTS += -package hpc -cpp 
-
-ifeq "$(ghc_ge_607)" "YES"
-SRC_HC_OPTS += -package containers
-endif
-
-binary-dist:
-       $(INSTALL_DIR)                $(BIN_DIST_DIR)/utils/hpc
-       $(INSTALL_DATA)    Makefile   $(BIN_DIST_DIR)/utils/hpc/
-       $(INSTALL_PROGRAM) $(HS_PROG) $(BIN_DIST_DIR)/utils/hpc/
-
-include $(TOP)/mk/target.mk

diff --git a/utils/hpc/hpc-bin.cabal b/utils/hpc/hpc-bin.cabal
new file mode 100644 (file)
index 0000000..f980e4d
--- /dev/null
+++ b/utils/hpc/hpc-bin.cabal
@@ -0,0 +1,30 @@
+Name: hpc-bin
+-- XXX version number:
+Version: 0.67
+Copyright: XXX
+License: BSD3
+-- XXX License-File: LICENSE
+Author: XXX
+Maintainer: XXX
+Synopsis: XXX
+Description:
+       XXX
+Category: Development
+build-type: Simple
+cabal-version: >=1.2
+
+Flag base3
+    Description: Choose the new smaller, split-up base package.
+
+Executable hpc
+    Main-Is: Hpc.hs
+    if flag(base3)
+        Build-Depends: base       >= 3   && < 4,
+                       directory  >= 1   && < 1.1,
+                       containers >= 0.1 && < 0.2,
+                       array      >= 0.1 && < 0.2
+    else
+        Build-Depends: base < 3
+    Build-Depends: haskell98, hpc
+    Extensions: CPP
+