admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Improve archs_for_command

Browse Source 
* Work on commands or dylibs
* Use an extension for the list of arches
This commit is contained in:
Adam Vandenberg 2010-05-10 10:14:20 -07:00
parent 2563b32bb6
commit 5f4871ba9d
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Library/Homebrew/utils.rb
View File

@ -130,26 +130,33 @@ def gzip path
return Pathname.new(path+".gz") return Pathname.new(path+".gz")
end end
# Returns array of architectures that the given command is built for. module ArchitectureListExtension
def universal?
self.include? :i386 and self.include? :x86_64
end
end
# Returns array of architectures that the given command or library is built for.
def archs_for_command cmd def archs_for_command cmd
cmd = cmd.to_s # If we were passed a Pathname, turn it into a string. cmd = cmd.to_s # If we were passed a Pathname, turn it into a string.
cmd = `/usr/bin/which #{cmd}` unless Pathname.new(cmd).absolute? cmd = `/usr/bin/which #{cmd}` unless Pathname.new(cmd).absolute?
cmd.gsub! ' ', '\\ ' # Escape spaces in the filename. cmd.gsub! ' ', '\\ ' # Escape spaces in the filename.
IO.popen("/usr/bin/file #{cmd}").readlines.inject(%w[]) do |archs, line| archs = IO.popen("/usr/bin/file #{cmd}").readlines.inject([]) do |archs, line|
case line case line
when /Mach-O executable ppc/ when /Mach-O (executable|dynamically linked shared library) ppc/
archs << :ppc7400 archs << :ppc7400
when /Mach-O 64-bit executable ppc64/ when /Mach-O 64-bit (executable|dynamically linked shared library) ppc64/
archs << :ppc64 archs << :ppc64
when /Mach-O executable i386/ when /Mach-O (executable|dynamically linked shared library) i386/
archs << :i386 archs << :i386
when /Mach-O 64-bit executable x86_64/ when /Mach-O 64-bit (executable|dynamically linked shared library) x86_64/
archs << :x86_64 archs << :x86_64
else else
archs archs
end end
end end
archs.extend(ArchitectureListExtension)
end end
# String extensions added by inreplace below. # String extensions added by inreplace below.