From 8ba0292cd9299e415bc9c2c2a3307d61177f0cf5 Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Tue, 20 Feb 2018 14:27:27 +0100 Subject: Necessary programs checked at configure time The mandatory and optional (for example downloader) dependencies are now checked at configure time so users can know what they may be missing before the processing starts. Since its recommended to be run in parallel, it can be hard to find what you are missing after running the pipeline. As part of these checks, the program to use for downloading is now also set at configure time, it is only used as a pre-defined (in `LOCAL.mk') variable during Make's processing. A small title was also added to discus the pipeline architecture that will be filled in the next commit. --- reproduce/src/make/download.mk | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'reproduce/src/make') diff --git a/reproduce/src/make/download.mk b/reproduce/src/make/download.mk index 244bd04..378e5eb 100644 --- a/reproduce/src/make/download.mk +++ b/reproduce/src/make/download.mk @@ -24,22 +24,6 @@ -# Identify the downloader tool -# ---------------------------- -# -# If cURL is already present, that will be used, otherwise, we'll use -# Wget. Since the options specifying the output filename are different -# between the two, we'll also specify the output option within the -# `downloader' variable. So it is important to first give the output -# filename after calling `downloader', then the web address. -downloader := $(shell if type curl > /dev/null; then downloader="curl -o"; \ - else downloader="wget -O"; \ - fi; echo "$$downloader"; ) - - - - - # Download SURVEY data # -------------------- # @@ -52,7 +36,7 @@ all-survey = $(foreach f, $(filters-survey), \ $(SURVEY)/a-possibly-additional-$(f)-format.fits ) $(SURVEY):; mkdir $@ $(all-survey): $(SURVEY)/%: | $(SURVEY) $(lockdir) - flock $(lockdir)/download -c "$(downloader) $@ $(web-survey)/$*" + flock $(lockdir)/download -c "$(DOWNLOADER) $@ $(web-survey)/$*" -- cgit v1.2.1