Merge "pjproject_bundled: raise timeout value used when downloading"
This commit is contained in:
commit
cd9ca7cf87
|
@ -28,7 +28,7 @@ WGET=@WGET@
|
||||||
FETCH=@FETCH@
|
FETCH=@FETCH@
|
||||||
DOWNLOAD=@DOWNLOAD@
|
DOWNLOAD=@DOWNLOAD@
|
||||||
DOWNLOAD_TO_STDOUT=@DOWNLOAD_TO_STDOUT@
|
DOWNLOAD_TO_STDOUT=@DOWNLOAD_TO_STDOUT@
|
||||||
DOWNLOAD_MAX_TIMEOUT=@DOWNLOAD_MAX_TIMEOUT@
|
DOWNLOAD_TIMEOUT=@DOWNLOAD_TIMEOUT@
|
||||||
SOUNDS_CACHE_DIR=@SOUNDS_CACHE_DIR@
|
SOUNDS_CACHE_DIR=@SOUNDS_CACHE_DIR@
|
||||||
EXTERNALS_CACHE_DIR=@EXTERNALS_CACHE_DIR@
|
EXTERNALS_CACHE_DIR=@EXTERNALS_CACHE_DIR@
|
||||||
RUBBER=@RUBBER@
|
RUBBER=@RUBBER@
|
||||||
|
|
|
@ -96,9 +96,9 @@ endef
|
||||||
|
|
||||||
define download_from_pjproject
|
define download_from_pjproject
|
||||||
($(SHELL_ECHO_PREFIX) Downloading $(TARBALL_URL) to $(TARBALL) ;\
|
($(SHELL_ECHO_PREFIX) Downloading $(TARBALL_URL) to $(TARBALL) ;\
|
||||||
$(DOWNLOAD_TO_STDOUT) $(call DOWNLOAD_TIMEOUT,5,10) $(TARBALL_URL) > $(TARBALL) &&\
|
$(DOWNLOAD_TO_STDOUT) $(call DOWNLOAD_TIMEOUT,5,60) $(TARBALL_URL) > $(TARBALL) &&\
|
||||||
$(SHELL_ECHO_PREFIX) Downloading $(PJPROJECT_URL)/MD5SUM to $(PJMD5SUM) &&\
|
$(SHELL_ECHO_PREFIX) Downloading $(PJPROJECT_URL)/MD5SUM to $(PJMD5SUM) &&\
|
||||||
$(DOWNLOAD_TO_STDOUT) $(call DOWNLOAD_TIMEOUT,5,10) $(PJPROJECT_URL)/MD5SUM.TXT > $(PJMD5SUM) &&\
|
$(DOWNLOAD_TO_STDOUT) $(call DOWNLOAD_TIMEOUT,5,60) $(PJPROJECT_URL)/MD5SUM.TXT > $(PJMD5SUM) &&\
|
||||||
$(verify_tarball))
|
$(verify_tarball))
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue