#
# Targets:
#
-# bootsrap (DEFAULT)
+# bootstrap (DEFAULT)
# Builds GHC, then builds the libraries,
# then uses this GHC ("stage 1") to build itself
# ("stage 2").
SUBDIRS = $(SUBDIRS_NOLIB) libraries
-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 \
$(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
endif
# Same as default rule, but we pass $(INSTALL_STAGE) to $(MAKE) too
-install ::
+install :: check-packages
@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
for i in $(SUBDIRS); do \
echo "------------------------------------------------------------------------"; \
#
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
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 driver rts utils
+
+BIN_DIST_TARBALL=ghc-$(ProjectVersion)-$(TARGETPLATFORM).tar.bz2
+
+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_PRE_RULES=$(foreach d,$(BinDistDirs),binary-dist-pre-$d)
-binary-dist:: binary-dist-pre
+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_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
+ -rm -rf $(BIN_DIST_DIR)
+ -$(RM) $(BIN_DIST_DIR).tar.gz
+ $(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 \
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 = ghc" >> $(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 "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_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); autoconf )
#
# binary dist'ing the documentation.
# The default documentation to build/install is given below; overrideable
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_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.
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; \
+ $(MV) $(BIN_DIST_DIR)/bin/$(TARGETPLATFORM)/$$i $(BIN_DIST_DIR)/bin/$(TARGETPLATFORM)/$$i.prl; \
done
endif
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; \
+ $(MV) $(BIN_DIST_DIR)/lib/$(TARGETPLATFORM)/$$i $(BIN_DIST_DIR)/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 \
+ if test -x $(BIN_DIST_DIR)/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; \
+ $(MV) $(BIN_DIST_DIR)/bin/$(TARGETPLATFORM)/$$i $(BIN_DIST_DIR)/bin/$(TARGETPLATFORM)/$$i.sh; \
fi \
done
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
+.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
-ifneq "$(way)" ""
-remove-way-dist::
- ( cd $(BIN_DIST_TMPDIR); $(FIND) $(BIN_DIST_NAME)/ \( -name "*$(_way).a" -o -name "*.$(way_)hi" \) -print -exec $(RM) {} \; )
+.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 :: 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 and documentation
+ifneq "$(PublishLocation)" ""
+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
+ $(PublishCp) -r $(BIN_DIST_DIR)/share/html/* $(PublishLocation)/docs
+
+
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 += docs distrib $(filter-out docs distrib,$(SUBDIRS))
+SRC_DIST_DIRS += mk docs distrib $(filter-out docs distrib,$(SUBDIRS))
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
+ ghc.spec.in VERSION
-# clean the tree first, leaving certain extra files in place (eg. configure)
-dist :: distclean
-
-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)"; \
+ if $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation); 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\
+ done
+endif
# -----------------------------------------------------------------------------
# HC file bundles
# 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
projects / ghc-hetmet.git / blobdiff