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

ruby-changes:57636

From: Nobuyoshi <ko1@a...>
Date: Sat, 7 Sep 2019 12:35:18 +0900 (JST)
Subject: [ruby-changes:57636] d783609ac3 (master): Get rid of overwriting revision.h and creating .revision.time

https://git.ruby-lang.org/ruby.git/commit/?id=d783609ac3

From d783609ac3b2901eb664dd37f964c8fd805dca40 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Sat, 7 Sep 2019 11:33:26 +0900
Subject: Get rid of overwriting revision.h and creating .revision.time


diff --git a/tool/make-snapshot b/tool/make-snapshot
index 7beca8c..7bdfcd7 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -437,7 +437,7 @@ def package(vcs, rev, destdir, tmp = nil) https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L437
       vars["UNICODE_VERSION"] = $unicode_version if $unicode_version
       args = vars.dup
       mk.gsub!(/@([A-Za-z_]\w*)@/) {args.delete($1); vars[$1] || ENV[$1]}
-      mk << commonmk.gsub(/\{\$([^(){}]*)[^{}]*\}/, "")
+      mk << commonmk.gsub(/\{\$([^(){}]*)[^{}]*\}/, "").sub(/^revision\.tmp::$/, '\& Makefile')
       mk << <<-'APPEND'
 
 update-download:: touch-unicode-files after-update
@@ -456,6 +456,8 @@ after-update:: https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L456
       open(clean.add("Makefile"), "w") do |f|
         f.puts mk
       end
+      File.open(clean.add("revision.tmp"), "w") {}
+      File.open(clean.add(".revision.time"), "w") {}
       ENV["CACHE_SAVE"] = "no"
       make = ENV["MAKE"] || ENV["make"] || "make"
       args = args.map {|arg| arg.join("=")}
-- 
cgit v0.10.2


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

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