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

ruby-changes:69749

From: Hiroshi <ko1@a...>
Date: Tue, 16 Nov 2021 20:20:20 +0900 (JST)
Subject: [ruby-changes:69749] 9a76072873 (master): Added LICENSE entry of vendored molinillo to LEGAL

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

From 9a76072873a0698038a87961b2fed31ac1485c64 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@r...>
Date: Tue, 16 Nov 2021 19:51:06 +0900
Subject: Added LICENSE entry of vendored molinillo to LEGAL

---
 LEGAL                     | 10 ++++++++++
 tool/sync_default_gems.rb |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/LEGAL b/LEGAL
index 8ee219d6930..dc4d7f9d99a 100644
--- a/LEGAL
+++ b/LEGAL
@@ -978,6 +978,16 @@ mentioned below. https://github.com/ruby/ruby/blob/trunk/LEGAL#L978
 
     {MIT License}[rdoc-label:label-MIT+License]
 
+[lib/rubygems/resolver/molinillo]
+[lib/bundler/vendor/molinillo]
+
+  molinillo is under the following license.
+
+  >>>
+    Copyright (c) 2014 Samuel E. Giddins segiddins@s...
+
+    {MIT License}[rdoc-label:label-MIT+License]
+
 [lib/did_you_mean]
 [lib/did_you_mean.rb]
 [test/did_you_mean]
diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
index 9b025fa4f6e..01585796d1c 100755
--- a/tool/sync_default_gems.rb
+++ b/tool/sync_default_gems.rb
@@ -105,6 +105,8 @@ def sync_default_gems(gem) https://github.com/ruby/ruby/blob/trunk/tool/sync_default_gems.rb#L105
     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")
   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/

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