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

Clean up --config output

Browse Source 
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
Jack Nagel 2012-06-25 20:11:45 -05:00
parent ef65f3654f
commit 9189258a9e
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Library/Homebrew/cmd/--config.rb
View File

@ -27,19 +27,20 @@ module Homebrew extend self
def describe_xcode
@describe_xcode ||= begin
xcode = MacOS.xcode_version
if MacOS.xcode_installed?
xcode += " in '#{MacOS.xcode_prefix}'" unless MacOS.xcode_prefix.to_s == '/Applications/Xcode.app/Contents/Developer'
else
xcode += ' (guessed)' unless MacOS.xcode_installed?
end
xcode += ", CLT #{MacOS.clt_version}" if MacOS.clt_installed?
xcode
default_prefix = case MacOS.version
when 10.5, 10.6 then '/Developer'
else '/Applications/Xcode.app/Contents/Developer'
end
guess = '(guessed)' unless MacOS.xcode_installed?
prefix = "=> #{MacOS.xcode_prefix}" unless MacOS.xcode_prefix.to_s == default_prefix
[MacOS.xcode_version, guess, prefix].compact.join(' ')
end
end
def describe_default_sdk
@describe_default_sdk ||= if MacOS.sdk_path.nil? then "N/A" else MacOS.sdk_path end
def describe_clt
@describe_clt ||= if MacOS.clt_installed? then MacOS.clt_version else 'N/A' end
end
def sha
@ -102,7 +103,7 @@ module Homebrew extend self
puts "HOMEBREW_PREFIX: #{HOMEBREW_PREFIX}" if HOMEBREW_PREFIX.to_s != "/usr/local"
puts "HOMEBREW_CELLAR: #{HOMEBREW_CELLAR}" if HOMEBREW_CELLAR.to_s != "#{HOMEBREW_PREFIX}/Cellar"
puts hardware
puts "MacOS: #{MACOS_FULL_VERSION}-#{kernel}"
puts "OS X: #{MACOS_FULL_VERSION}-#{kernel}"
puts "Xcode: #{describe_xcode}"
puts "/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin/ruby:\n #{RUBY_VERSION}-#{RUBY_PATCHLEVEL}" if RUBY_VERSION.to_f != 1.8
@ -113,15 +114,20 @@ module Homebrew extend self
puts "X11: #{x11}" unless x11 == "/usr/X11"
end
def config_s; <<-EOS.undent
def config_s
config_s = <<-EOS.undent
HOMEBREW_VERSION: #{HOMEBREW_VERSION}
HEAD: #{sha}
HOMEBREW_PREFIX: #{HOMEBREW_PREFIX}
HOMEBREW_CELLAR: #{HOMEBREW_CELLAR}
#{hardware}
OS X: #{MACOS_FULL_VERSION}
Kernel Architecture: #{kernel}
OS X: #{MACOS_FULL_VERSION}-#{kernel}
Xcode: #{describe_xcode}
EOS
config_s << "CLT: #{describe_clt}\n" if MacOS.xcode_version.to_f >= 4.3
config_s << <<-EOS.undent
GCC-4.0: #{gcc_40 ? "build #{gcc_40}" : "N/A"}
GCC-4.2: #{gcc_42 ? "build #{gcc_42}" : "N/A"}
LLVM: #{llvm ? "build #{llvm}" : "N/A"}