INSTALL_STAGE =
endif
+install-strip:
+ $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+
# Same as default rule, but we pass $(INSTALL_STAGE) to $(MAKE) too
install :: check-packages
@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
# -----------------------------------------------------------------------------
# Making a binary distribution
#
-# `dist' `binary-dist'
+# `dist' `binary-dist' `binary-dist-macos'
# Create a distribution tar file for this program. The tar file
# should be set up so that the file names in the tar file start with
# a subdirectory name which is the name of the package it is a
# that are in the distribution, to make sure they are up to date in
# the distribution. See Making Releases.
#
-# binary-dist is a GHC addition for binary distributions
+# binary-dist is a GHC addition for binary distributions and
+# binary-dist-macos is the Mac OS X-specific variant creating an
+# installer package for GHC.framework.
#
binary-dist::
-rm -rf $(BIN_DIST_DIR)
- -$(RM) $(BIN_DIST_DIR).tar.gz
+ -$(RM) $(BIN_DIST_TARBALL)
+
+# When making bindists, we can have problems if some things (e.g. ghc-pkg)
+# are compiled with the bootstrapping compiler and some (e.g. the stage 2
+# compiler) with the stage1 compiler. See #1860 for an example.
+# Thus we rebuild the utils with stage 1 here. This is a bit unpleasant,
+# as binary-dist really shouldn't actually build anything, but it works.
+# We need to do the same for utilities used during library package installation.
+binary-dist::
+ $(MAKE) -C utils clean
+ $(MAKE) -C utils UseStage1=YES boot
+ $(MAKE) -C utils UseStage1=YES
+ $(RM) -f libraries/ifBuildable/ifBuildable
+ $(MAKE) -C libraries UseStage1=YES ifBuildable/ifBuildable
+ $(RM) -f libraries/installPackage/installPackage
+ $(MAKE) -C libraries UseStage1=YES installPackage/installPackage
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
$(MAKE) prefix=$(BIN_DIST_DIR) install-docs
binary-dist::
- cd $(BIN_DIST_DIR) && ../distrib/prep-bin-dist-mingw
+ cd $(BIN_DIST_DIR) && $(SHELL) ../distrib/prep-bin-dist-mingw
binary-dist::
$(MKDIRHIER) $(BIN_DIST_DIR)/icons
BIN_DIST_TOP+=mk/fix_install_names.sh
endif
-.PHONY: binary-dist-pre% binary-dist binary-pack
+.PHONY: binary-dist-pre% binary-dist binary-dist-macos
binary-dist:: binary-dist-pre
.PHONY: tar-binary-dist
tar-binary-dist:
( cd $(BIN_DIST_TOPDIR_ABS); tar cf - $(BIN_DIST_NAME) | bzip2 >$(BIN_DIST_TARBALL) )
- ( cd $(BIN_DIST_TOPDIR_ABS); bunzip2 -c $(BIN_DIST_TARBALL) | tar tf - | sed "s/^ghc-$(ProjectVersion)/fptools/" | sort >bin-manifest-$(ProjectVersion) )
+ ( cd $(BIN_DIST_TOPDIR_ABS); bunzip2 -c $(BIN_DIST_TARBALL) | tar tf - | sed "s/^ghc-$(ProjectVersion)/fptools/" | sort >$(FPTOOLS_TOP_ABS)/bin-manifest-$(ProjectVersion) )
PUBLISH_FILES = $(BIN_DIST_TARBALL)
# Upload the distribution and documentation
ifneq "$(PublishLocation)" ""
-publish :: publish-binary-dist
+publish ::
+ make publish-binary-dist 'prefix=$(BIN_DIST_INST_DIR)'
endif
+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 ::
- @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 \
+ @for f in $(PUBLISH_FILES); \
+ do $(call nTimes,10,$(PublishCp) $$f $(PublishLocation)/dist); \
done
-# You need to first make binddisttest, and then run
-# make publish 'prefix=$(BIN_DIST_INST_DIR)'
-# for this to find the right place.
+# You need to "make binddisttest" before publishing the docs, as it
+# works by publish setting $(prefix) to inside the binddisttest
+# directory so $(docdir) points to the right place.
# We assume that Windows means Cygwin, as we can't just use docdir
# unchanged or rsync (really SSH?) thinks that c:/foo means /foo on
endif
publish-binary-dist ::
- $(PublishCp) -r $(PUBLISH_DOCDIR)/* $(PublishLocation)/docs
+ $(call nTimes,10,$(PublishCp) -r "$(PUBLISH_DOCDIR)"/* $(PublishLocation)/docs)
binary-dist::
@echo "Mechanical and super-natty! Inspect the result and *if* happy; freeze, sell and get some sleep!"
+ifeq "$(darwin_TARGET_OS)" "1"
+
+# Wrap a binary dist as a MacOS framework and put it into an installer package.
+
+# The ProjectVersionInt is GHC's idea of an API version and hence determines
+# the framework version.
+FRAMEWORK_VERSION = $(ProjectVersionInt)
+
+# Xcode requires CURRENT_PROJECT_VERSION to be an int or float. We use this
+# only as the build version (aka CFBundleVersion).
+CURRENT_PROJECT_VERSION = $(ProjectVersionInt).$(ProjectPatchLevel)
+
+# The user-visible CFBundleShortVersionString is set to the standard GHC
+# version number.
+SHORT_VERSION_STRING = $(ProjectVersion)
+
+# Instead of making 'binary-dist' a Makefile dependency, we let xcodebuild call
+# 'make binary-dist'. This has the advantage that xcode knows the framework
+# path into which the distribution should be installed and can instruct
+# binary-dist to put it into the right place without copying the whole tree yet
+# another time.
+#
+binary-dist-macos:
+ (cd distrib/MacOS; \
+ xcodebuild CURRENT_PROJECT_VERSION=$(CURRENT_PROJECT_VERSION)\
+ SHORT_VERSION_STRING=$(SHORT_VERSION_STRING)\
+ FRAMEWORK_VERSION=$(FRAMEWORK_VERSION)\
+ CURRENT_LIBRARY_VERSION=$(FRAMEWORK_VERSION))
+ (cd distrib/MacOS; \
+ !!!Call the packager!!! )
+
+endif
+
# -----------------------------------------------------------------------------
# Building source distributions
#
projects / ghc-hetmet.git / blobdiff