X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=Makefile;h=3b7f99cc9737edadcef4122c687d17af51e9526c;hp=6fe1a5293421668a6ddfb00b35038cc568ea5e18;hb=ed95d86d82a3ea4cf95906e500873a1cb3f91e4e;hpb=83c20a542c1ef107f80ffac2c19e5cec31f03ce9 diff --git a/Makefile b/Makefile index 6fe1a52..3b7f99c 100644 --- a/Makefile +++ b/Makefile @@ -76,6 +76,11 @@ check-packages : 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 @@ -96,8 +101,8 @@ stage1 : check-packages $(MAKE) --no-print-directory -C $$i $(MFLAGS) all; \ if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ; then true; else exit 1; fi; \ done - @$(MAKE) -C libraries boot - @$(MAKE) -C libraries all + $(MAKE) -C libraries boot + $(MAKE) -C libraries all stage2 : check-packages $(MAKE) -C compiler boot stage=2 @@ -206,7 +211,7 @@ install-docs :: # ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" -BinDistShScripts = ghc-$(ProjectVersion) ghci-$(ProjectVersion) ghc-pkg-$(ProjectVersion) hsc2hs +BinDistShScripts = ghc-$(ProjectVersion) ghci-$(ProjectVersion) ghc-pkg-$(ProjectVersion) hsc2hs-ghc else BinDistShScripts = endif @@ -214,10 +219,9 @@ endif BinDistPrlScripts = ghcprof BinDistLibPrlScripts = ghc-asm ghc-split BinDistBins = hp2ps runghc -BinDistOptBins = runhaskell BinDistLinks = ghc ghci ghc-pkg BinDistLibSplicedFiles = package.conf -BinDistDirs = includes compiler docs driver libraries rts utils +BinDistDirs = includes compiler docs driver rts utils BIN_DIST_NAME=ghc-$(ProjectVersion) BIN_DIST_TOPDIR=$(FPTOOLS_TOP_ABS) @@ -225,56 +229,49 @@ BIN_DIST_DIR=$(BIN_DIST_TOPDIR)/$(BIN_DIST_NAME) 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 endif -.PHONY: binary-dist-pre binary-dist binary-pack +.PHONY: binary-dist-pre% binary-dist binary-pack -binary-dist:: binary-dist-pre +BINARY_DIST_PRE_RULES=$(foreach d,$(BinDistDirs),binary-dist-pre-$d) + +binary-dist:: binary-dist-pre $(BINARY_DIST_PRE_RULES) 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" && exit 1 + @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 - @for i in $(BinDistDirs); do \ - if test -d "$$i"; then \ - echo $(MKDIRHIER) $(BIN_DIST_DIR)/bin/$(TARGETPLATFORM); \ - $(MKDIRHIER) $(BIN_DIST_DIR)/bin/$(TARGETPLATFORM); \ - echo $(MKDIRHIER) $(BIN_DIST_DIR)/lib/$(TARGETPLATFORM); \ - $(MKDIRHIER) $(BIN_DIST_DIR)/lib/$(TARGETPLATFORM); \ - echo $(MKDIRHIER) $(BIN_DIST_DIR)/share; \ - $(MKDIRHIER) $(BIN_DIST_DIR)/share; \ - echo $(MAKE) -C $$i $(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; \ - $(MAKE) -C $$i $(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; \ - fi; \ - done + $(MKDIRHIER) $(BIN_DIST_DIR)/bin/$(TARGETPLATFORM) + $(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 + +VARFILE=$(BIN_DIST_DIR)/Makefile-vars.in binary-dist:: @for i in $(BIN_DIST_TOP); do \ @@ -284,17 +281,17 @@ 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 ) @@ -305,45 +302,43 @@ binary-dist:: ifndef BINDIST_DOC_WAYS -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 +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 endif # BINDIST_DOC_WAYS -binary-dist :: ifneq "$(DIR_DOCBOOK_XSL)" "" - @for i in $(BinDistDirs); do \ - if test -d "$$i"; then \ - $(MAKE) -C $$i $(MFLAGS) $(BINDIST_DOC_WAYS); \ - echo $(MAKE) -C $$i $(MFLAGS) install-docs XMLDocWays="$(BINDIST_DOC_WAYS)" \ - 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; \ - $(MAKE) -C $$i $(MFLAGS) install-docs XMLDocWays="$(BINDIST_DOC_WAYS)" \ - 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; \ - fi \ - done +.PHONY: binary-dist-doc-% + +BINARY_DIST_DOC_RULES=$(foreach d,$(BinDistDirs),binary-dist-doc-$d) + +binary-dist :: $(BINARY_DIST_DOC_RULES) + +$(BINARY_DIST_DOC_RULES): binary-dist-doc-%: + $(MAKE) -C $* $(MFLAGS) $(BINDIST_DOC_WAYS) + $(MAKE) -C $* $(MFLAGS) install-docs \ + XMLDocWays="$(BINDIST_DOC_WAYS)" \ + 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 endif # Rename scripts to $i.prl and $i.sh where necessary. @@ -375,19 +370,58 @@ binary-dist:: done endif +.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 {} \; + +# 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) ) -# Upload the distribution +# Upload the distribution and documentation ifneq "$(PublishLocation)" "" -binary-dist :: +binary-dist :: publish-binary-dist +endif + +.PHONY: publish-binary-dist +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\ done -endif + $(PublishCp) -r $(BIN_DIST_DIR)/share/html/* $(PublishLocation)/docs binary-dist::