Build hsc2hs with Cabal
authorIan Lynagh <igloo@earth.li>
Sat, 5 Jul 2008 13:42:08 +0000 (13:42 +0000)
committerIan Lynagh <igloo@earth.li>
Sat, 5 Jul 2008 13:42:08 +0000 (13:42 +0000)
This is very rough around teh edges at the moment.

libraries/Makefile
mk/cabal-flags.mk [new file with mode: 0644]
mk/config.mk.in
utils/hsc2hs/Main.hs
utils/hsc2hs/Makefile
utils/hsc2hs/hsc2hs.cabal

index f90cc71..8f2c927 100644 (file)
@@ -37,6 +37,7 @@ show:
 # for paths and arguments to tools etc, and those set in mk/build.mk.
 TOP=..
 include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/cabal-flags.mk
 
 SUBDIRS  = ghc-prim $(INTEGER_LIBRARY) base array packedstring
 SUBDIRS += containers bytestring old-locale old-time filepath directory
@@ -145,22 +146,6 @@ CONFIGURE_OPTS += --enable-split-objs
 CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting
 endif
 
-ifneq "$(HSCOLOUR)" ""
-CONFIGURE_OPTS += --with-hscolour=$(HSCOLOUR)
-endif
-
-ifneq "$(ALEX)" ""
-CONFIGURE_OPTS += --with-alex=$(ALEX)
-endif
-
-ifneq "$(HADDOCK)" ""
-CONFIGURE_OPTS += --with-haddock=$(HADDOCK)
-endif
-
-ifneq "$(HAPPY)" ""
-CONFIGURE_OPTS += --with-happy=$(HAPPY)
-endif
-
 DEPLOYMENT_OPTS = $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS)) \
                   $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
 
@@ -250,15 +235,6 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \
 # We should depend on %/%.cabal here (and in other rules), but make
 # makes that difficult.
 
-# We put non-existant paths in when configuring, as we require that
-# builds don't depend on these paths when making bindists.
-
-# We rely on all the CONFIGURE_ARGS being quoted with '...', and there
-# being no 's inside the values.
-FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\
-                                 $(space)--configure-option=',\
-                                 $(space)$(CONFIGURE_ARGS))
-
 ifeq "$(Windows)" "YES"
 NONEXISTENT=c:/NONEXISTENT
 else
@@ -266,24 +242,10 @@ NONEXISTENT=/NONEXISTENT
 endif
 
 ALL_CONFIGURE_FLAGS = \
-                  $(CONFIGURE_OPTS) \
-                  --prefix=$(NONEXISTENT) \
-                  --bindir=$(NONEXISTENT) \
-                  --libdir=$(NONEXISTENT) \
-                  --libsubdir='$$pkgid' \
-                  --libexecdir=$(NONEXISTENT) \
-                  --datadir=$(NONEXISTENT) \
-                  --docdir=$(NONEXISTENT) \
-                          --haddockdir=$(NONEXISTENT) \
-                  --htmldir=$(NONEXISTENT) \
-                  --with-compiler=$(FPTOOLS_TOP_ABS)/compiler/stage1/ghc-inplace \
-                  --with-hc-pkg=$(FPTOOLS_TOP_ABS)/utils/ghc-pkg/ghc-pkg-inplace \
-                  --with-hsc2hs=$(FPTOOLS_TOP_ABS)/utils/hsc2hs/hsc2hs-inplace \
-                  --with-ld=$(LD) \
+               $(INSTALL_CONFIGURE_FLAGS) \
                   --haddock-options="--use-contents=../index.html \
                                      --use-index=../doc-index.html" \
-                  $(FLAGGED_CONFIGURE_ARGS) \
-                  --configure-option=--with-cc=$(CC)
+                  $(CONFIGURE_OPTS)
 
 $(foreach SUBDIR,$(SUBDIRS), \
                  stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \
@@ -329,7 +291,7 @@ build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
                  cabal-bin ifBuildable/ifBuildable
        if $(IFBUILDABLE) $*; then \
          cd $* && \
-         $(CABAL) build $(addprefix --ghc-option=,$(GhcLibHcOpts)); \
+         $(CABAL) build $(BUILD_FLAGS); \
          $(CABAL) register --inplace; \
        fi
 
diff --git a/mk/cabal-flags.mk b/mk/cabal-flags.mk
new file mode 100644 (file)
index 0000000..1d63e1a
--- /dev/null
@@ -0,0 +1,68 @@
+
+nothing=
+space=$(nothing) $(nothing)
+
+# We rely on all the CONFIGURE_ARGS being quoted with '...', and there
+# being no 's inside the values.
+FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\
+                                 $(space)--configure-option=',\
+                                 $(space)$(CONFIGURE_ARGS))
+
+COMMON_CONFIGURE_FLAGS = \
+    --libsubdir='$$pkgid' \
+    --with-ld=$(LD) \
+    $(addprefix --hsc2hs-option=,$(SRC_HSC2HS_OPTS))
+
+ifneq "$(HSCOLOUR)" ""
+COMMON_CONFIGURE_FLAGS += --with-hscolour=$(HSCOLOUR)
+endif
+
+ifneq "$(ALEX)" ""
+COMMON_CONFIGURE_FLAGS += --with-alex=$(ALEX)
+endif
+
+ifneq "$(HADDOCK)" ""
+COMMON_CONFIGURE_FLAGS += --with-haddock=$(HADDOCK)
+endif
+
+ifneq "$(HAPPY)" ""
+COMMON_CONFIGURE_FLAGS += --with-happy=$(HAPPY)
+endif
+
+COMMON_CONFIGURE_FLAGS += $(FLAGGED_CONFIGURE_ARGS) \
+                          --configure-option=--with-cc=$(CC)
+
+# We put non-existant paths in when configuring things that we plan to
+# install, as we require that builds don't depend on these paths when
+# making bindists.
+INSTALL_CONFIGURE_FLAGS = \
+    --prefix=$(NONEXISTENT) \
+    --bindir=$(NONEXISTENT) \
+    --libdir=$(NONEXISTENT) \
+    --libexecdir=$(NONEXISTENT) \
+    --datadir=$(NONEXISTENT) \
+    --docdir=$(NONEXISTENT) \
+    --haddockdir=$(NONEXISTENT) \
+    --htmldir=$(NONEXISTENT) \
+    --with-compiler=$(FPTOOLS_TOP_ABS)/compiler/stage1/ghc-inplace \
+    --with-hc-pkg=$(FPTOOLS_TOP_ABS)/utils/ghc-pkg/ghc-pkg-inplace \
+    --with-hsc2hs=$(HSC2HS_INPLACE) \
+    $(COMMON_CONFIGURE_FLAGS)
+
+INPLACE_CONFIGURE_FLAGS = \
+    --prefix=`$(TOP)/utils/pwd/pwd forwardslash`/install-inplace \
+    --with-compiler=$(GHC) \
+    --with-hc-pkg=$(GHC_PKG) \
+    $(COMMON_CONFIGURE_FLAGS)
+
+# XXX
+#    --bindir='$$prefix/bin' \
+#    --libdir='$$prefix/lib' \
+#    --libexecdir='$$prefix/libexec' \
+#    --datadir='$$prefix/data' \
+#    --docdir='$$prefix/doc' \
+#    --haddockdir='$$prefix/haddock' \
+#    --htmldir='$$prefix/html' \
+
+BUILD_FLAGS = $(addprefix --ghc-option=,$(SRC_HC_OPTS))
+
index 3749b3e..8afeb1e 100644 (file)
@@ -764,7 +764,7 @@ GHC_UNLIT_DIR       = $(FPTOOLS_TOP)/$(GHC_UNLIT_DIR_REL)
 GHC_HP2PS_DIR          = $(FPTOOLS_TOP)/$(GHC_HP2PS_DIR_REL)
 GHC_HSTAGS_DIR         = $(FPTOOLS_TOP)/$(GHC_HSTAGS_DIR_REL)
 GHC_GHCTAGS_DIR                = $(FPTOOLS_TOP)/$(GHC_GHCTAGS_DIR_REL)
-GHC_HSC2HS_DIR         = $(FPTOOLS_TOP)/$(GHC_HSC2HS_DIR_REL)
+GHC_HSC2HS_DIR         = $(FPTOOLS_TOP_ABS)/$(GHC_HSC2HS_DIR_REL)
 GHC_TOUCHY_DIR         = $(FPTOOLS_TOP)/$(GHC_TOUCHY_DIR_REL)
 GHC_PKG_DIR            = $(FPTOOLS_TOP)/$(GHC_PKG_DIR_REL)
 GHC_GENPRIMOP_DIR      = $(FPTOOLS_TOP)/$(GHC_GENPRIMOP_DIR_REL)
@@ -812,7 +812,7 @@ GHC_UNLIT_PGM               = unlit$(exeext)
 GHC_HP2PS_PGM          = hp2ps
 GHC_HSTAGS_PGM         = hasktags
 GHC_GHCTAGS_INPLACE_PGM        = ghctags-inplace
-GHC_HSC2HS_INPLACE_PGM = hsc2hs-inplace
+GHC_HSC2HS_INPLACE_PGM = hsc2hs
 GHC_TOUCHY_PGM         = touchy$(exeext)
 GHC_MANGLER_PGM                = ghc-asm
 GHC_SPLIT_PGM          = ghc-split
@@ -838,7 +838,7 @@ UNLIT                       = $(GHC_UNLIT_DIR)/$(GHC_UNLIT_PGM)
 HP2PS                  = $(GHC_HP2PS_DIR)/$(GHC_HP2PS_PGM)
 HSTAGS                 = $(GHC_HSTAGS_DIR)/$(GHC_HSTAGS_PGM)
 GHCTAGS_INPLACE                = $(GHC_GHCTAGS_DIR)/$(GHC_GHCTAGS_INPLACE_PGM)
-HSC2HS_INPLACE         = $(GHC_HSC2HS_DIR)/$(GHC_HSC2HS_INPLACE_PGM)
+HSC2HS_INPLACE         = $(GHC_HSC2HS_DIR)/install-inplace/bin/$(GHC_HSC2HS_INPLACE_PGM)
 MANGLER                        = $(GHC_MANGLER_DIR)/$(GHC_MANGLER_PGM)
 SPLIT                  = $(GHC_SPLIT_DIR)/$(GHC_SPLIT_PGM)
 SYSMAN                         = $(GHC_SYSMAN_DIR)/$(GHC_SYSMAN_PGM)
@@ -963,6 +963,22 @@ ifeq "$(TARGETPLATFORM)" "ia64-unknown-linux"
 SRC_CC_OPTS += -G0
 endif
 
+SRC_HSC2HS_OPTS += $(addprefix --cflag=,$(filter-out -O,$(SRC_CC_OPTS)))
+SRC_HSC2HS_OPTS += --cc=$(CC)
+SRC_HSC2HS_OPTS += --ld=$(CC)
+SRC_HSC2HS_OPTS += --cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt)
+SRC_HSC2HS_OPTS += --lflag=-no-link-haskell98
+SRC_HSC2HS_OPTS += -I$(GHC_INCLUDE_DIR_ABS)
+SRC_HSC2HS_OPTS += -I$(FPTOOLS_TOP_ABS)/gmp/gmpbuild
+
+# Given
+#   foo bar
+# make
+#   :\"-Ifoo\":\"-Ibar\"
+nothing=
+space=$(nothing) $(nothing)
+SRC_HSC2HS_OPTS += $(subst $(space),,$(foreach d,$(GMP_INCLUDE_DIRS),:\"-I$(d)\"))
+
 #-----------------------------------------------------------------------------
 # GMP Library (version 2.0.x or above)
 #
index e541e21..b291fd2 100644 (file)
@@ -579,8 +579,7 @@ output flags name toks = do
 
     linker <- case [l | Linker l <- flags] of
         []  -> locateGhc compiler
-        [l] -> return l
-        _   -> onlyOne "linker"
+        ls  -> return (last ls)
 
     writeFile cProgName $
         concatMap outFlagHeaderCProg flags++
index 7763183..4604171 100644 (file)
-# -----------------------------------------------------------------------------
-# To compile with nhc98 on unix:
-#     nhc98 -cpp -package base -o hsc2hs-bin Main.hs
 
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/cabal-flags.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
-
-ifeq "$(ghc_ge_605)" "NO"
-SRC_HC_OPTS += -cpp
-endif
-
-# This causes libghccompat.a to be used:
-include $(GHC_COMPAT_DIR)/compat.mk
-
-# This is required because libghccompat.a must be built with
-# $(GhcHcOpts) because it is linked to the compiler, and hence
-# we must also build with $(GhcHcOpts) here:
-SRC_HC_OPTS += $(GhcHcOpts) $(GhcStage1HcOpts)
-
-# 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           = hsc2hs.bin
-else
-HS_PROG           = hsc2hs-inplace.bin
-endif
-
-ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
-HS_PROG           = hsc2hs$(exeext)
-endif
-ifeq "$(HOSTPLATFORM)" "i386-unknown-cygwinw32"
-HS_PROG           = hsc2hs$(exeext)
-endif
-
-# Note: Somehow we should pass $(exeext) here, but the history of changes used
-# for calling the C preprocessor via GHC has changed a few times, making a
-# clean solution impossible. So we revert to a hack in Main.hs...
 SRC_HC_OPTS      += -Wall
 
-# -----------------------------------------------------------------------------
-# hsc2hs script
-
-INPLACE_HS=hsc2hs-inplace.hs
-INPLACE_PROG=hsc2hs-inplace
-EXCLUDED_SRCS+=$(INPLACE_HS)
+CABAL = $(FPTOOLS_TOP_ABS)/libraries/cabal-bin \
+            $(GHC) $(FPTOOLS_TOP_ABS)/libraries/bootstrapping.conf
 
 ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
-extra_flags=$(addprefix --cflag=,$(filter-out -O,$(SRC_CC_OPTS)))
+INSTALL_FLAGS =
 else
-extra_flags=
+INSTALL_FLAGS = --enable-shell-wrappers
 endif
 
-nothing=
-space=$(nothing) $(nothing)
-# Given
-#   foo bar
-# make
-#   :\"-Ifoo\":\"-Ibar\"
-GMP_INCLUDE_DIRS_STRINGS = $(subst $(space),,$(foreach d,$(GMP_INCLUDE_DIRS),:\"-I$(d)\"))
-
-$(INPLACE_HS): Makefile $(FPTOOLS_TOP)/mk/config.mk
-       echo "import System.Cmd; import System.Environment; import System.Exit" > $@
-       echo "main = do args <- getArgs; rawSystem \"$(FPTOOLS_TOP_ABS)/$(GHC_HSC2HS_DIR_REL)/$(HS_PROG)\" (\"--template=$(FPTOOLS_TOP_ABS)/$(GHC_HSC2HS_DIR_REL)/template-hsc.h\":\"--cc=$(CC)\":\"--ld=$(CC)\"$(patsubst %,:\"%\",$(extra_flags)):\"--cflag=-D__GLASGOW_HASKELL__=$(ProjectVersionInt)\":\"-I$(FPTOOLS_TOP_ABS)/$(GHC_INCLUDE_DIR_REL)\":\"-I$(FPTOOLS_TOP_ABS)/gmp/gmpbuild\"$(GMP_INCLUDE_DIRS_STRINGS):args) >>= exitWith" >> $@
-
-$(INPLACE_PROG): $(INPLACE_HS)
-       $(HC) --make $< -o $@
-
-all :: $(INPLACE_PROG)
-
-CLEAN_FILES += $(INPLACE_HS) $(INPLACE_PROG)
-
-ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
-INSTALL_PROGS    += $(HS_PROG)
-else
-INSTALL_LIBEXECS += $(HS_PROG)
-LINK = hsc2hs-ghc
-LINK_TARGET = $(LINK)-$(ProjectVersion)
-INSTALLED_SCRIPT=$(DESTDIR)$(bindir)/$(LINK_TARGET)
-install::
-       $(RM) -f $(INSTALLED_SCRIPT)
-       echo "#!$(SHELL)"                  >> $(INSTALLED_SCRIPT)
-       echo "HSC2HS_BINDIR=$(libexecdir)" >> $(INSTALLED_SCRIPT)
-       echo "HSC2HS_DIR=$(libdir)"        >> $(INSTALLED_SCRIPT)
-       echo "HS_PROG=$(HS_PROG)"          >> $(INSTALLED_SCRIPT)
-       echo "HSC2HS_EXTRA="               >> $(INSTALLED_SCRIPT)
-       cat hsc2hs.sh                      >> $(INSTALLED_SCRIPT)
-       $(EXECUTABLE_FILE) $(INSTALLED_SCRIPT)
+boot:
+       $(CABAL) configure --distpref dist-inplace $(INPLACE_CONFIGURE_FLAGS)
+       $(CABAL) build     --distpref dist-inplace $(BUILD_FLAGS)
+       $(CABAL) install   --distpref dist-inplace $(INSTALL_FLAGS)
 
 ifneq "$(NO_INSTALL_HSC2HS)" "YES"
-install::
-       $(CP) $(INSTALLED_SCRIPT) $(DESTDIR)/$(bindir)/hsc2hs
-endif
+# XXX
+#all:
+#      $(CABAL) configure --distpref dist-install $(INSTALL_CONFIGURE_FLAGS)
+#      $(CABAL) build     --distpref dist-install $(BUILD_FLAGS)
 endif
 
-# hsc2hs-inplace is needed to 'make boot' in compiler.
-# Do a recursive 'make all' after generating dependencies, because this
-# will work with 'make -j'.
-ifneq "$(BootingFromHc)" "YES"
-boot :: depend
-       $(MAKE) all
-endif
+all:
 
-# -----------------------------------------------------------------------------
+clean: distclean
 
-override datadir=$(libdir)
-INSTALL_DATAS += template-hsc.h
+distclean:
+       -$(CABAL) clean --distpref dist-inplace
+       -$(CABAL) clean --distpref dist-install
 
-binary-dist:
-       $(INSTALL_DIR)                      $(BIN_DIST_DIR)/utils/hsc2hs
-       $(INSTALL_DATA)    Makefile         $(BIN_DIST_DIR)/utils/hsc2hs/
-       $(INSTALL_DATA)    hsc2hs.sh        $(BIN_DIST_DIR)/utils/hsc2hs/
-       $(INSTALL_DATA)    $(INSTALL_DATAS) $(BIN_DIST_DIR)/utils/hsc2hs/
-       $(INSTALL_PROGRAM) $(HS_PROG)       $(BIN_DIST_DIR)/utils/hsc2hs/
+# XXX fix:
+#binary-dist:
+#      $(INSTALL_DIR)                      $(BIN_DIST_DIR)/utils/hsc2hs
+#      $(INSTALL_DATA)    Makefile         $(BIN_DIST_DIR)/utils/hsc2hs/
+#      $(INSTALL_DATA)    hsc2hs.sh        $(BIN_DIST_DIR)/utils/hsc2hs/
+#      $(INSTALL_DATA)    $(INSTALL_DATAS) $(BIN_DIST_DIR)/utils/hsc2hs/
+#      $(INSTALL_PROGRAM) $(HS_PROG)       $(BIN_DIST_DIR)/utils/hsc2hs/
 
-include $(TOP)/mk/target.mk
index ec7f808..1e84ff3 100644 (file)
@@ -20,9 +20,23 @@ Description:
        http://www.haskell.org/ghc/docs/latest/html/users_guide/hsc2hs.html
 Category: Development
 Data-Files: template-hsc.h
+build-type: Simple
+cabal-version: >=1.2
+
+Flag base3
+  Description: Choose the new smaller, split-up base package.
+
+Executable hsc2hs
+    Main-Is: Main.hs
+    -- needed for ReadP (used by Data.Version)
+    Hugs-Options: -98
+    Extensions: CPP, ForeignFunctionInterface
+    if flag(base3)
+        Build-Depends: base       >= 3   && < 4,
+                       directory  >= 1   && < 1.1,
+                       process    >= 1   && < 1.1,
+                       haskell98
+    else
+        Build-Depends: base < 3,
+                       haskell98
 
-Executable: hsc2hs
-Main-Is: Main.hs
--- needed for ReadP (used by Data.Version)
-Hugs-Options: -98
-Extensions: CPP, ForeignFunctionInterface