зеркало из https://github.com/github/ruby.git
rbinstall.rb: fix the position to expand files
As `spec.files` is used for `executables` and so on, the expanded list needs to be located at the same place.
This commit is contained in:
Родитель
c6b37cb169
Коммит
5894ea5954
|
@ -874,25 +874,25 @@ end
|
||||||
def load_gemspec(file, expanded = false)
|
def load_gemspec(file, expanded = false)
|
||||||
file = File.realpath(file)
|
file = File.realpath(file)
|
||||||
code = File.read(file, encoding: "utf-8:-")
|
code = File.read(file, encoding: "utf-8:-")
|
||||||
code.gsub!(/`git.*?`/m, '""')
|
code.gsub!(/(?:`git[^\`]*`|%x\[git[^\]]*\])\.split\(\"(?:\\.|[^\"])*\"\)/m) do
|
||||||
code.gsub!(/%x\[git.*?\]/m, '""')
|
files = []
|
||||||
|
if expanded
|
||||||
|
base = File.dirname(file)
|
||||||
|
Dir.glob("**/*", File::FNM_DOTMATCH, base: base) do |n|
|
||||||
|
next if n.start_with?(".git") # git related files are useless
|
||||||
|
case File.basename(n); when ".", ".."; next; end
|
||||||
|
next if File.directory?(File.join(base, n))
|
||||||
|
files << n.dump
|
||||||
|
end
|
||||||
|
end
|
||||||
|
"[" + files.join(", ") + "]"
|
||||||
|
end
|
||||||
spec = eval(code, binding, file)
|
spec = eval(code, binding, file)
|
||||||
unless Gem::Specification === spec
|
unless Gem::Specification === spec
|
||||||
raise TypeError, "[#{file}] isn't a Gem::Specification (#{spec.class} instead)."
|
raise TypeError, "[#{file}] isn't a Gem::Specification (#{spec.class} instead)."
|
||||||
end
|
end
|
||||||
spec.loaded_from = file
|
spec.loaded_from = file
|
||||||
|
|
||||||
# gather expanded bundled gem files
|
|
||||||
if expanded
|
|
||||||
base = File.dirname(file)
|
|
||||||
Dir.glob("**/*", File::FNM_DOTMATCH, base: base) do |n|
|
|
||||||
next if n.start_with?(".git") # git related files are useless
|
|
||||||
case File.basename(n); when ".", ".."; next; end
|
|
||||||
next if File.directory?(File.join(base, n))
|
|
||||||
spec.files << n
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
spec
|
spec
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче