ruby-changes:69742
From: Hiroshi <ko1@a...>
Date: Tue, 16 Nov 2021 19:42:48 +0900 (JST)
Subject: [ruby-changes:69742] 018266ca38 (master): Merge digest-3.0.3.pre3 and https://github.com/ruby/digest/commit/efd76821b8a467c193c753104c29b476debbb2c9
https://git.ruby-lang.org/ruby.git/commit/?id=018266ca38 From 018266ca387eacd1f149141717104f57ab86cccd Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA <hsbt@r...> Date: Tue, 16 Nov 2021 19:42:20 +0900 Subject: Merge digest-3.0.3.pre3 and https://github.com/ruby/digest/commit/efd76821b8a467c193c753104c29b476debbb2c9 --- ext/digest/digest.gemspec | 6 ++++-- ext/digest/extconf.rb | 4 ---- ext/digest/install_headers.rb | 13 +++++++++++++ ext/digest/lib/digest.rb | 1 + ext/digest/lib/digest/version.rb | 5 +++++ tool/sync_default_gems.rb | 1 + 6 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 ext/digest/install_headers.rb create mode 100644 ext/digest/lib/digest/version.rb diff --git a/ext/digest/digest.gemspec b/ext/digest/digest.gemspec index 7a4291c7ca9..d27d82148c1 100644 --- a/ext/digest/digest.gemspec +++ b/ext/digest/digest.gemspec @@ -1,9 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ext/digest/digest.gemspec#L1 # coding: utf-8 # frozen_string_literal: true +require_relative 'lib/digest/version' + Gem::Specification.new do |spec| spec.name = "digest" - spec.version = "3.1.0.pre2" + spec.version = Digest::VERSION spec.authors = ["Akinori MUSHA"] spec.email = ["knu@i..."] @@ -31,7 +33,7 @@ Gem::Specification.new do |spec| https://github.com/ruby/ruby/blob/trunk/ext/digest/digest.gemspec#L33 else spec.extensions = Dir["ext/digest/**/extconf.rb"] - spec.files += Dir["ext/digest/**/*.{rb,c,h,sh}"] + spec.files += Dir["ext/digest/**/{*.{rb,c,h,sh},depend}"] spec.require_paths = %w[lib] end diff --git a/ext/digest/extconf.rb b/ext/digest/extconf.rb index a8c68850a29..ba2c7b671fb 100644 --- a/ext/digest/extconf.rb +++ b/ext/digest/extconf.rb @@ -4,8 +4,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/digest/extconf.rb#L4 require "mkmf" -$INSTALLFILES = { - "digest.h" => "$(HDRDIR)" -} - create_makefile("digest") diff --git a/ext/digest/install_headers.rb b/ext/digest/install_headers.rb new file mode 100644 index 00000000000..0dd80221071 --- /dev/null +++ b/ext/digest/install_headers.rb @@ -0,0 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ext/digest/install_headers.rb#L1 +require "fileutils" + +*files, dest = ARGV + +if File.exist?(File.join(dest, "ruby.h")) + warn "installing header files" + + files.each { |file| + FileUtils.install file, dest, mode: 0644, verbose: true + } +else + warn "not installing header files when installed as an external library" +end diff --git a/ext/digest/lib/digest.rb b/ext/digest/lib/digest.rb index c89590ee534..e995adb4501 100644 --- a/ext/digest/lib/digest.rb +++ b/ext/digest/lib/digest.rb @@ -12,6 +12,7 @@ if defined?(Digest) && https://github.com/ruby/ruby/blob/trunk/ext/digest/lib/digest.rb#L12 return end +require 'digest/version' require 'digest/loader' module Digest diff --git a/ext/digest/lib/digest/version.rb b/ext/digest/lib/digest/version.rb new file mode 100644 index 00000000000..ed5a5bf1aa1 --- /dev/null +++ b/ext/digest/lib/digest/version.rb @@ -0,0 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ext/digest/lib/digest/version.rb#L1 +# frozen_string_literal: true + +module Digest + VERSION = "3.1.0.pre3" +end diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index e91f47b24ea..bd25d7b75b3 100755 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -320,6 +320,7 @@ def sync_default_gems(gem) https://github.com/ruby/ruby/blob/trunk/tool/sync_default_gems.rb#L320 cp_r("#{upstream}/ext/digest", "ext") mkdir_p("ext/digest/lib/digest") cp_r("#{upstream}/lib/digest.rb", "ext/digest/lib/") + cp_r("#{upstream}/lib/digest/version.rb", "ext/digest/lib/digest/") mkdir_p("ext/digest/sha2/lib") cp_r("#{upstream}/lib/digest/sha2.rb", "ext/digest/sha2/lib") move("ext/digest/lib/digest/sha2", "ext/digest/sha2/lib") -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/