summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml10
-rw-r--r--common.mk4
2 files changed, 9 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index f430dee61e..f00efeb8c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,6 +61,7 @@ cache:
ccache: true
directories:
- $HOME/config_2nd
+ - $HOME/.downloaded-cache
env:
global:
@@ -319,11 +320,14 @@ before_script:
- $SETARCH uname -r
- rm -fr .ext autom4te.cache
- echo $TERM
+ - |-
+ [ -d ~/.downloaded-cache ] ||
+ mkdir ~/.downloaded-cache
+ - ln -s ~/.downloaded-cache
- "> config.status"
- sed -f tool/prereq.status Makefile.in common.mk > Makefile
- - make update-config_files
- - make touch-unicode-files
- - make -s $JOBS srcs UNICODE_FILES=.
+ - make -s $JOBS update-download
+ - make -s $JOBS srcs
- rm config.status Makefile rbconfig.rb .rbconfig.time
- |-
if [ -d ~/config_2nd ]; then
diff --git a/common.mk b/common.mk
index 8758eb6ff3..eab8f9fd09 100644
--- a/common.mk
+++ b/common.mk
@@ -1221,7 +1221,7 @@ update-mspec:
update-rubyspec:
update-config_files: PHONY
- $(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb -d tool -e gnu \
+ $(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb -d tool --cache-dir=$(CACHE_DIR) -e gnu \
config.guess config.sub
update-gems: PHONY
@@ -1313,7 +1313,7 @@ UNICODE_EMOJI_FILES = \
$(UNICODE_SRC_EMOJI_DATA_DIR)/emoji-zwj-sequences.txt \
$(empty)
-update-unicode: $(UNICODE_FILES)
+update-unicode: $(UNICODE_FILES) $(UNICODE_PROPERTY_FILES)
CACHE_DIR = $(srcdir)/.downloaded-cache
UNICODE_DOWNLOAD = \