fix locations for uploading src dists
[ghc-hetmet.git] / Makefile
index fbbf544..5bce2e6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -72,10 +72,15 @@ 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 'sh darcs-all get'?"; \
+            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
@@ -218,10 +223,6 @@ BinDistLinks = ghc ghci ghc-pkg
 BinDistLibSplicedFiles = package.conf
 BinDistDirs = includes compiler docs driver rts utils
 
-BIN_DIST_NAME=ghc-$(ProjectVersion)
-BIN_DIST_TOPDIR=$(FPTOOLS_TOP_ABS)
-BIN_DIST_DIR=$(BIN_DIST_TOPDIR)/$(BIN_DIST_NAME)
-
 BIN_DIST_TARBALL=ghc-$(ProjectVersion)-$(TARGETPLATFORM).tar.bz2
 
 BIN_DIST_TOP= distrib/Makefile \
@@ -290,30 +291,43 @@ binary-dist::
        @echo "Generating a shippable configure script.."
        $(MV) $(BIN_DIST_DIR)/configure-bin.ac $(BIN_DIST_DIR)/configure.ac
        ( cd $(BIN_DIST_DIR); autoconf )
+
+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
 
@@ -327,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) \
@@ -365,59 +380,68 @@ binary-dist::
        done
 endif
 
+.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
 
+.PHONY: fiddle-binary-dist
 fiddle-binary-dist:
-       cd $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) && ../distrib/prep-bin-dist-mingw
-.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 {} \;
-
+       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) )
 
+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 ::
-       $(MAKE) publish-binary-dist
+binary-dist :: publish-binary-dist
 endif
 
-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\
+.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::
        @echo "Mechanical and super-natty! Inspect the result and *if* happy; freeze, sell and get some sleep!"
 
@@ -493,12 +517,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