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

superenv: move MacSystem into separate file

Browse Source 
This makes it requirable before superenv becomes active.
This commit is contained in:
Misty De Meo 2013-03-20 09:18:00 -05:00
parent 6486c94932
commit 5c746bf855
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Library/Homebrew/superenv.rb
View File

@ -1,5 +1,6 @@
require 'extend/ENV' require 'extend/ENV'
require 'macos' require 'macos'
require 'superenv/macsystem'
### Why `superenv`? ### Why `superenv`?
# 1) Only specify the environment we need (NO LDFLAGS for cmake) # 1) Only specify the environment we need (NO LDFLAGS for cmake)
@ -285,37 +286,3 @@ class Array
map(&:to_s).uniq.select{|s| File.directory? s }.join(':').chuzzle map(&:to_s).uniq.select{|s| File.directory? s }.join(':').chuzzle
end end
end end
# new code because I don't really trust the Xcode code now having researched it more
module MacSystem extend self
def xcode_clt_installed?
File.executable? "/usr/bin/clang" and File.executable? "/usr/bin/lldb"
end
def xcode43_without_clt?
MacOS::Xcode.version >= "4.3" and not MacSystem.xcode_clt_installed?
end
def x11_prefix
@x11_prefix ||= %W[/opt/X11 /usr/X11
#{MacOS.sdk_path}/usr/X11].find{|path| File.directory? "#{path}/include" }
end
def xcode43_developer_dir
@xcode43_developer_dir ||=
tst(ENV['DEVELOPER_DIR']) ||
tst(`xcode-select -print-path 2>/dev/null`) ||
tst("/Applications/Xcode.app/Contents/Developer") ||
MacOS.mdfind("com.apple.dt.Xcode").find{|path| tst(path) }
raise unless @xcode43_developer_dir
@xcode43_developer_dir
end
private
def tst prefix
prefix = prefix.to_s.chomp
xcrun = "#{prefix}/usr/bin/xcrun"
prefix if xcrun != "/usr/bin/xcrun" and File.executable? xcrun
end
end

33
Library/Homebrew/superenv/macsystem.rb Normal file
View File

@ -0,0 +1,33 @@
# new code because I don't really trust the Xcode code now having researched it more
module MacSystem extend self
def xcode_clt_installed?
File.executable? "/usr/bin/clang" and File.executable? "/usr/bin/lldb"
end
def xcode43_without_clt?
MacOS::Xcode.version >= "4.3" and not MacSystem.xcode_clt_installed?
end
def x11_prefix
@x11_prefix ||= %W[/opt/X11 /usr/X11
#{MacOS.sdk_path}/usr/X11].find{|path| File.directory? "#{path}/include" }
end
def xcode43_developer_dir
@xcode43_developer_dir ||=
tst(ENV['DEVELOPER_DIR']) ||
tst(`xcode-select -print-path 2>/dev/null`) ||
tst("/Applications/Xcode.app/Contents/Developer") ||
MacOS.mdfind("com.apple.dt.Xcode").find{|path| tst(path) }
raise unless @xcode43_developer_dir
@xcode43_developer_dir
end
private
def tst prefix
prefix = prefix.to_s.chomp
xcrun = "#{prefix}/usr/bin/xcrun"
prefix if xcrun != "/usr/bin/xcrun" and File.executable? xcrun
end
end