# We can't 'make boot' in libraries until stage1 is built
ifeq "$(BootingFromHc)" "YES"
-SUBDIRS_NOLIB = includes rts compat compiler docs utils driver
+SUBDIRS_BUILD = includes rts compat compiler docs utils driver
else
-SUBDIRS_NOLIB = includes compat utils driver docs compiler rts
+SUBDIRS_BUILD = includes compat utils driver docs compiler rts
endif
-SUBDIRS = $(SUBDIRS_NOLIB) libraries
+SUBDIRS_INSTALL = includes compat utils driver docs rts libraries compiler
# Sanity check that all the core libraries are in the tree, to catch
# failure to run darcs-all.
@for d in `cat libraries/core-packages`; do \
if test ! -d libraries/$$d; then \
echo "Looks like you're missing libraries/$$d,"; \
- echo "maybe you haven't done 'sh darcs-all get'?"; \
+ echo "maybe you haven't done './darcs-all get'?"; \
exit 1; \
fi \
done
+ @if test ! -e libraries/base/configure; then \
+ echo "Looks like you're missing base's configure script."; \
+ echo "Did you run 'sh boot' at the top level?"; \
+ exit 1; \
+ fi
stage1 : check-packages
$(MAKE) -C utils/mkdependC boot
@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
- for i in $(SUBDIRS_NOLIB); do \
+ for i in $(SUBDIRS_BUILD); do \
echo "------------------------------------------------------------------------"; \
echo "== $(MAKE) boot $(MFLAGS);"; \
echo " in $(shell pwd)/$$i"; \
$(MAKE) --no-print-directory -C $$i $(MFLAGS) boot; \
if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ; then true; else exit 1; fi; \
done; \
- for i in $(SUBDIRS_NOLIB); do \
+ for i in $(SUBDIRS_BUILD); do \
echo "------------------------------------------------------------------------"; \
echo "== $(MAKE) all $(MFLAGS);"; \
echo " in $(shell pwd)/$$i"; \
# Same as default rule, but we pass $(INSTALL_STAGE) to $(MAKE) too
install :: check-packages
+ $(INSTALL_DIR) $(bindir)
@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
- for i in $(SUBDIRS); do \
+ for i in $(SUBDIRS_INSTALL); do \
echo "------------------------------------------------------------------------"; \
echo "== $(MAKE) $@ $(MFLAGS);"; \
echo " in $(shell pwd)/$$i"; \
install-docs ::
@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
- for i in $(SUBDIRS); do \
+ for i in $(SUBDIRS_INSTALL); do \
echo "------------------------------------------------------------------------"; \
echo "== $(MAKE) $@ $(MFLAGS);"; \
echo " in $(shell pwd)/$$i"; \
# binary-dist is a GHC addition for binary distributions
#
-ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-BinDistShScripts = ghc-$(ProjectVersion) ghci-$(ProjectVersion) ghc-pkg-$(ProjectVersion) hsc2hs-ghc
-else
-BinDistShScripts =
-endif
+BIN_DIST_TARBALL=ghc-$(ProjectVersion)-$(TARGETPLATFORM).tar.bz2
-BinDistPrlScripts = ghcprof
-BinDistLibPrlScripts = ghc-asm ghc-split
-BinDistBins = hp2ps runghc
-BinDistLinks = ghc ghci ghc-pkg
-BinDistLibSplicedFiles = package.conf
-BinDistDirs = includes compiler docs driver rts utils
+binary-dist::
+ -rm -rf $(BIN_DIST_DIR)
+ -$(RM) $(BIN_DIST_DIR).tar.gz
-BIN_DIST_NAME=ghc-$(ProjectVersion)
-BIN_DIST_TOPDIR=$(FPTOOLS_TOP_ABS)
-BIN_DIST_DIR=$(BIN_DIST_TOPDIR)/$(BIN_DIST_NAME)
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-BIN_DIST_TARBALL=ghc-$(ProjectVersion)-$(TARGETPLATFORM).tar.bz2
+binary-dist::
+ $(MAKE) prefix=$(BIN_DIST_DIR) install
+
+binary-dist::
+ cd $(BIN_DIST_DIR) && ../distrib/prep-bin-dist-mingw
+
+else
+
+BinDistDirs = includes compiler docs rts
BIN_DIST_TOP= distrib/Makefile \
distrib/configure-bin.ac \
distrib/README \
ANNOUNCE \
LICENSE \
- utils/mkdirhier/mkdirhier \
install-sh \
config.guess \
config.sub \
.PHONY: binary-dist-pre% binary-dist binary-pack
-BINARY_DIST_PRE_RULES=$(foreach d,$(BinDistDirs),binary-dist-pre-$d)
-
-binary-dist:: binary-dist-pre $(BINARY_DIST_PRE_RULES)
+binary-dist:: binary-dist-pre
binary-dist-pre::
-ifeq "$(BIN_DIST)" ""
- @echo "WARNING: To run the binary-dist target, you need to set BIN_DIST=1 in mk/build.mk"
- @false
-endif
- -rm -rf $(BIN_DIST_DIR)
- -$(RM) $(BIN_DIST_DIR).tar.gz
- $(MKDIRHIER) $(BIN_DIST_DIR)/bin/$(TARGETPLATFORM)
+ $(MKDIRHIER) $(BIN_DIST_DIR)/mk
+ echo 'include $$(TOP)/Makefile-vars' > $(BIN_DIST_DIR)/mk/boilerplate.mk
+ echo 'include $$(TOP)/mk/install.mk' > $(BIN_DIST_DIR)/mk/target.mk
+ echo 'include $$(TOP)/mk/recurse.mk' >> $(BIN_DIST_DIR)/mk/target.mk
+ echo '' > $(BIN_DIST_DIR)/mk/compat.mk
+ cp mk/package.mk $(BIN_DIST_DIR)/mk/
+ cp mk/install.mk $(BIN_DIST_DIR)/mk/
+ cp mk/recurse.mk $(BIN_DIST_DIR)/mk/
$(MKDIRHIER) $(BIN_DIST_DIR)/lib/$(TARGETPLATFORM)
$(MKDIRHIER) $(BIN_DIST_DIR)/share
-$(BINARY_DIST_PRE_RULES): binary-dist-pre-%:
- $(MAKE) -C $* $(MFLAGS) $(INSTALL_STAGE) install \
- prefix=$(BIN_DIST_DIR) \
- exec_prefix=$(BIN_DIST_DIR) \
- bindir=$(BIN_DIST_DIR)/bin/$(TARGETPLATFORM) \
- libdir=$(BIN_DIST_DIR)/lib/$(TARGETPLATFORM) \
- libexecdir=$(BIN_DIST_DIR)/lib/$(TARGETPLATFORM) \
- datadir=$(BIN_DIST_DIR)/share
+binary-dist::
+ $(MAKE) -C includes binary-dist DOING_BIN_DIST=YES
+ $(MAKE) -C compiler binary-dist DOING_BIN_DIST=YES $(INSTALL_STAGE)
+ # XXX $(MAKE) -C docs binary-dist DOING_BIN_DIST=YES
+ $(MAKE) -C rts binary-dist DOING_BIN_DIST=YES
+ $(MAKE) -C driver binary-dist DOING_BIN_DIST=YES
+ $(MAKE) -C utils binary-dist DOING_BIN_DIST=YES
VARFILE=$(BIN_DIST_DIR)/Makefile-vars.in
echo > $(VARFILE)
echo "package = ghc" >> $(VARFILE)
echo "version = $(ProjectVersion)" >> $(VARFILE)
- echo "PACKAGE_SH_SCRIPTS = $(BinDistShScripts)" >> $(VARFILE)
- echo "PACKAGE_PRL_SCRIPTS = $(BinDistPrlScripts)" >> $(VARFILE)
- echo "PACKAGE_LIB_PRL_SCRIPTS = $(BinDistLibPrlScripts)" >> $(VARFILE)
- echo "PACKAGE_LIB_SPLICED_FILES = $(BinDistLibSplicedFiles)" >> $(VARFILE)
- echo "PACKAGE_BINS = $(BinDistBins)" >> $(VARFILE)
- echo "PACKAGE_OPT_BINS = $(BinDistOptBins)" >> $(VARFILE)
- echo "PACKAGE_LINKS = $(BinDistLinks)" >> $(VARFILE)
+ echo "ProjectVersion = $(ProjectVersion)" >> $(VARFILE)
+ echo "HaveLibGmp = $(HaveLibGmp)" >> $(VARFILE)
+ echo "GhcLibsWithUnix = $(GhcLibsWithUnix)" >> $(VARFILE)
+ echo "GhcWithInterpreter = $(GhcWithInterpreter)" >> $(VARFILE)
+ echo "GhcHasReadline = $(GhcHasReadline)" >> $(VARFILE)
+ echo "BootingFromHc = $(BootingFromHc)" >> $(VARFILE)
cat distrib/Makefile-bin-vars.in >> $(VARFILE)
@echo "Generating a shippable configure script.."
$(MV) $(BIN_DIST_DIR)/configure-bin.ac $(BIN_DIST_DIR)/configure.ac
- ( cd $(BIN_DIST_DIR); autoconf )
+ ( cd $(BIN_DIST_DIR); autoreconf )
+
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+binary-dist::
+ $(MKDIRHIER) $(BIN_DIST_DIR)/icons
+ cp distrib/hsicon.ico $(BIN_DIST_DIR)/icons
+endif
+
#
# binary dist'ing the documentation.
# The default documentation to build/install is given below; overrideable
# via build.mk or the 'make' command-line.
+#
+# If BINDIST_DOC_WAYS is set, use that
+# If XMLDocWays is set, use that
+# Otherwise, figure out what we can build based on configure results
ifndef BINDIST_DOC_WAYS
+ifneq "$(XMLDocWays)" ""
BINDIST_DOC_WAYS = $(XMLDocWays)
-
-# ifneq "$(XSLTPROC)" ""
-# BINDIST_DOC_WAYS = html
-# ifneq "$(FOP)" ""
-# BINDIST_DOC_WAYS += ps pdf
-# else
-# ifneq "$(PDFXMLTEX)" ""
-# BINDIST_DOC_WAYS += pdf
-# endif
-# ifneq "$(XMLTEX)" ""
-# ifneq "$(DVIPS)" ""
-# BINDIST_DOC_WAYS += ps
-# endif # DVIPS
-# endif # XMLTEX
-# endif # FOP
-# endif # XSLTPROC
+else
+ifneq "$(XSLTPROC)" ""
+BINDIST_DOC_WAYS = html
+ifneq "$(FOP)" ""
+BINDIST_DOC_WAYS += ps pdf
+else
+ifneq "$(PDFXMLTEX)" ""
+BINDIST_DOC_WAYS += pdf
+endif
+ifneq "$(XMLTEX)" ""
+ifneq "$(DVIPS)" ""
+BINDIST_DOC_WAYS += ps
+endif # DVIPS
+endif # XMLTEX
+endif # FOP
+endif # XSLTPROC
+endif # XMLDocWays
endif # BINDIST_DOC_WAYS
$(BINARY_DIST_DOC_RULES): binary-dist-doc-%:
$(MAKE) -C $* $(MFLAGS) $(BINDIST_DOC_WAYS)
$(MAKE) -C $* $(MFLAGS) install-docs \
+ MAKING_BIN_DIST=1 \
XMLDocWays="$(BINDIST_DOC_WAYS)" \
prefix=$(BIN_DIST_DIR) \
exec_prefix=$(BIN_DIST_DIR) \
datadir=$(BIN_DIST_DIR)/share
endif
-# Rename scripts to $i.prl and $i.sh where necessary.
-# ToDo: do this in a cleaner way...
-
-ifneq "$(BinDistPrlScripts)" ""
-binary-dist::
- @for i in $(BinDistPrlScripts); do \
- echo "Renaming $$i to $$i.prl"; \
- $(MV) $(BIN_DIST_DIR)/bin/$(TARGETPLATFORM)/$$i $(BIN_DIST_DIR)/bin/$(TARGETPLATFORM)/$$i.prl; \
- done
-endif
-
-ifneq "$(BinDistLibPrlScripts)" ""
-binary-dist::
- @for i in $(BinDistLibPrlScripts); do \
- echo "Renaming $$i to $$i.prl"; \
- $(MV) $(BIN_DIST_DIR)/lib/$(TARGETPLATFORM)/$$i $(BIN_DIST_DIR)/lib/$(TARGETPLATFORM)/$$i.prl; \
- done
-endif
+.PHONY: binary-dist-doc-%
-ifneq "$(BinDistShScripts)" ""
binary-dist::
- @for i in $(BinDistShScripts); do \
- if test -x $(BIN_DIST_DIR)/bin/$(TARGETPLATFORM)/$$i ; then \
- echo "Renaming $$i to $$i.sh"; \
- $(MV) $(BIN_DIST_DIR)/bin/$(TARGETPLATFORM)/$$i $(BIN_DIST_DIR)/bin/$(TARGETPLATFORM)/$$i.sh; \
- fi \
- done
-endif
+ $(MAKE) -C libraries binary-dist
-# Jiggle the files around to make a valid Windows distribution if necessary
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-binary-dist :: fiddle-binary-dist
endif
-fiddle-binary-dist:
- cd $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) && ../distrib/prep-bin-dist-mingw
-.PHONY: binary-dist-doc-%
-
-BIN_DIST_LIBDIR=$(BIN_DIST_DIR)/libraries
-
-LIBRARY_SUBDIRS=$(shell $(MAKE) -s -C libraries subdirs)
-
-BINARY_DIST_LIBRARY_RULES=$(foreach d,$(LIBRARY_SUBDIRS),binary-dist-lib-$d)
-
-binary-dist:: $(BINARY_DIST_LIBRARY_RULES)
- cp libraries/Makefile $(BIN_DIST_LIBDIR)
- cp libraries/gen_contents_index $(BIN_DIST_LIBDIR)
- cp libraries/index.html $(BIN_DIST_LIBDIR)
- cp libraries/doc-index.html $(BIN_DIST_LIBDIR)
- cp -a libraries/stamp $(BIN_DIST_LIBDIR)
-
-$(BINARY_DIST_LIBRARY_RULES): binary-dist-lib-%:
- $(MKDIRHIER) $(BIN_DIST_LIBDIR)/$*/setup
- cp libraries/$*/setup/Setup $(BIN_DIST_LIBDIR)/$*/setup
- cp libraries/$*/*.cabal $(BIN_DIST_LIBDIR)/$*
- cp -a libraries/$*/dist $(BIN_DIST_LIBDIR)/$*
- find $(BIN_DIST_LIBDIR)/$*/dist \
- \( \( -name "*.o" -o -name "*.p_o" \) -a \! -name "HS*" \) \
- -exec rm {} \;
-
# Tar up the distribution and build a manifest
binary-dist :: tar-binary-dist
+.PHONY: tar-binary-dist
tar-binary-dist:
( cd $(BIN_DIST_TOPDIR); tar cf - $(BIN_DIST_NAME) | bzip2 >$(BIN_DIST_TARBALL) )
( cd $(BIN_DIST_TOPDIR); bunzip2 -c $(BIN_DIST_TARBALL) | tar tf - | sed "s/^ghc-$(ProjectVersion)/fptools/" | sort >bin-manifest-$(ProjectVersion) )
+PUBLISH_FILES = $(BIN_DIST_TARBALL)
+
+# Upload the distribution and documentation
+ifneq "$(ISCC)" ""
+WINDOWS_INSTALLER_BASE = ghc-$(ProjectVersion)-$(TARGETPLATFORM)
+WINDOWS_INSTALLER = $(WINDOWS_INSTALLER)$(exeext)
+
+PUBLISH_FILES += $(WINDOWS_INSTALLER)
+
+binary-dist :: generate-windows-installer
+
+.PHONY: generate-windows-installer
+generate-windows-installer ::
+ $(SED) "s/@VERSION@/$(ProjectVersion)/" distrib/ghc.iss | $(ISCC) /O. /F$(WINDOWS_INSTALLER_BASE) -
+endif
+
# Upload the distribution and documentation
ifneq "$(PublishLocation)" ""
-binary-dist ::
- $(MAKE) publish-binary-dist
+binary-dist :: publish-binary-dist
endif
-publish-binary-dist :
- @for i in 0 1 2 3 4 5 6 7 8 9; do \
- echo "Try $$i: $(PublishCp) $(BIN_DIST_TARBALL) $(PublishLocation)"; \
- if $(PublishCp) $(BIN_DIST_TARBALL) $(PublishLocation); then break; fi\
+.PHONY: publish-binary-dist
+publish-binary-dist ::
+ @for f in $(PUBLISH_FILES); do \
+ for i in 0 1 2 3 4 5 6 7 8 9; do \
+ echo "Try $$i: $(PublishCp) $$f $(PublishLocation)/dist"; \
+ if $(PublishCp) $$f $(PublishLocation)/dist; then break; fi; \
+ done \
done
+
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+# On Windows, we cannot use absoluate pathnames to rsync, because they look
+# like remote pathnames ("c:/foo/bar"). Also, the docs reside in doc/
+# rather than share/, due to prep-bin-dist-mingw.
+publish-binary-dist ::
+ $(PublishCp) -r $(FPTOOLS_TOP)/$(BIN_DIST_NAME)/doc/html/* $(PublishLocation)/docs
+else
+publish-binary-dist ::
$(PublishCp) -r $(BIN_DIST_DIR)/share/html/* $(PublishLocation)/docs
endif
-
binary-dist::
@echo "Mechanical and super-natty! Inspect the result and *if* happy; freeze, sell and get some sleep!"
#
# Files to include in source distributions
#
-SRC_DIST_DIRS += mk docs distrib $(filter-out docs distrib,$(SUBDIRS))
+SRC_DIST_DIRS += mk docs distrib $(filter-out docs distrib,$(SUBDIRS_INSTALL))
SRC_DIST_FILES += \
configure.ac config.guess config.sub configure \
aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \
ifneq "$(PublishLocation)" ""
dist ::
@for i in 0 1 2 3 4 5 6 7 8 9; do \
- echo "Try $$i: $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)"; \
- if $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation); then break; fi\
+ echo "Try $$i: $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)/dist"; \
+ if $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)/dist; then break; fi\
done
@for i in 0 1 2 3 4 5 6 7 8 9; do \
- echo "Try $$i: $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)"; \
- if $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation); then break; fi\
+ echo "Try $$i: $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist"; \
+ if $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist; then break; fi\
done
endif
projects / ghc-hetmet.git / blobdiff