X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=Makefile;h=ec0c901bfe412c7441b192418ba534e4b70bbe06;hp=e0d18e876d1d4e664815ef4ba03f71356717d49c;hb=2eb04ca0f8d0ec72b417cddc60672c696b4a3daa;hpb=b2a40d7ea2e8a0e7e0d72f51892e2e0ce14b443c diff --git a/Makefile b/Makefile index e0d18e8..ec0c901 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # # Targets: # -# bootsrap (DEFAULT) +# bootstrap (DEFAULT) # Builds GHC, then builds the libraries, # then uses this GHC ("stage 1") to build itself # ("stage 2"). @@ -59,17 +59,33 @@ include $(TOP)/mk/boilerplate.mk # 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 -stage1 : +# Sanity check that all the core libraries are in the tree, to catch +# failure to run darcs-all. +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 './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"; \ @@ -77,7 +93,7 @@ stage1 : $(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"; \ @@ -85,14 +101,14 @@ stage1 : $(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 : +stage2 : check-packages $(MAKE) -C compiler boot stage=2 $(MAKE) -C compiler stage=2 -stage3 : +stage3 : check-packages $(MAKE) -C compiler boot stage=3 $(MAKE) -C compiler stage=3 @@ -118,9 +134,10 @@ INSTALL_STAGE = endif # Same as default rule, but we pass $(INSTALL_STAGE) to $(MAKE) too -install :: +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"; \ @@ -147,6 +164,8 @@ install :: -mkdir $(prefix)/include/mingw -cp -rp $(GccDir)../include/* $(prefix)/include/mingw -cp -rp $(GccDir)../lib/gcc-lib/mingw32/$(GccVersion)/* $(prefix)/gcc-lib + -cp -rp $(GccDir)../lib/gcc/mingw32/$(GccVersion)/* $(prefix)/gcc-lib + -cp -rp $(GccDir)../libexec/gcc/mingw32/$(GccVersion)/* $(prefix)/gcc-lib -cp $(GccDir)../lib/*.* $(prefix)/gcc-lib -cp $(GccDir)gcc.exe $(prefix) -cp $(GccDir)as.exe $(prefix)/gcc-lib @@ -160,7 +179,7 @@ endif 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"; \ @@ -192,103 +211,107 @@ install-docs :: # binary-dist is a GHC addition for binary distributions # -ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" -BinDistShScripts = ghc-$(ProjectVersion) ghci-$(ProjectVersion) ghc-pkg-$(ProjectVersion) hsc2hs +BIN_DIST_TARBALL=ghc-$(ProjectVersion)-$(TARGETPLATFORM).tar.bz2 + +binary-dist:: + -rm -rf $(BIN_DIST_DIR) + -$(RM) $(BIN_DIST_DIR).tar.gz + +ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" + +binary-dist:: + $(MAKE) prefix=$(BIN_DIST_DIR) install + +binary-dist:: + cd $(BIN_DIST_DIR) && ../distrib/prep-bin-dist-mingw + else -BinDistShScripts = -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 - -BIN_DIST_NAME=ghc-$(ProjectVersion) -BIN_DIST_TMPDIR=$(FPTOOLS_TOP_ABS) - -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 +BinDistDirs = includes compiler docs rts + +BIN_DIST_TOP= distrib/Makefile \ + distrib/configure-bin.ac \ + distrib/INSTALL \ + distrib/README \ + ANNOUNCE \ + LICENSE \ + 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:: -ifeq "$(BIN_DIST)" "" - @echo "WARNING: To run the binary-dist target, you need to set BIN_DIST=1 in mk/build.mk" && exit 1 -endif - -rm -rf $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) - -$(RM) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME).tar.gz - @for i in $(BinDistDirs); do \ - if test -d "$$i"; then \ - echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM); \ - $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM); \ - echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM); \ - $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM); \ - echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \ - $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \ - echo $(MAKE) -C $$i $(MFLAGS) $(INSTALL_STAGE) install \ - prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \ - exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \ - bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \ - libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \ - libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \ - datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \ - $(MAKE) -C $$i $(MFLAGS) $(INSTALL_STAGE) install \ - prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \ - exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \ - bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \ - libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \ - libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \ - datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \ - fi; \ - done + $(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:: + $(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 binary-dist:: @for i in $(BIN_DIST_TOP); do \ if test -f "$$i"; then \ - echo cp $$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); \ - cp $$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); \ + echo cp $$i $(BIN_DIST_DIR); \ + cp $$i $(BIN_DIST_DIR); \ fi; \ done; @echo "Configuring the Makefile for this project..." - touch $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in - echo "package = $(ProjectNameShort)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in - echo "version = $(ProjectVersion)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in - echo "PACKAGE_SH_SCRIPTS = $(BinDistShScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in - echo "PACKAGE_PRL_SCRIPTS = $(BinDistPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in - echo "PACKAGE_LIB_PRL_SCRIPTS = $(BinDistLibPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in - echo "PACKAGE_LIB_SPLICED_FILES = $(BinDistLibSplicedFiles)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in - echo "PACKAGE_BINS = $(BinDistBins)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in - echo "PACKAGE_OPT_BINS = $(BinDistOptBins)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in - echo "PACKAGE_LINKS = $(BinDistLinks)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in - cat $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile-bin.in >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in + echo > $(VARFILE) + echo "package = ghc" >> $(VARFILE) + echo "version = $(ProjectVersion)" >> $(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_TMPDIR)/$(BIN_DIST_NAME)/configure-bin.ac $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure.ac - ( cd $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); autoconf ) + $(MV) $(BIN_DIST_DIR)/configure-bin.ac $(BIN_DIST_DIR)/configure.ac + ( 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) +else ifneq "$(XSLTPROC)" "" BINDIST_DOC_WAYS = html ifneq "$(FOP)" "" @@ -304,77 +327,84 @@ endif # DVIPS endif # XMLTEX endif # FOP endif # XSLTPROC +endif # XMLDocWays 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_TMPDIR)/$(BIN_DIST_NAME) \ - exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \ - bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \ - libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \ - libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \ - datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \ - $(MAKE) -C $$i $(MFLAGS) install-docs XMLDocWays="$(BINDIST_DOC_WAYS)" \ - prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \ - exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \ - bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \ - libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \ - libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \ - datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/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 \ + MAKING_BIN_DIST=1 \ + 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. -# ToDo: do this in a cleaner way... +.PHONY: binary-dist-doc-% -ifneq "$(BinDistPrlScripts)" "" binary-dist:: - @for i in $(BinDistPrlScripts); do \ - echo "Renaming $$i to $$i.prl"; \ - $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i.prl; \ - done -endif + $(MAKE) -C libraries binary-dist -ifneq "$(BinDistLibPrlScripts)" "" -binary-dist:: - @for i in $(BinDistLibPrlScripts); do \ - echo "Renaming $$i to $$i.prl"; \ - $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$$i.prl; \ - done endif -ifneq "$(BinDistShScripts)" "" -binary-dist:: - @for i in $(BinDistShScripts); do \ - if test -x $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i ; then \ - echo "Renaming $$i to $$i.sh"; \ - $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i.sh; \ - fi \ - done +# 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 -# -# Do this separately for now -# -binary-pack:: - ( cd $(BIN_DIST_TMPDIR); $(TAR) chzf $(BIN_DIST_NAME).tar.gz $(BIN_DIST_NAME) ) - -ifneq "$(way)" "" -.PHONY: package-way-dist -package-way-dist:: - ( cd $(BIN_DIST_TMPDIR); $(FIND) $(BIN_DIST_NAME)/ \( -name "*$(_way).a" -o -name "*.$(way_)hi" \) -print | xargs tar cvf $(BIN_DIST_TMPDIR)/ghc-$(ProjectVersion)-$(way)-$(TARGETPLATFORM).tar ) - gzip $(BIN_DIST_TMPDIR)/ghc-$(ProjectVersion)-$(way)-$(TARGETPLATFORM).tar +# Upload the distribution and documentation +ifneq "$(PublishLocation)" "" +binary-dist :: publish-binary-dist endif -ifneq "$(way)" "" -remove-way-dist:: - ( cd $(BIN_DIST_TMPDIR); $(FIND) $(BIN_DIST_NAME)/ \( -name "*$(_way).a" -o -name "*.$(way_)hi" \) -print -exec $(RM) {} \; ) +.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:: @@ -402,72 +432,92 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME) # # Files to include in source distributions # -SRC_DIST_DIRS += 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 \ - ghc.spec.in mk/bootstrap.mk \ - mk/boilerplate.mk mk/config.h.in mk/config.mk.in mk/opts.mk \ - mk/paths.mk mk/package.mk mk/suffix.mk mk/target.mk \ - mk/fptools.css mk/fix_install_names.sh - -# clean the tree first, leaving certain extra files in place (eg. configure) -dist :: distclean + ghc.spec.in VERSION -dist :: - -rm -rf $(SRC_DIST_DIR) - -$(RM) $(SRC_DIST_NAME).tar.gz - mkdir $(SRC_DIST_DIR) - mkdir $(SRC_DIST_DIR)/mk - $(FIND) $(SRC_DIST_DIRS) -type d \( -name _darcs -prune -o -name SRC -prune -o -name "autom4te*" -prune -o -print \) | sed -e 's!.*!mkdir "$(SRC_DIST_DIR)/&"!' | sh - $(FIND) $(SRC_DIST_DIRS) $(SRC_DIST_FILES) -name _darcs -prune -o -name SRC -prune -o -name "autom4te*" -prune -o -name "*~" -prune -o -name ".cvsignore" -prune -o -name "\#*" -prune -o -name ".\#*" -prune -o -name "log" -prune -o -name "*-SAVE" -prune -o -name "*.orig" -prune -o -name "*.rej" -prune -o ! -type d -print | sed -e 's!.*!$(LN_S) "$(FPTOOLS_TOP_ABS)/&" "$(SRC_DIST_DIR)/&"!' | sh +# ----------------------------------------------------------------------------- +# Source distributions -# Automatic generation of a MANIFEST file for a source distribution -# tree that is ready to go. -dist-manifest :: - cd $(SRC_DIST_DIR); $(FIND) . \( -type l -o -type f \) -exec ls -lLG {} \; | sed -e 's/\.\///' > MANIFEST +# A source dist is built from a complete build tree, because we +# require some extra files not contained in a darcs checkout: the +# output from Happy and Alex, for example. +# +# The steps performed by 'make dist' are as follows: +# - create a complete link-tree of the current build tree in /tmp +# - run 'make distclean' on that tree +# - remove a bunch of other files that we know shouldn't be in the dist +# - tar up first the extralibs package, then the main source package -dist-package :: dist-package-tar-gz +EXTRA_LIBS=$(patsubst %, $(SRC_DIST_NAME)/libraries/%, $(shell cat libraries/extra-packages)) -SRC_DIST_PATHS = $(patsubst %, $(SRC_DIST_NAME)/%, $(SRC_DIST_FILES) $(SRC_DIST_DIRS)) +SRC_DIST_TARBALL = ghc-$(ProjectVersion)-src.tar.bz2 +SRC_DIST_EXTRALIBS_TARBALL = ghc-$(ProjectVersion)-src-extralibs.tar.bz2 -dist-package-tar-bz2 :: - BZIP2=-9 $(TAR) chjf $(SRC_DIST_NAME)-src.tar.bz2 $(SRC_DIST_NAME) || $(RM) $(SRC_DIST_NAME)-src.tar.bz2 +VERSION : + echo $(ProjectVersion) >VERSION -dist-package-tar-gz :: - $(TAR) chzf $(SRC_DIST_NAME)-src.tar.gz $(SRC_DIST_NAME) || $(RM) $(SRC_DIST_NAME)-src.tar.gz +dist :: VERSION -dist-package-zip :: - cd ..; $(LN_S) $(FPTOOLS_TOP_ABS) $(SRC_DIST_NAME) && \ - $(ZIP) $(ZIP_OPTS) -r $(SRC_DIST_NAME)-src.zip $(SRC_DIST_PATHS) +dist :: + $(RM) -rf $(SRC_DIST_DIR) + $(RM) $(SRC_DIST_NAME).tar.gz + mkdir $(SRC_DIST_DIR) + ( cd $(SRC_DIST_DIR) \ + && for i in $(SRC_DIST_DIRS); do mkdir $$i; (cd $$i && lndir $(FPTOOLS_TOP_ABS)/$$i ); done \ + && for i in $(SRC_DIST_FILES); do $(LN_S) $(FPTOOLS_TOP_ABS)/$$i .; done \ + && $(MAKE) distclean \ + && $(RM) -rf compiler/stage[123] mk/build.mk \ + && $(FIND) $(SRC_DIST_DIRS) \( -name _darcs -o -name SRC -o -name "autom4te*" -o -name "*~" -o -name ".cvsignore" -o -name "\#*" -o -name ".\#*" -o -name "log" -o -name "*-SAVE" -o -name "*.orig" -o -name "*.rej" \) -print | xargs $(RM) -rf \ + ) + tar chf - $(EXTRA_LIBS) | bzip2 >$(FPTOOLS_TOP_ABS)/$(SRC_DIST_EXTRALIBS_TARBALL) + $(RM) -rf $(EXTRA_LIBS) + tar chf - $(SRC_DIST_NAME) 2>$src_log | bzip2 >$(FPTOOLS_TOP_ABS)/$(SRC_DIST_TARBALL) + +# Upload the distribution(s) +# Retrying is to work around buggy firewalls that corrupt large file transfers +# over SSH. +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)/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)/dist"; \ + if $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist; then break; fi\ + done +endif # ----------------------------------------------------------------------------- # HC file bundles hc-file-bundle : - $(RM) -r $(ProjectNameShort)-$(ProjectVersion) - $(LN_S) . $(ProjectNameShort)-$(ProjectVersion) - $(FIND) $(ProjectNameShort)-$(ProjectVersion)/compiler \ - $(ProjectNameShort)-$(ProjectVersion)/utils \ - $(ProjectNameShort)-$(ProjectVersion)/compat \ - $(ProjectNameShort)-$(ProjectVersion)/libraries -follow \ + $(RM) -r ghc-$(ProjectVersion) + $(LN_S) . ghc-$(ProjectVersion) + $(FIND) ghc-$(ProjectVersion)/compiler \ + ghc-$(ProjectVersion)/utils \ + ghc-$(ProjectVersion)/compat \ + ghc-$(ProjectVersion)/libraries -follow \ \( -name "*.hc" -o -name "*_hsc.[ch]" -o -name "*_stub.[ch]" \) -print > hc-files-to-go - for f in `$(FIND) $(ProjectNameShort)-$(ProjectVersion)/compiler $(ProjectNameShort)-$(ProjectVersion)/utils $(ProjectNameShort)-$(ProjectVersion)/libraries -name "*.hsc" -follow -print` ""; do \ + for f in `$(FIND) ghc-$(ProjectVersion)/compiler ghc-$(ProjectVersion)/utils ghc-$(ProjectVersion)/libraries -name "*.hsc" -follow -print` ""; do \ if test "x$$f" != "x" && test -e `echo "$$f" | sed 's/hsc$$/hs/g'`; then \ echo `echo "$$f" | sed 's/hsc$$/hs/g' ` >> hc-files-to-go ; \ fi; \ done; - for f in `$(FIND) $(ProjectNameShort)-$(ProjectVersion)/compiler $(ProjectNameShort)-$(ProjectVersion)/rts -name "*.cmm" -follow -print` ""; do \ + for f in `$(FIND) ghc-$(ProjectVersion)/compiler ghc-$(ProjectVersion)/rts -name "*.cmm" -follow -print` ""; do \ if test "x$$f" != "x"; then \ echo `echo "$$f" | sed 's/cmm$$/hc/g' ` >> hc-files-to-go ; \ fi; \ done; - echo $(ProjectNameShort)-$(ProjectVersion)/libraries/base/GHC/PrimopWrappers.hs >> hc-files-to-go - echo $(ProjectNameShort)-$(ProjectVersion)/compiler/parser/Parser.hs >> hc-files-to-go - echo $(ProjectNameShort)-$(ProjectVersion)/compiler/parser/ParserCore.hs >> hc-files-to-go - echo $(ProjectNameShort)-$(ProjectVersion)/compiler/main/ParsePkgConf.hs >> hc-files-to-go - echo $(ProjectNameShort)-$(ProjectVersion)/libraries/haskell-src/Language/Haskell/Parser.hs >> hc-files-to-go - tar czf $(ProjectNameShort)-$(ProjectVersion)-$(TARGETPLATFORM)-hc.tar.gz `cat hc-files-to-go` + echo ghc-$(ProjectVersion)/libraries/base/GHC/PrimopWrappers.hs >> hc-files-to-go + echo ghc-$(ProjectVersion)/compiler/parser/Parser.hs >> hc-files-to-go + echo ghc-$(ProjectVersion)/compiler/parser/ParserCore.hs >> hc-files-to-go + echo ghc-$(ProjectVersion)/compiler/main/ParsePkgConf.hs >> hc-files-to-go + echo ghc-$(ProjectVersion)/libraries/haskell-src/Language/Haskell/Parser.hs >> hc-files-to-go + tar czf ghc-$(ProjectVersion)-$(TARGETPLATFORM)-hc.tar.gz `cat hc-files-to-go` # ----------------------------------------------------------------------------- # Cleaning @@ -480,6 +530,9 @@ DIST_CLEAN_FILES += config.cache config.status mk/config.h mk/stamp-h \ # don't clean config.mk: it's needed when cleaning stuff later on LATE_DIST_CLEAN_FILES += mk/config.mk +# VERSION is shipped in a source dist +MAINTAINER_CLEAN_FILES += VERSION + extraclean:: $(RM) -rf autom4te.cache