X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=Makefile;h=ec0c901bfe412c7441b192418ba534e4b70bbe06;hp=e00a8445085c57d9a09e0ad8bf8a706f8c47ea21;hb=2eb04ca0f8d0ec72b417cddc60672c696b4a3daa;hpb=610379bc0660cc9df6bb8cfaa98e566157236026 diff --git a/Makefile b/Makefile index e00a844..ec0c901 100644 --- a/Makefile +++ b/Makefile @@ -59,12 +59,12 @@ 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 # Sanity check that all the core libraries are in the tree, to catch # failure to run darcs-all. @@ -85,7 +85,7 @@ check-packages : 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"; \ @@ -93,7 +93,7 @@ stage1 : check-packages $(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"; \ @@ -135,8 +135,9 @@ endif # Same as default rule, but we pass $(INSTALL_STAGE) to $(MAKE) too 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"; \ @@ -178,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"; \ @@ -210,24 +211,23 @@ 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-ghc -else -BinDistShScripts = -endif +BIN_DIST_TARBALL=ghc-$(ProjectVersion)-$(TARGETPLATFORM).tar.bz2 -BinDistPrlScripts = ghcprof -BinDistLibPrlScripts = ghc-asm ghc-split -BinDistBins = hp2ps runghc -BinDistLinks = ghc ghci ghc-pkg -BinDistLibSplicedFiles = package.conf -BinDistDirs = includes compiler docs driver rts utils +binary-dist:: + -rm -rf $(BIN_DIST_DIR) + -$(RM) $(BIN_DIST_DIR).tar.gz -BIN_DIST_NAME=ghc-$(ProjectVersion) -BIN_DIST_TOPDIR=$(FPTOOLS_TOP_ABS) -BIN_DIST_DIR=$(BIN_DIST_TOPDIR)/$(BIN_DIST_NAME) +ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" -BIN_DIST_TARBALL=ghc-$(ProjectVersion)-$(TARGETPLATFORM).tar.bz2 +binary-dist:: + $(MAKE) prefix=$(BIN_DIST_DIR) install + +binary-dist:: + cd $(BIN_DIST_DIR) && ../distrib/prep-bin-dist-mingw + +else + +BinDistDirs = includes compiler docs rts BIN_DIST_TOP= distrib/Makefile \ distrib/configure-bin.ac \ @@ -235,7 +235,6 @@ BIN_DIST_TOP= distrib/Makefile \ distrib/README \ ANNOUNCE \ LICENSE \ - utils/mkdirhier/mkdirhier \ install-sh \ config.guess \ config.sub \ @@ -247,29 +246,27 @@ endif .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_PRE_RULES) +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" - @false -endif - -rm -rf $(BIN_DIST_DIR) - -$(RM) $(BIN_DIST_DIR).tar.gz - $(MKDIRHIER) $(BIN_DIST_DIR)/bin/$(TARGETPLATFORM) + $(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_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 +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 @@ -284,41 +281,53 @@ binary-dist:: 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) + 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_DIR)/configure-bin.ac $(BIN_DIST_DIR)/configure.ac - ( cd $(BIN_DIST_DIR); autoconf ) + ( 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) - -# 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 +else +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 # XMLDocWays endif # BINDIST_DOC_WAYS @@ -332,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) \ @@ -341,67 +351,13 @@ $(BINARY_DIST_DOC_RULES): binary-dist-doc-%: datadir=$(BIN_DIST_DIR)/share endif -# Rename scripts to $i.prl and $i.sh where necessary. -# ToDo: do this in a cleaner way... - -ifneq "$(BinDistPrlScripts)" "" -binary-dist:: - @for i in $(BinDistPrlScripts); do \ - echo "Renaming $$i to $$i.prl"; \ - $(MV) $(BIN_DIST_DIR)/bin/$(TARGETPLATFORM)/$$i $(BIN_DIST_DIR)/bin/$(TARGETPLATFORM)/$$i.prl; \ - done -endif - -ifneq "$(BinDistLibPrlScripts)" "" -binary-dist:: - @for i in $(BinDistLibPrlScripts); do \ - echo "Renaming $$i to $$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_DIR)/bin/$(TARGETPLATFORM)/$$i ; then \ - echo "Renaming $$i to $$i.sh"; \ - $(MV) $(BIN_DIST_DIR)/bin/$(TARGETPLATFORM)/$$i $(BIN_DIST_DIR)/bin/$(TARGETPLATFORM)/$$i.sh; \ - fi \ - 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 {} \; +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 :: tar-binary-dist @@ -410,19 +366,46 @@ 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 :: 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\ +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 - $(PublishCp) -r $(BIN_DIST_DIR)/share/html/* $(PublishLocation)/docs +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!" @@ -449,7 +432,7 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME) # # Files to include in source distributions # -SRC_DIST_DIRS += mk 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 \ @@ -499,12 +482,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