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

add Xcode version to brew --config

Browse Source
This commit is contained in:
Adam Vandenberg 2010-10-01 21:08:42 -07:00
parent 05d7c0cae0
commit b9dc3c6527
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Library/Homebrew/brew.h.rb
View File

@ -579,6 +579,11 @@ def llvm_build
end end
end end
def xcode_version
`xcodebuild -version 2>&1` =~ /Xcode (\d(\.\d)*)/
return $1 ? $1 : nil
end
def _compiler_recommendation build, recommended def _compiler_recommendation build, recommended
message = (!build.nil? && build < recommended) ? "(#{recommended} or newer recommended)" : "" message = (!build.nil? && build < recommended) ? "(#{recommended} or newer recommended)" : ""
return build, message return build, message

2
bin/brew
View File

@ -49,6 +49,7 @@ def dump_config
llvm, llvm_msg = _compiler_recommendation llvm_build, RECOMMENDED_LLVM llvm, llvm_msg = _compiler_recommendation llvm_build, RECOMMENDED_LLVM
gcc_42, gcc_42_msg = _compiler_recommendation gcc_42_build, RECOMMENDED_GCC_42 gcc_42, gcc_42_msg = _compiler_recommendation gcc_42_build, RECOMMENDED_GCC_42
gcc_40, gcc_40_msg = _compiler_recommendation gcc_40_build, RECOMMENDED_GCC_40 gcc_40, gcc_40_msg = _compiler_recommendation gcc_40_build, RECOMMENDED_GCC_40
xcode = xcode_version || "?"
puts <<-EOS puts <<-EOS
HOMEBREW_VERSION: #{HOMEBREW_VERSION} HOMEBREW_VERSION: #{HOMEBREW_VERSION}
@ -62,6 +63,7 @@ OS X: #{MACOS_FULL_VERSION}
Kernel Architecture: #{kernel_arch} Kernel Architecture: #{kernel_arch}
Ruby: #{RUBY_VERSION}-#{RUBY_PATCHLEVEL} Ruby: #{RUBY_VERSION}-#{RUBY_PATCHLEVEL}
/usr/bin/ruby => #{system_ruby.realpath} /usr/bin/ruby => #{system_ruby.realpath}
Xcode: #{xcode}
GCC-4.0: #{gcc_40 ? "build #{gcc_40}" : "N/A"} #{gcc_42_msg} GCC-4.0: #{gcc_40 ? "build #{gcc_40}" : "N/A"} #{gcc_42_msg}
GCC-4.2: #{gcc_42 ? "build #{gcc_42}" : "N/A"} #{gcc_40_msg} GCC-4.2: #{gcc_42 ? "build #{gcc_42}" : "N/A"} #{gcc_40_msg}
LLVM: #{llvm ? "build #{llvm}" : "N/A" } #{llvm_msg} LLVM: #{llvm ? "build #{llvm}" : "N/A" } #{llvm_msg}