X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=Makefile;h=5bce2e64e970933c57f23d81c9f072422e0299b4;hp=98efc8be08293477df4d7d3ccdfbd6ccb48587df;hb=9bbcd77cf9b66940058dbea1827db594e8ff6d7f;hpb=80a290e38a1d53f8db2120dc40f362e5e4498ce6 diff --git a/Makefile b/Makefile index 98efc8b..5bce2e6 100644 --- a/Makefile +++ b/Makefile @@ -72,10 +72,15 @@ check-packages : @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 @@ -216,25 +221,21 @@ BinDistLibPrlScripts = ghc-asm ghc-split BinDistBins = hp2ps runghc BinDistLinks = ghc ghci ghc-pkg BinDistLibSplicedFiles = package.conf -BinDistDirs = includes compiler docs driver libraries rts utils - -BIN_DIST_NAME=ghc-$(ProjectVersion) -BIN_DIST_TOPDIR=$(FPTOOLS_TOP_ABS) -BIN_DIST_DIR=$(BIN_DIST_TOPDIR)/$(BIN_DIST_NAME) +BinDistDirs = includes compiler docs driver rts utils BIN_DIST_TARBALL=ghc-$(ProjectVersion)-$(TARGETPLATFORM).tar.bz2 -BIN_DIST_TOP= distrib/Makefile-bin.in \ - distrib/configure-bin.ac \ - distrib/INSTALL \ - distrib/README \ - ANNOUNCE \ - LICENSE \ - utils/mkdirhier/mkdirhier \ - install-sh \ - config.guess \ - config.sub \ - aclocal.m4 +BIN_DIST_TOP= distrib/Makefile \ + distrib/configure-bin.ac \ + distrib/INSTALL \ + distrib/README \ + ANNOUNCE \ + LICENSE \ + utils/mkdirhier/mkdirhier \ + install-sh \ + config.guess \ + config.sub \ + aclocal.m4 ifeq "$(darwin_TARGET_OS)" "1" BIN_DIST_TOP+=mk/fix_install_names.sh @@ -266,6 +267,8 @@ $(BINARY_DIST_PRE_RULES): binary-dist-pre-%: libexecdir=$(BIN_DIST_DIR)/lib/$(TARGETPLATFORM) \ datadir=$(BIN_DIST_DIR)/share +VARFILE=$(BIN_DIST_DIR)/Makefile-vars.in + binary-dist:: @for i in $(BIN_DIST_TOP); do \ if test -f "$$i"; then \ @@ -274,27 +277,41 @@ binary-dist:: fi; \ done; @echo "Configuring the Makefile for this project..." - touch $(BIN_DIST_DIR)/Makefile.in - echo "package = ghc" >> $(BIN_DIST_DIR)/Makefile.in - echo "version = $(ProjectVersion)" >> $(BIN_DIST_DIR)/Makefile.in - echo "PACKAGE_SH_SCRIPTS = $(BinDistShScripts)" >> $(BIN_DIST_DIR)/Makefile.in - echo "PACKAGE_PRL_SCRIPTS = $(BinDistPrlScripts)" >> $(BIN_DIST_DIR)/Makefile.in - echo "PACKAGE_LIB_PRL_SCRIPTS = $(BinDistLibPrlScripts)" >> $(BIN_DIST_DIR)/Makefile.in - echo "PACKAGE_LIB_SPLICED_FILES = $(BinDistLibSplicedFiles)" >> $(BIN_DIST_DIR)/Makefile.in - echo "PACKAGE_BINS = $(BinDistBins)" >> $(BIN_DIST_DIR)/Makefile.in - echo "PACKAGE_OPT_BINS = $(BinDistOptBins)" >> $(BIN_DIST_DIR)/Makefile.in - echo "PACKAGE_LINKS = $(BinDistLinks)" >> $(BIN_DIST_DIR)/Makefile.in - cat $(BIN_DIST_DIR)/Makefile-bin.in >> $(BIN_DIST_DIR)/Makefile.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) + 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 ) + +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) +else ifneq "$(XSLTPROC)" "" BINDIST_DOC_WAYS = html ifneq "$(FOP)" "" @@ -310,6 +327,7 @@ endif # DVIPS endif # XMLTEX endif # FOP endif # XSLTPROC +endif # XMLDocWays endif # BINDIST_DOC_WAYS @@ -323,6 +341,7 @@ binary-dist :: $(BINARY_DIST_DOC_RULES) $(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) \ @@ -361,22 +380,68 @@ binary-dist:: done endif +.PHONY: binary-dist-doc-% + +binary-dist:: + $(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 + +.PHONY: fiddle-binary-dist +fiddle-binary-dist: + cd $(BIN_DIST_DIR) && ../distrib/prep-bin-dist-mingw # Tar up the distribution and build a manifest -binary-dist :: +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 :: - @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\ +binary-dist :: publish-binary-dist +endif + +.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!" @@ -452,12 +517,12 @@ dist :: 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