mirror of
https://github.com/RIOT-OS/RIOT.git
synced 2025-12-15 17:43:51 +01:00
makefiles: remove DOWNLOAD_TO_STDOUT
This commit is contained in:
parent
753ec00f29
commit
399a2bccb0
@ -333,28 +333,7 @@ APPLICATION := $(strip $(APPLICATION))
|
|||||||
|
|
||||||
# provide common external programs for `Makefile.include`s
|
# provide common external programs for `Makefile.include`s
|
||||||
|
|
||||||
ifeq (,$(and $(DOWNLOAD_TO_STDOUT),$(DOWNLOAD_TO_FILE)))
|
DOWNLOAD_TO_FILE ?= $(DLCACHE)
|
||||||
ifeq (,$(WGET))
|
|
||||||
ifeq (0,$(shell which wget > /dev/null 2>&1 ; echo $$?))
|
|
||||||
WGET = $(call memoized,WGET,$(shell which wget))
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
ifeq (,$(CURL))
|
|
||||||
ifeq (0,$(shell which curl > /dev/null 2>&1 ; echo $$?))
|
|
||||||
CURL = $(call memoized,CURL,$(shell which curl))
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
ifeq (,$(WGET)$(CURL))
|
|
||||||
$(warning Neither wget nor curl is installed!)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq (,$(DOWNLOAD_TO_STDOUT))
|
|
||||||
DOWNLOAD_TO_STDOUT ?= $(if $(CURL),$(CURL) -s,$(WGET) -q -O-)
|
|
||||||
endif
|
|
||||||
ifeq (,$(DOWNLOAD_TO_FILE))
|
|
||||||
DOWNLOAD_TO_FILE ?= $(DLCACHE)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq (,$(UNZIP_HERE))
|
ifeq (,$(UNZIP_HERE))
|
||||||
ifeq (0,$(shell which unzip > /dev/null 2>&1 ; echo $$?))
|
ifeq (0,$(shell which unzip > /dev/null 2>&1 ; echo $$?))
|
||||||
|
|||||||
@ -110,8 +110,9 @@ info-build:
|
|||||||
@echo 'DEBUGGER: $(DEBUGGER)'
|
@echo 'DEBUGGER: $(DEBUGGER)'
|
||||||
@echo 'DEBUGGER_FLAGS: $(DEBUGGER_FLAGS)'
|
@echo 'DEBUGGER_FLAGS: $(DEBUGGER_FLAGS)'
|
||||||
@echo
|
@echo
|
||||||
|
@echo 'DLCACHE: $(DLCACHE)'
|
||||||
|
@echo 'DLCACHE_DIR: $(DLCACHE_DIR)'
|
||||||
@echo 'DOWNLOAD_TO_FILE: $(DOWNLOAD_TO_FILE)'
|
@echo 'DOWNLOAD_TO_FILE: $(DOWNLOAD_TO_FILE)'
|
||||||
@echo 'DOWNLOAD_TO_STDOUT: $(DOWNLOAD_TO_STDOUT)'
|
|
||||||
@echo 'UNZIP_HERE: $(UNZIP_HERE)'
|
@echo 'UNZIP_HERE: $(UNZIP_HERE)'
|
||||||
@echo ''
|
@echo ''
|
||||||
@echo 'DEBUGSERVER: $(DEBUGSERVER)'
|
@echo 'DEBUGSERVER: $(DEBUGSERVER)'
|
||||||
|
|||||||
@ -128,10 +128,14 @@ export DEVELHELP # Set to 1 to spend ROM, RAM and CPU time for help
|
|||||||
# USE_PROGRAMMER_WRAPPER_SCRIPT # Use the programmer wrapper Python script. Default is 0 (wrapper not used).
|
# USE_PROGRAMMER_WRAPPER_SCRIPT # Use the programmer wrapper Python script. Default is 0 (wrapper not used).
|
||||||
|
|
||||||
|
|
||||||
export DLCACHE # directory used to cache http downloads
|
export DLCACHE # Use `$(DLCACHE) $(DESTINATION) $(URL) [$(SHA512)]` to
|
||||||
export DOWNLOAD_TO_FILE # Use `$(DOWNLOAD_TO_FILE) $(DESTINATION) $(URL)` to download `$(URL)` to `$(DESTINATION)`.
|
# download `$(URL)` to `$(DESTINATION)` but keep a copy in cache
|
||||||
export DOWNLOAD_TO_STDOUT # Use `$(DOWNLOAD_TO_STDOUT) $(URL)` to download `$(URL)` output `$(URL)` to stdout, e.g. to be piped into `tar xz`.
|
# with an `$(SHA512)` checksum. If no checksum is given, the
|
||||||
export UNZIP_HERE # Use `cd $(SOME_FOLDER) && $(UNZIP_HERE) $(SOME_FILE)` to extract the contents of the zip file `$(SOME_FILE)` into `$(SOME_FOLDER)`.
|
# URL will just be downloaded, not cached.
|
||||||
|
export DOWNLOAD_TO_FILE # Use `$(DOWNLOAD_TO_FILE) $(DESTINATION) $(URL) [$(SHA512)]` to
|
||||||
|
# download `$(URL)` to `$(DESTINATION)`. Alias for $(DLCACHE).
|
||||||
|
export UNZIP_HERE # Use `cd $(SOME_FOLDER) && $(UNZIP_HERE) $(SOME_FILE)` to extract
|
||||||
|
# the contents of the zip file `$(SOME_FILE)` into `$(SOME_FOLDER)`.
|
||||||
|
|
||||||
export LAZYSPONGE # Command saving stdin to a file only on content update.
|
export LAZYSPONGE # Command saving stdin to a file only on content update.
|
||||||
export LAZYSPONGE_FLAGS # Parameters supplied to LAZYSPONGE.
|
export LAZYSPONGE_FLAGS # Parameters supplied to LAZYSPONGE.
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user