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

ruby-changes:69746

From: Hiroshi <ko1@a...>
Date: Tue, 16 Nov 2021 20:20:13 +0900 (JST)
Subject: [ruby-changes:69746] 84fdaaab46 (master): Ignore LUCENSE files of standard libraries for sync target

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

From 84fdaaab4605020103c77df7665556de0a02dad2 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@r...>
Date: Tue, 16 Nov 2021 20:10:43 +0900
Subject: Ignore LUCENSE files of standard libraries for sync target

---
 tool/sync_default_gems.rb | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
index 741216b9ed4..2bf505fd888 100755
--- a/tool/sync_default_gems.rb
+++ b/tool/sync_default_gems.rb
@@ -104,11 +104,19 @@ def sync_default_gems(gem) https://github.com/ruby/ruby/blob/trunk/tool/sync_default_gems.rb#L104
     cp_r(Dir.glob("#{upstream}/bundler/tool/bundler/rubocop_gems*"), "tool/bundler")
     cp_r(Dir.glob("#{upstream}/bundler/tool/bundler/standard_gems*"), "tool/bundler")
     rm_rf(%w[spec/bundler/support/artifice/vcr_cassettes])
-    rm_rf("lib/bundler/vendor/thor/LICENSE.md")
-    rm_rf("lib/rubygems/resolver/molinillo/LICENSE")
-    rm_rf("lib/bundler/vendor/molinillo/LICENSE")
-    rm_rf("lib/bundler/vendor/connection_pool/LICENSE")
-    rm_rf("lib/bundler/vendor/net-http-persistent/README.rdoc")
+    license_files = %w[
+      lib/bundler/vendor/thor/LICENSE.md
+      lib/rubygems/resolver/molinillo/LICENSE
+      lib/bundler/vendor/molinillo/LICENSE
+      lib/bundler/vendor/connection_pool/LICENSE
+      lib/bundler/vendor/net-http-persistent/README.rdoc
+      lib/bundler/vendor/fileutils/LICENSE.txt
+      lib/bundler/vendor/tsort/LICENSE.txt
+      lib/bundler/vendor/uri/LICENSE.txt
+      lib/rubygems/optparse/COPYING
+      lib/rubygems/tsort/LICENSE.txt
+    ]
+    rm_rf license_files
   when "rdoc"
     rm_rf(%w[lib/rdoc lib/rdoc.rb test/rdoc libexec/rdoc libexec/ri])
     cp_r(Dir.glob("#{upstream}/lib/rdoc*"), "lib")
-- 
cgit v1.2.1


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

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