mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

keg: allow selective linking at the file level

Browse Source 
Some parts of a keg's tree are not subject to the cleaner, and sometimes
we still want to remove things in directories marked skip_clean; this
allows us that freedom.

If 'lib' is marked skip_clean, we still want to avoid linking the
charset.alias file into the top of the tree. The same needs to be done
for the locale.alias file in share/locale.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
Jack Nagel 2012-02-26 19:28:46 -06:00
parent f7d7fb1e81
commit 01994c7be1
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cleaner.rb
View File

@ -78,8 +78,6 @@ class Cleaner
elsif path.extname == '.la'
# *.la files are stupid
path.unlink unless @f.skip_clean? path
elsif path == @f.lib+'charset.alias'
path.unlink unless @f.skip_clean? path
elsif not path.symlink?
clean_file path
end

32
Library/Homebrew/keg.rb
View File

@ -9,7 +9,7 @@ class Keg < Pathname
# locale-specific directories have the form language[_territory][.codeset][@modifier]
LOCALEDIR_RX = /(locale|man)\/([a-z]{2}|C|POSIX)(_[A-Z]{2})?(\.[a-zA-Z\-0-9]+(@.+)?)?/
INFOFILE_RX = %r[/share/info/[^.].*?\.info$]
INFOFILE_RX = %r[info/[^.].*?\.info$]
# if path is a file in a keg then this will return the containing Keg object
def self.for path
@ -68,20 +68,23 @@ class Keg < Pathname
# yeah indeed, you have to force anything you need in the main tree into
# these dirs REMEMBER that *NOT* everything needs to be in the main tree
link_dir('etc') {:mkpath}
link_dir('bin') {:skip}
link_dir('sbin') {:link}
link_dir('bin') { |path| :skip if path.directory? }
link_dir('sbin') { |path| :skip if path.directory? }
link_dir('include') {:link}
link_dir('share') do |path|
if path.to_s =~ LOCALEDIR_RX
:mkpath
elsif share_mkpaths.include? path.to_s
:mkpath
case path.to_s
when 'locale/locale.alias' then :skip
when INFOFILE_RX then :info if ENV['HOMEBREW_KEEP_INFO']
when LOCALEDIR_RX then :mkpath
when *share_mkpaths then :mkpath
else :link
end
end
link_dir('lib') do |path|
case path.to_s
when 'charset.alias' then :skip
# pkg-config database gets explicitly created
when 'pkgconfig' then :mkpath
# lib/language folders also get explicitly created
@ -131,10 +134,17 @@ protected
dst.extend ObserverPathnameExtension
if src.file?
# Do the symlink.
dst.make_relative_symlink src unless File.basename(src) == '.DS_Store'
# Install info file entries in the info directory file
dst.install_info if dst.to_s =~ INFOFILE_RX and ENV['HOMEBREW_KEEP_INFO']
Find.prune if File.basename(src) == '.DS_Store'
case yield src.relative_path_from(root)
when :skip
Find.prune
when :info
dst.make_relative_symlink(src)
dst.install_info
else
dst.make_relative_symlink(src)
end
elsif src.directory?
# if the dst dir already exists, then great! walk the rest of the tree tho
next if dst.directory? and not dst.symlink?