diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-09 04:17:49 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-07-09 04:17:49 +0000 |
| commit | d0677cdb2cf6ebd87dc2939251454739e99cdc0c (patch) | |
| tree | 9e4ad60dec1d61b64b11acdc72d810e3e4df587b | |
| parent | 2abf6a3474e052e1ed1e7828a3c2b64198314379 (diff) | |
make-snapshot: touch-unicode-files for 2.4
* tool/make-snapshot (package): fallback touch-unicode-files for
2.4, which has been introduced to reduce downloads on CI.
[ruby-core:81972] [Bug #13734]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59289 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rwxr-xr-x | tool/make-snapshot | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tool/make-snapshot b/tool/make-snapshot index 983fa2ccef..96d8c1e950 100755 --- a/tool/make-snapshot +++ b/tool/make-snapshot @@ -330,7 +330,7 @@ def package(vcs, rev, destdir, tmp = nil) "ruby_version"=>version, } status.scan(/^s([%,])@([A-Za-z_][A-Za-z_0-9]*)@\1(.*?)\1g$/) do - vars[$2] = $3 + vars[$2] ||= $3 end vars["UNICODE_VERSION"] = $unicode_version if $unicode_version args = vars.dup @@ -340,11 +340,14 @@ def package(vcs, rev, destdir, tmp = nil) prereq: clean-cache $(CLEAN_CACHE) clean-cache $(CLEAN_CACHE): extract-gems -touch-unicode-files: +touch-unicode-files: _touch-unicode-files update-download:: touch-unicode-files update-download:: update-gems extract-gems: update-gems update-gems: +_touch-unicode-files: + $(MAKEDIRS) $(UNICODE_SRC_DATA_DIR) + touch $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time $(UNICODE_DATA_HEADERS) APPEND open(clean.add("Makefile"), "w") do |f| f.puts "prereq: update-download" |