# 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!"