[前][次][番号順一覧][スレッド一覧]

ruby-changes:47174

From: nobu <ko1@a...>
Date: Sun, 9 Jul 2017 13:18:05 +0900 (JST)
Subject: [ruby-changes:47174] nobu:r59289 (trunk): make-snapshot: touch-unicode-files for 2.4

nobu	2017-07-09 13:17:49 +0900 (Sun, 09 Jul 2017)

  New Revision: 59289

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=59289

  Log:
    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]

  Modified files:
    trunk/tool/make-snapshot
Index: tool/make-snapshot
===================================================================
--- tool/make-snapshot	(revision 59288)
+++ tool/make-snapshot	(revision 59289)
@@ -330,7 +330,7 @@ def package(vcs, rev, destdir, tmp = nil https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L330
         "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 https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L340
 
 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"

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]