Merge digest-3.0.3.pre3 and https://github.com/ruby/digest/commit/efd76821b8a467c193c753104c29b476debbb2c9

6 files changed, 24 insertions, 6 deletions

diff --git a/ext/digest/digest.gemspec b/ext/digest/digest.gemspec
index 7a4291c7ca..d27d82148c 100644
--- a/ext/digest/digest.gemspec
+++ b/ext/digest/digest.gemspec
@@ -1,9 +1,11 @@
 # 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         = ["[email protected]"]
 
@@ -31,7 +33,7 @@ Gem::Specification.new do |spec|
   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 a8c68850a2..ba2c7b671f 100644
--- a/ext/digest/extconf.rb
+++ b/ext/digest/extconf.rb
@@ -4,8 +4,4 @@
 
 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 0000000000..0dd8022107
--- /dev/null
+++ b/ext/digest/install_headers.rb
@@ -0,0 +1,13 @@
+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 c89590ee53..e995adb450 100644
--- a/ext/digest/lib/digest.rb
+++ b/ext/digest/lib/digest.rb
@@ -12,6 +12,7 @@ if defined?(Digest) &&
   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 0000000000..ed5a5bf1aa
--- /dev/null
+++ b/ext/digest/lib/digest/version.rb
@@ -0,0 +1,5 @@
+# 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 e91f47b24e..bd25d7b75b 100755
--- a/tool/sync_default_gems.rb
+++ b/tool/sync_default_gems.rb
@@ -320,6 +320,7 @@ def sync_default_gems(gem)
     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")