projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FIX #1767 :show documentation claimed too much
[ghc-hetmet.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
81437ac
..
6643151
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-256,10
+256,15
@@
binary-dist::
# 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.
# 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
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"
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
@@
-380,21
+385,21
@@
endif
# Upload the distribution and documentation
ifneq "$(PublishLocation)" ""
# Upload the distribution and documentation
ifneq "$(PublishLocation)" ""
-publish :: publish-binary-dist
+publish ::
+ make publish-binary-dist 'prefix=$(BIN_DIST_INST_DIR)'
endif
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 ::
.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
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
# 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
@@
-407,7
+412,7
@@
PUBLISH_DOCDIR = $(docdir)
endif
publish-binary-dist ::
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!"
binary-dist::
@echo "Mechanical and super-natty! Inspect the result and *if* happy; freeze, sell and get some sleep!"