X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=f87ccb19b714a48ac712d43c8fb06405d0fbeba9;hb=cadba81047f6188fad2fe07004c3cb36316c36d1;hp=c6e0b58ec9dfa18562096624821be18efb73d269;hpb=e1a10e81a655c1ad1116b3e242eed645a045b312;p=ghc-hetmet.git diff --git a/ghc.mk b/ghc.mk index c6e0b58..f87ccb1 100644 --- a/ghc.mk +++ b/ghc.mk @@ -12,40 +12,22 @@ # ToDo List. # -# Before we can merge the new build system into HEAD: -# # * finish installation -# * other documentation -# * create doc index and contents # * Windows: should we have ghc-pkg-? # * should we be stripping things? # * install libgmp.a, gmp.h -# * finish binary distributions # * need to fix Cabal for new Windows layout, see # Distribution/Simple/GHC.configureToolchain. -# -# Once the new build system is in HEAD, and before 6.12: -# -# * separate the logic of whether to do something from the test for -# existence of the tool to do it. For example, rather than checking -# if $DIR_DOCBOOK_XSL or $XSLTPROC is "", we should have a variable -# for controlling the building of the docs. # * remove old Makefiles, add new stubs for building in subdirs -# * utils/hsc2hs/Makefile -# * utils/haddock/Makefile # * docs/Makefile # * docs/docbook-cheat-sheet/Makefile # * docs/ext-core/Makefile # * docs/man/Makefile # * docs/storage-mgmt/Makefile # * docs/vh/Makefile -# * driver/Makefile # * rts/dotnet/Makefile # * utils/Makefile -# * GhcProfiled # * optionally install stage3? -# * shared libraries, way dyn -# * get HC bootstrapping working # * add Makefiles for the rest of the utils/ programs that aren't built # by default (need to exclude them from 'make all' too) # @@ -100,6 +82,8 @@ # o libraries/* # o compiler +.PHONY: default all haddock + default : all # Just bring makefiles up to date: @@ -156,6 +140,9 @@ endif include rules/all-target.mk include rules/clean-target.mk +# Helper macro +include rules/mkdep.mk + # ----------------------------------------------------------------------------- # The inplace tree @@ -211,6 +198,7 @@ include rules/c-sources.mk include rules/includes-sources.mk include rules/hs-objs.mk include rules/c-objs.mk +include rules/cmm-objs.mk # ----------------------------------------------------------------------------- # Suffix rules @@ -235,6 +223,11 @@ $(foreach way,$(ALL_WAYS),\ include rules/c-suffix-rules.mk +#----------------------------------------------------------------------------- +# CMM-related suffix rules + +include rules/cmm-suffix-rules.mk + endif # ----------------------------------------------------------------------------- @@ -288,45 +281,56 @@ include rules/bindist.mk # ----------------------------------------------------------------------------- # Building libraries -# XXX generate from $(TOP)/packages -PACKAGES = \ - ghc-prim \ - integer-gmp \ - base \ - filepath \ - array \ - bytestring \ - containers +define addPackage # args: $1 = package, $2 = condition + ifneq "$2" "" + ifeq "$$(CLEANING)" "YES" + PACKAGES += $1 + else + ifeq $2 + PACKAGES += $1 + endif + endif + else + PACKAGES += $1 + endif +endef -ifeq "$(Windows)" "YES" -PACKAGES += Win32 +$(eval $(call addPackage,ghc-prim)) +ifeq "$(CLEANING)" "YES" +$(eval $(call addPackage,integer-gmp)) +$(eval $(call addPackage,integer-simple)) else -PACKAGES += unix +$(eval $(call addPackage,$(INTEGER_LIBRARY))) endif - -PACKAGES += \ - old-locale \ - old-time \ - directory \ - process \ - random \ - extensible-exceptions \ - haskell98 \ - hpc \ - packedstring \ - pretty \ - syb \ - template-haskell \ - base3-compat \ - Cabal \ - mtl \ - utf8-string - -ifneq "$(Windows)" "YES" -PACKAGES += terminfo -endif - -PACKAGES += haskeline +$(eval $(call addPackage,base)) +$(eval $(call addPackage,filepath)) +$(eval $(call addPackage,array)) +$(eval $(call addPackage,bytestring)) +$(eval $(call addPackage,containers)) + +$(eval $(call addPackage,Win32,($$(Windows),YES))) +$(eval $(call addPackage,unix,($$(Windows),NO))) + +$(eval $(call addPackage,old-locale)) +$(eval $(call addPackage,old-time)) +$(eval $(call addPackage,time)) +$(eval $(call addPackage,directory)) +$(eval $(call addPackage,process)) +$(eval $(call addPackage,random)) +$(eval $(call addPackage,extensible-exceptions)) +$(eval $(call addPackage,haskell98)) +$(eval $(call addPackage,hpc)) +$(eval $(call addPackage,pretty)) +$(eval $(call addPackage,syb)) +$(eval $(call addPackage,template-haskell)) +$(eval $(call addPackage,base3-compat)) +$(eval $(call addPackage,Cabal)) +$(eval $(call addPackage,mtl)) +$(eval $(call addPackage,utf8-string)) + +$(eval $(call addPackage,terminfo,($$(Windows),NO))) + +$(eval $(call addPackage,haskeline)) ifneq "$(BootingFromHc)" "YES" PACKAGES_STAGE2 += \ @@ -351,10 +355,6 @@ OTHER_LIBS = libffi/libHSffi$(v_libsuf) libffi/HSffi.o ifeq "$(BuildSharedLibs)" "YES" OTHER_LIBS += libffi/libHSffi$(dyn_libsuf) endif -ifeq "$(HaveLibGmp)" "NO" -GMP_LIB = gmp/libgmp.a -OTHER_LIBS += $(GMP_LIB) -endif # We cannot run ghc-cabal to configure a package until we have # configured and registered all of its dependencies. So the following @@ -412,11 +412,11 @@ endef PRIMOPS_TXT = $(GHC_COMPILER_DIR)/prelude/primops.txt libraries/ghc-prim/dist-install/build/GHC/PrimopWrappers.hs : $(GENPRIMOP_INPLACE) $(PRIMOPS_TXT) - $(MKDIRHIER) $(dir $@) - $(GENPRIMOP_INPLACE) --make-haskell-wrappers <$(PRIMOPS_TXT) >$@ + "$(MKDIRHIER)" $(dir $@) + "$(GENPRIMOP_INPLACE)" --make-haskell-wrappers <$(PRIMOPS_TXT) >$@ libraries/ghc-prim/GHC/Prim.hs : $(GENPRIMOP_INPLACE) $(PRIMOPS_TXT) - $(GENPRIMOP_INPLACE) --make-haskell-source <$(PRIMOPS_TXT) >$@ + "$(GENPRIMOP_INPLACE)" --make-haskell-source <$(PRIMOPS_TXT) >$@ # ----------------------------------------------------------------------------- @@ -465,14 +465,17 @@ BUILD_DIRS += \ endif BUILD_DIRS += \ - gmp \ docs/users_guide \ libraries/Cabal/doc \ - $(GHC_MANGLER_DIR) \ - $(GHC_SPLIT_DIR) \ $(GHC_UNLIT_DIR) \ $(GHC_HP2PS_DIR) +ifneq "$(GhcUnregisterised)" "YES" +BUILD_DIRS += \ + $(GHC_MANGLER_DIR) \ + $(GHC_SPLIT_DIR) +endif + ifneq "$(BINDIST)" "YES" BUILD_DIRS += \ $(GHC_GENPRIMOP_DIR) @@ -505,6 +508,10 @@ BUILD_DIRS += \ endif endif +ifeq "$(INTEGER_LIBRARY)" "integer-gmp" +BUILD_DIRS += libraries/integer-gmp/gmp +endif + BUILD_DIRS += \ compiler \ $(GHC_HSC2HS_DIR) \ @@ -534,6 +541,18 @@ ifneq "$(findstring $(phase),0 1 2)" "" ghc_stage1_DISABLE = YES endif +ifneq "$(CLEANING)" "YES" +ifeq "$(INTEGER_LIBRARY)" "integer-gmp" +libraries/base_dist-install_CONFIGURE_OPTS += --flags=-integer-simple +else + ifeq "$(INTEGER_LIBRARY)" "integer-simple" + libraries/base_dist-install_CONFIGURE_OPTS += --flags=integer-simple + else +$(error Unknown integer library: $(INTEGER_LIBRARY)) + endif +endif +endif + ifneq "$(findstring $(phase),0 1 2 3)" "" # In phases 0-3, we disable stage2-3, the full libraries and haddock utils/haddock_dist_DISABLE = YES @@ -549,6 +568,14 @@ $(foreach lib,$(PACKAGES) $(PACKAGES_STAGE2),$(eval \ libraries/$(lib)_dist-install_DISABLE = YES)) endif +# These packages don't pass the Cabal checks because hs-source-dirs +# points outside the source directory. This isn't a real problem in +# these cases, so we just skip checking them. +CHECKED_libraries/dph/dph-seq = YES +CHECKED_libraries/dph/dph-par = YES +# In compiler's case, include-dirs points outside of the source tree +CHECKED_compiler = YES + include $(patsubst %, %/ghc.mk, $(BUILD_DIRS)) # We need -fno-warn-deprecated-flags to avoid failure with -Werror @@ -569,6 +596,19 @@ $(foreach pkg,$(PACKAGES_STAGE2),$(eval libraries/$(pkg)_dist-install_HC_OPTS += # out the ones it thinks aren't supported. libraries/base3-compat_dist-install_HC_OPTS += -XPackageImports +# A useful pseudo-target +.PHONY: stage1_libs +stage1_libs : $(ALL_STAGE1_LIBS) + +libraries/index.html: $(ALL_HADDOCK_FILES) + cd libraries && sh gen_contents_index --inplace +$(eval $(call all-target,library_doc_index,libraries/index.html)) +INSTALL_LIBRARY_DOCS += libraries/*.html libraries/*.gif libraries/*.css libraries/*.js + +ifeq "$(CHECK_PACKAGES)" "YES" +all: check_packages +endif + # ----------------------------------------------------------------------------- # Bootstrapping libraries @@ -622,20 +662,20 @@ $(INPLACE)/stamp-mingw : $(MKDIRHIER) $(MKDIRHIER) $(INPLACE_MINGW)/bin GCC=`type -p $(WhatGccIsCalled)`; \ GccDir=`dirname $$GCC`; \ - $(CP) -p $$GccDir/{gcc.exe,ar.exe,as.exe,dlltool.exe,dllwrap.exe,windres.exe} $(INPLACE_MINGW)/bin; \ - $(CP) -Rp $$GccDir/../include $(INPLACE_MINGW); \ - $(CP) -Rp $$GccDir/../lib $(INPLACE_MINGW); \ - $(CP) -Rp $$GccDir/../libexec $(INPLACE_MINGW); \ - $(CP) -Rp $$GccDir/../mingw32 $(INPLACE_MINGW) + "$(CP)" -p $$GccDir/{gcc.exe,ar.exe,as.exe,dlltool.exe,dllwrap.exe,windres.exe} $(INPLACE_MINGW)/bin; \ + "$(CP)" -Rp $$GccDir/../include $(INPLACE_MINGW); \ + "$(CP)" -Rp $$GccDir/../lib $(INPLACE_MINGW); \ + "$(CP)" -Rp $$GccDir/../libexec $(INPLACE_MINGW); \ + "$(CP)" -Rp $$GccDir/../mingw32 $(INPLACE_MINGW) touch $(INPLACE)/stamp-mingw install : install_mingw .PHONY: install_mingw install_mingw : $(INPLACE_MINGW) - $(CP) -Rp $(INPLACE_MINGW) $(prefix) + "$(CP)" -Rp $(INPLACE_MINGW) $(prefix) $(INPLACE_LIB)/perl.exe $(INPLACE_LIB)/perl56.dll : - $(CP) $(GhcDir)../{perl.exe,perl56.dll} $(INPLACE_LIB) + "$(CP)" $(GhcDir)../{perl.exe,perl56.dll} $(INPLACE_LIB) endif # Windows @@ -645,98 +685,129 @@ libraries/ghc-prim/dist-install/doc/html/ghc-prim/ghc-prim.haddock: \ libraries/ghc-prim/dist-install/build/autogen/GHC/Prim.hs: \ $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) $(MKDIRHIER) - $(MKDIRHIER) $(dir $@) - $(GENPRIMOP_INPLACE) --make-haskell-source < $< > $@ + "$(MKDIRHIER)" $(dir $@) + "$(GENPRIMOP_INPLACE)" --make-haskell-source < $< > $@ libraries/ghc-prim/dist-install/build/autogen/GHC/PrimopWrappers.hs: \ $(PRIMOPS_TXT) $(GENPRIMOP_INPLACE) $(MKDIRHIER) - $(MKDIRHIER) $(dir $@) - $(GENPRIMOP_INPLACE) --make-haskell-wrappers < $< > $@ + "$(MKDIRHIER)" $(dir $@) + "$(GENPRIMOP_INPLACE)" --make-haskell-wrappers < $< > $@ # ----------------------------------------------------------------------------- # Installation install: install_packages install_libs install_libexecs install_headers \ - install_libexec_scripts install_bins + install_libexec_scripts install_bins install_docs \ + install_topdirs install_topdir_scripts install_bins: $(INSTALL_BINS) $(INSTALL_DIR) $(DESTDIR)$(bindir) for i in $(INSTALL_BINS); do \ $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(bindir) ; \ if test "$(darwin_TARGET_OS)" = "1"; then \ - sh mk/fix_install_names.sh $(libdir) $(DESTDIR)$(bindir)/$$i ; \ + sh mk/fix_install_names.sh $(ghclibdir) $(DESTDIR)$(bindir)/$$i ; \ fi ; \ done install_libs: $(INSTALL_LIBS) - $(INSTALL_DIR) $(DESTDIR)$(libdir) + $(INSTALL_DIR) $(DESTDIR)$(ghclibdir) for i in $(INSTALL_LIBS); do \ case $$i in \ *.a) \ - $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(libdir); \ - $(RANLIB) $(DESTDIR)$(libdir)/`basename $$i` ;; \ + $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibdir); \ + $(RANLIB) $(DESTDIR)$(ghclibdir)/`basename $$i` ;; \ *.dll) \ - $(INSTALL_DATA) -s $(INSTALL_OPTS) $$i $(DESTDIR)$(libdir) ;; \ + $(INSTALL_DATA) -s $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibdir) ;; \ *.so) \ - $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i $(DESTDIR)$(libdir) ;; \ + $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibdir) ;; \ *.dylib) \ - $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i $(DESTDIR)$(libdir); \ - install_name_tool -id $(DESTDIR)$(libdir)/`basename $$i` $(DESTDIR)$(libdir)/`basename $$i` ;; \ + $(INSTALL_SHLIB) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibdir); \ + install_name_tool -id $(DESTDIR)$(ghclibdir)/`basename $$i` $(DESTDIR)$(ghclibdir)/`basename $$i` ;; \ *) \ - $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(libdir); \ + $(INSTALL_DATA) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibdir); \ esac; \ done install_libexec_scripts: $(INSTALL_LIBEXEC_SCRIPTS) - $(MKDIRHIER) $(DESTDIR)$(libexecdir) + $(INSTALL_DIR) $(DESTDIR)$(ghclibexecdir) for i in $(INSTALL_LIBEXEC_SCRIPTS); do \ - $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(libexecdir); \ + $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibexecdir); \ done install_libexecs: $(INSTALL_LIBEXECS) - $(MKDIRHIER) $(DESTDIR)$(libexecdir) + $(INSTALL_DIR) $(DESTDIR)$(ghclibexecdir) for i in $(INSTALL_LIBEXECS); do \ - $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(libexecdir); \ + $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(ghclibexecdir); \ + done + +install_topdir_scripts: $(INSTALL_TOPDIR_SCRIPTS) + $(INSTALL_DIR) $(DESTDIR)$(topdir) + for i in $(INSTALL_TOPDIR_SCRIPTS); do \ + $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(topdir); \ + done + +install_topdirs: $(INSTALL_TOPDIRS) + $(INSTALL_DIR) $(DESTDIR)$(topdir) + for i in $(INSTALL_TOPDIRS); do \ + $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(topdir); \ done install_headers: $(INSTALL_HEADERS) - $(INSTALL_DIR) $(DESTDIR)$(headerdir) + $(INSTALL_DIR) $(DESTDIR)$(ghcheaderdir) for i in $(INSTALL_HEADERS); do \ - $(INSTALL_HEADER) $(INSTALL_OPTS) $$i $(DESTDIR)$(headerdir); \ + $(INSTALL_HEADER) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghcheaderdir); \ + done + +install_docs: $(INSTALL_HEADERS) + $(INSTALL_DIR) $(DESTDIR)$(docdir) + for i in $(INSTALL_DOCS); do \ + $(INSTALL_DOC) $(INSTALL_OPTS) $$i $(DESTDIR)$(docdir); \ + done + $(INSTALL_DIR) $(INSTALL_OPTS) $(DESTDIR)$(docdir)/html; \ + $(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html $(DESTDIR)$(docdir)/html; \ + for i in $(INSTALL_LIBRARY_DOCS); do \ + $(INSTALL_DOC) $(INSTALL_OPTS) $$i $(DESTDIR)$(docdir)/html/libraries/; \ + done + for i in $(INSTALL_HTML_DOC_DIRS); do \ + $(INSTALL_DIR) $(INSTALL_OPTS) $(DESTDIR)$(docdir)/html/`basename $$i`; \ + $(INSTALL_DOC) $(INSTALL_OPTS) $$i/* $(DESTDIR)$(docdir)/html/`basename $$i`; \ done -INSTALLED_PACKAGE_CONF=$(DESTDIR)$(libdir)/package.conf +INSTALLED_PACKAGE_CONF=$(DESTDIR)$(topdir)/package.conf # Install packages in the right order, so that ghc-pkg doesn't complain. # Also, install ghc-pkg first. ifeq "$(Windows)" "NO" -INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(libexecdir)/ghc-pkg +INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(ghclibexecdir)/ghc-pkg else INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(bindir)/ghc-pkg.exe endif install_packages: install_libexecs install_packages: libffi/package.conf.install rts/package.conf.install - $(MKDIRHIER) $(DESTDIR)$(libdir) - echo "[]" > $(INSTALLED_PACKAGE_CONF) - $(INSTALLED_GHC_PKG_REAL) --force --global-conf $(INSTALLED_PACKAGE_CONF) update libffi/package.conf.install - $(INSTALLED_GHC_PKG_REAL) --force --global-conf $(INSTALLED_PACKAGE_CONF) update rts/package.conf.install + $(INSTALL_DIR) $(DESTDIR)$(topdir) + "$(RM)" $(RM_OPTS) $(INSTALLED_PACKAGE_CONF) + $(CREATE_DATA) $(INSTALLED_PACKAGE_CONF) + echo "[]" >> $(INSTALLED_PACKAGE_CONF) + "$(INSTALLED_GHC_PKG_REAL)" --force --global-conf $(INSTALLED_PACKAGE_CONF) update libffi/package.conf.install + "$(INSTALLED_GHC_PKG_REAL)" --force --global-conf $(INSTALLED_PACKAGE_CONF) update rts/package.conf.install $(foreach p, $(PACKAGES) $(PACKAGES_STAGE2),\ - $(GHC_CABAL_INPLACE) install \ + "$(GHC_CABAL_INPLACE)" install \ $(INSTALLED_GHC_PKG_REAL) \ $(INSTALLED_PACKAGE_CONF) \ libraries/$p dist-install \ - '$(DESTDIR)' '$(prefix)' '$(libdir)' '$(docdir)/libraries' &&) true - $(GHC_CABAL_INPLACE) install \ + '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' &&) true + "$(GHC_CABAL_INPLACE)" install \ $(INSTALLED_GHC_PKG_REAL) \ $(INSTALLED_PACKAGE_CONF) \ compiler stage2 \ - '$(DESTDIR)' '$(prefix)' '$(libdir)' '$(docdir)/libraries' + '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' # ----------------------------------------------------------------------------- # Binary distributions -$(eval $(call bindist,.,\ +# This is split in 2 because of the shell argument limit +$(eval $(call bindist,root1,\ LICENSE \ configure config.sub config.guess install-sh \ extra-gcc-opts.in \ @@ -752,32 +823,65 @@ $(eval $(call bindist,.,\ $(INSTALL_HEADERS) \ $(INSTALL_LIBEXECS) \ $(INSTALL_LIBEXEC_SCRIPTS) \ + $(INSTALL_TOPDIRS) \ + $(INSTALL_TOPDIR_SCRIPTS) \ $(INSTALL_BINS) \ + $(INSTALL_DOCS) \ + $(INSTALL_LIBRARY_DOCS) \ + )) +$(eval $(call bindist,root2,\ + $(addsuffix /*,$(INSTALL_HTML_DOC_DIRS)) \ + docs/index.html \ + $(wildcard libraries/*/dist-install/doc/) \ $(filter-out extra-gcc-opts,$(INSTALL_LIBS)) \ - $(filter-out %/project.mk,$(filter-out mk/config.mk,$(MAKEFILE_LIST))) \ + $(filter-out %/project.mk mk/config.mk %/mk/install.mk,$(MAKEFILE_LIST)) \ mk/fix_install_names.sh \ mk/project.mk \ + mk/install.mk.in \ + bindist.mk \ libraries/dph/LICENSE \ )) # mk/project.mk gets an absolute path, so we manually include it in # the bindist with a relative path +BIN_DIST_MK = $(BIN_DIST_NAME)/bindist.mk + binary-dist: - $(RM) -rf $(BIN_DIST_NAME) + "$(RM)" $(RM_OPTS) -r $(BIN_DIST_NAME) mkdir $(BIN_DIST_NAME) - set -e; for i in LICENSE compiler ghc rts libraries utils gmp docs libffi includes driver mk rules Makefile aclocal.m4 config.sub config.guess install-sh extra-gcc-opts.in ghc.mk inplace; do ln -s ../$$i $(BIN_DIST_NAME)/; done + set -e; for i in LICENSE compiler ghc rts libraries utils docs libffi includes driver mk rules Makefile aclocal.m4 config.sub config.guess install-sh extra-gcc-opts.in ghc.mk inplace; do ln -s ../$$i $(BIN_DIST_NAME)/; done + echo "HADDOCK_DOCS = $(HADDOCK_DOCS)" >> $(BIN_DIST_MK) + echo "LATEX_DOCS = $(LATEX_DOCS)" >> $(BIN_DIST_MK) + echo "BUILD_DOCBOOK_HTML = $(BUILD_DOCBOOK_HTML)" >> $(BIN_DIST_MK) + echo "BUILD_DOCBOOK_PS = $(BUILD_DOCBOOK_PS)" >> $(BIN_DIST_MK) + echo "BUILD_DOCBOOK_PDF = $(BUILD_DOCBOOK_PDF)" >> $(BIN_DIST_MK) ln -s ../distrib/configure-bin.ac $(BIN_DIST_NAME)/configure.ac cd $(BIN_DIST_NAME) && autoreconf - $(RM) -f $(BIN_DIST_TAR) + "$(RM)" $(RM_OPTS) $(BIN_DIST_TAR) # h means "follow symlinks", e.g. if aclocal.m4 is a symlink to a source # tree then we want to include the real file, not a symlink to it - $(TAR) hcf - -T $(BIN_DIST_LIST) | bzip2 -c >$(BIN_DIST_TAR_BZ2) + "$(TAR)" hcf - -T $(BIN_DIST_LIST) | bzip2 -c > $(BIN_DIST_TAR_BZ2) + +windows-binary-dist: + "$(RM)" $(RM_OPTS) -r $(BIN_DIST_NAME) + $(MAKE) prefix=$(BIN_DIST_DIR) install + "$(TAR)" cf - $(BIN_DIST_NAME) | bzip2 -c > $(BIN_DIST_TAR_BZ2) + +windows-installer: + "$(ISCC)" /O. /F$(WINDOWS_INSTALLER_BASE) - < distrib/ghc.iss nTimes = set -e; for i in `seq 1 $(1)`; do echo Try "$$i: $(2)"; if $(2); then break; fi; done .PHONY: publish-binary-dist publish-binary-dist: $(call nTimes,10,$(PublishCp) $(BIN_DIST_TAR_BZ2) $(PublishLocation)/dist) +ifeq "$(mingw32_TARGET_OS)" "1" + $(call nTimes,10,$(PublishCp) $(WINDOWS_INSTALLER) $(PublishLocation)/dist) +endif + +.PHONY: publish-docs +publish-docs: + $(call nTimes,10,$(PublishCp) -r bindisttest/installed/share/doc/ghc/* $(PublishLocation)/docs) # ----------------------------------------------------------------------------- # Source distributions @@ -807,13 +911,14 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME) # # Files to include in source distributions # -SRC_DIST_DIRS = mk rules docs distrib bindisttest gmp libffi includes utils docs rts compiler ghc driver libraries +SRC_DIST_DIRS = mk rules docs distrib bindisttest libffi includes utils docs rts compiler ghc driver libraries SRC_DIST_FILES += \ configure.ac config.guess config.sub configure \ aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \ - ghc.spec.in ghc.spec extra-gcc-opts.in VERSION boot ghc.mk + ghc.spec.in ghc.spec extra-gcc-opts.in VERSION \ + boot boot-pkgs packages ghc.mk -SRC_DIST_TARBALL = ghc-$(ProjectVersion)-src.tar.bz2 +SRC_DIST_TARBALL = $(SRC_DIST_NAME)-src.tar.bz2 VERSION : echo $(ProjectVersion) >VERSION @@ -826,7 +931,7 @@ sdist : VERSION # "stage2" is the dist dir. sdist_file = \ if test -f $(TOP)/$1/$2/build/$4.hs; then \ - $(CP) $(TOP)/$1/$2/build/$4.hs $1/$3/ ; \ + "$(CP)" $(TOP)/$1/$2/build/$4.hs $1/$3/ ; \ mv $1/$3/$4.$5 $1/$3/$4.$5.source ;\ else \ echo "does not exist: $1/$2//build/$4.hs"; \ @@ -835,14 +940,14 @@ sdist_file = \ .PHONY: sdist-prep sdist-prep : - $(RM) -rf $(SRC_DIST_DIR) - $(RM) $(SRC_DIST_NAME).tar.gz + "$(RM)" $(RM_OPTS) -r $(SRC_DIST_DIR) + "$(RM)" $(RM_OPTS) $(SRC_DIST_TARBALL) mkdir $(SRC_DIST_DIR) ( cd $(SRC_DIST_DIR) \ && for i in $(SRC_DIST_DIRS); do mkdir $$i; (cd $$i && lndir $(TOP)/$$i ); done \ && for i in $(SRC_DIST_FILES); do $(LN_S) $(TOP)/$$i .; done \ && $(MAKE) distclean \ - && if test -f $(TOP)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs; then $(CP) $(TOP)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs libraries/haskell-src/Language/Haskell/ ; mv libraries/haskell-src/Language/Haskell/Parser.ly libraries/haskell-src/Language/Haskell/Parser.ly.source ; fi \ + && if test -f $(TOP)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs; then "$(CP)" $(TOP)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs libraries/haskell-src/Language/Haskell/ ; mv libraries/haskell-src/Language/Haskell/Parser.ly libraries/haskell-src/Language/Haskell/Parser.ly.source ; fi \ && $(call sdist_file,compiler,stage2,cmm,CmmLex,x) \ && $(call sdist_file,compiler,stage2,cmm,CmmParse,y) \ && $(call sdist_file,compiler,stage2,main,ParsePkgConf,y) \ @@ -854,13 +959,13 @@ sdist-prep : && $(call sdist_file,utils/hpc,dist,,HpcParser,y) \ && $(call sdist_file,utils/genprimopcode,dist,,Lexer,x) \ && $(call sdist_file,utils/genprimopcode,dist,,Parser,y) \ - && $(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" -o -name "*-darcs-backup*" \) -print | xargs $(RM) -rf \ + && "$(RM)" $(RM_OPTS) -r 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" -o -name "*-darcs-backup*" \) -print | xargs "$(RM)" $(RM_OPTS) -r \ ) .PHONY: sdist sdist : sdist-prep - $(TAR) chf - $(SRC_DIST_NAME) 2>$src_log | bzip2 >$(TOP)/$(SRC_DIST_TARBALL) + "$(TAR)" chf - $(SRC_DIST_NAME) 2>$src_log | bzip2 >$(TOP)/$(SRC_DIST_TARBALL) sdist-manifest : $(SRC_DIST_TARBALL) tar tjf $(SRC_DIST_TARBALL) | sed "s|^ghc-$(ProjectVersion)/||" | sort >sdist-manifest @@ -873,7 +978,7 @@ publish-sdist : $(call nTimes,10,$(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist) endif -ifeq "$(GhcUnregisterised)" "YES" +ifeq "$(BootingFromUnregisterisedHc)" "YES" SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER -D__GLASGOW_HASKELL__=$(ProjectVersionInt) endif @@ -886,44 +991,69 @@ CLEAN_FILES += utils/ghc-pwd/ghc-pwd CLEAN_FILES += utils/ghc-pwd/ghc-pwd.exe CLEAN_FILES += utils/ghc-pwd/ghc-pwd.hi CLEAN_FILES += utils/ghc-pwd/ghc-pwd.o +CLEAN_FILES += libraries/bootstrapping.conf +CLEAN_FILES += libraries/integer-gmp/gmp/gmp.h +CLEAN_FILES += libraries/integer-gmp/gmp/libgmp.a +CLEAN_FILES += libraries/integer-gmp/cbits/GmpDerivedConstants.h +CLEAN_FILES += libraries/integer-gmp/cbits/mkGmpDerivedConstants + +clean : clean_files clean_libraries clean_gmp -clean : clean_files .PHONY: clean_files clean_files : - $(RM) $(CLEAN_FILES) - $(RM) -r $(patsubst %, libraries/%/dist, $(PACKAGES) $(PACKAGES_STAGE2)) - $(RM) -r $(patsubst %, libraries/%/dist-install, $(PACKAGES) $(PACKAGES_STAGE2)) - $(RM) -r $(patsubst %, libraries/%/dist-boot, $(PACKAGES) $(PACKAGES_STAGE2)) + "$(RM)" $(RM_OPTS) $(CLEAN_FILES) + +clean_gmp: + "$(RM)" $(RM_OPTS) -r libraries/integer-gmp/gmp/objs + "$(RM)" $(RM_OPTS) -r libraries/integer-gmp/gmp/gmpbuild + +.PHONY: clean_libraries +clean_libraries: $(patsubst %,clean_libraries/%_dist-install,$(PACKAGES) $(PACKAGES_STAGE2)) +clean_libraries: $(patsubst %,clean_libraries/%_dist-boot,$(BOOT_PKGS)) + +clean_libraries: + "$(RM)" $(RM_OPTS) -r $(patsubst %, libraries/%/dist, $(PACKAGES) $(PACKAGES_STAGE2)) + "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/*.buildinfo, $(PACKAGES) $(PACKAGES_STAGE2)) + +# We have to define a clean target for each library manually, because the +# libraries/*/ghc.mk files are not included when we're cleaning. +ifeq "$(CLEANING)" "YES" +$(foreach lib,$(PACKAGES) $(PACKAGES_STAGE2),\ + $(eval $(call clean-target,libraries/$(lib),dist-install,libraries/$(lib)/dist-install))) +endif distclean : clean - $(RM) config.cache config.status config.log mk/config.h mk/stamp-h - $(RM) mk/config.mk mk/are-validating.mk mk/project.mk - $(RM) extra-gcc-opts docs/users_guide/ug-book.xml - $(RM) compiler/ghc.cabal ghc/ghc-bin.cabal - $(RM) libraries/base/include/HsBaseConfig.h - $(RM) libraries/directory/include/HsDirectoryConfig.h - $(RM) libraries/process/include/HsProcessConfig.h - $(RM) libraries/unix/include/HsUnixConfig.h - $(RM) libraries/old-time/include/HsTimeConfig.h - $(RM) $(patsubst %, libraries/%/config.log, $(PACKAGES) $(PACKAGES_STAGE2)) - $(RM) $(patsubst %, libraries/%/config.status, $(PACKAGES) $(PACKAGES_STAGE2)) - $(RM) $(patsubst %, libraries/%/include/Hs*Config.h, $(PACKAGES) $(PACKAGES_STAGE2)) - $(RM) -r $(patsubst %, libraries/%/autom4te.cache, $(PACKAGES) $(PACKAGES_STAGE2)) + "$(RM)" $(RM_OPTS) config.cache config.status config.log mk/config.h mk/stamp-h + "$(RM)" $(RM_OPTS) mk/config.mk mk/are-validating.mk mk/project.mk + "$(RM)" $(RM_OPTS) mk/config.mk.old mk/project.mk.old + "$(RM)" $(RM_OPTS) extra-gcc-opts docs/users_guide/ug-book.xml + "$(RM)" $(RM_OPTS) compiler/ghc.cabal compiler/ghc.cabal.old + "$(RM)" $(RM_OPTS) ghc/ghc-bin.cabal + "$(RM)" $(RM_OPTS) libraries/base/include/HsBaseConfig.h + "$(RM)" $(RM_OPTS) libraries/directory/include/HsDirectoryConfig.h + "$(RM)" $(RM_OPTS) libraries/process/include/HsProcessConfig.h + "$(RM)" $(RM_OPTS) libraries/unix/include/HsUnixConfig.h + "$(RM)" $(RM_OPTS) libraries/old-time/include/HsTimeConfig.h + + "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/config.log, $(PACKAGES) $(PACKAGES_STAGE2)) + "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/config.status, $(PACKAGES) $(PACKAGES_STAGE2)) + "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/include/Hs*Config.h, $(PACKAGES) $(PACKAGES_STAGE2)) + "$(RM)" $(RM_OPTS) -r $(patsubst %, libraries/%/autom4te.cache, $(PACKAGES) $(PACKAGES_STAGE2)) maintainer-clean : distclean - $(RM) configure mk/config.h.in - $(RM) -r autom4te.cache libraries/*/autom4te.cache - $(RM) ghc.spec - $(RM) $(patsubst %, libraries/%/GNUmakefile, \ + "$(RM)" $(RM_OPTS) configure mk/config.h.in + "$(RM)" $(RM_OPTS) -r autom4te.cache libraries/*/autom4te.cache + "$(RM)" $(RM_OPTS) ghc.spec + "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/GNUmakefile, \ $(PACKAGES) $(PACKAGES_STAGE2)) - $(RM) $(patsubst %, libraries/%/ghc.mk, $(PACKAGES) $(PACKAGES_STAGE2)) - $(RM) $(patsubst %, libraries/%/configure, \ + "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/ghc.mk, $(PACKAGES) $(PACKAGES_STAGE2)) + "$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/configure, \ $(PACKAGES) $(PACKAGES_STAGE2)) - $(RM) libraries/base/include/HsBaseConfig.h.in - $(RM) libraries/directory/include/HsDirectoryConfig.h.in - $(RM) libraries/process/include/HsProcessConfig.h.in - $(RM) libraries/unix/include/HsUnixConfig.h.in - $(RM) libraries/old-time/include/HsTimeConfig.h.in + "$(RM)" $(RM_OPTS) libraries/base/include/HsBaseConfig.h.in + "$(RM)" $(RM_OPTS) libraries/directory/include/HsDirectoryConfig.h.in + "$(RM)" $(RM_OPTS) libraries/process/include/HsProcessConfig.h.in + "$(RM)" $(RM_OPTS) libraries/unix/include/HsUnixConfig.h.in + "$(RM)" $(RM_OPTS) libraries/old-time/include/HsTimeConfig.h.in .PHONY: all_libraries @@ -933,3 +1063,5 @@ bootstrapping-files: includes/ghcautoconf.h bootstrapping-files: includes/DerivedConstants.h bootstrapping-files: includes/GHCConstants.h +.DELETE_ON_ERROR: +