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

ruby-changes:58514

From: Hiroshi <ko1@a...>
Date: Thu, 31 Oct 2019 10:20:23 +0900 (JST)
Subject: [ruby-changes:58514] c38ba75780 (master): Fixed the sync task for json

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

From c38ba75780c4641816a8090629d1b5eea22fd137 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@r...>
Date: Thu, 31 Oct 2019 10:18:57 +0900
Subject: Fixed the sync task for json

  * Ignode to change ext/json/depend
  * Fixed to ignore json_pure files

diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
index 140cf37..f2e61f6 100644
--- a/tool/sync_default_gems.rb
+++ b/tool/sync_default_gems.rb
@@ -112,10 +112,9 @@ def sync_default_gems(gem) https://github.com/ruby/ruby/blob/trunk/tool/sync_default_gems.rb#L112
     cp_r("#{upstream}/ext/json/ext", "ext/json")
     cp_r("#{upstream}/tests", "test/json")
     cp_r("#{upstream}/lib", "ext/json")
-    rm_rf(%[ext/json/lib/json/pure*])
     cp_r("#{upstream}/json.gemspec", "ext/json")
-    rm_rf(%w[ext/json/lib/json/ext])
-    `git checkout ext/json/extconf.rb ext/json/parser/prereq.mk ext/json/generator/depend ext/json/parser/depend`
+    rm_rf(%w[ext/json/lib/json/ext ext/json/lib/json/pure.rb ext/json/lib/json/pure])
+    `git checkout ext/json/extconf.rb ext/json/parser/prereq.mk ext/json/generator/depend ext/json/parser/depend ext/json/depend`
   when "psych"
     rm_rf(%w[ext/psych test/psych])
     cp_r("#{upstream}/ext/psych", "ext")
-- 
cgit v0.10.2


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

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