diff options
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/bottle.rb | 27 | ||||
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 2 |
2 files changed, 28 insertions, 1 deletions
diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb index a543000bc..f642d458d 100644 --- a/Library/Homebrew/cmd/bottle.rb +++ b/Library/Homebrew/cmd/bottle.rb @@ -174,6 +174,9 @@ module Homebrew filename = Bottle::Filename.create(f, bottle_tag, bottle_revision) bottle_path = Pathname.pwd/filename + tar_filename = filename.to_s.sub(/.gz$/, "") + tar_path = Pathname.pwd/tar_filename + prefix = HOMEBREW_PREFIX.to_s cellar = HOMEBREW_CELLAR.to_s @@ -183,7 +186,13 @@ module Homebrew relocatable = false skip_relocation = false + formula_source_time = f.stable.stage do + Pathname.pwd.to_enum(:find).map(&:mtime).max + end + keg.lock do + original_tab = nil + begin keg.relocate_install_names prefix, Keg::PREFIX_PLACEHOLDER, cellar, Keg::CELLAR_PLACEHOLDER @@ -192,10 +201,25 @@ module Homebrew keg.delete_pyc_files! + tab = Tab.for_keg(keg) + original_tab = tab.dup + empty_tab = Tab.empty + tab["poured_from_bottle"] = empty_tab["poured_from_bottle"] + tab["HEAD"] = empty_tab["HEAD"] + tab["time"] = empty_tab["time"] + tab.write + + keg.find {|k| File.utime(File.atime(k), formula_source_time, k) } + cd cellar do + safe_system "tar", "cf", tar_path, "#{f.name}/#{f.pkg_version}" + File.utime(File.atime(tar_path), formula_source_time, tar_path) + relocatable_tar_path = "#{f}-bottle.tar" + mv tar_path, relocatable_tar_path # Use gzip, faster to compress than bzip2, faster to uncompress than bzip2 # or an uncompressed tarball (and more bandwidth friendly). - safe_system "tar", "czf", bottle_path, "#{f.name}/#{f.pkg_version}" + safe_system "gzip", "-f", relocatable_tar_path + mv "#{relocatable_tar_path}.gz", bottle_path end if bottle_path.size > 1*1024*1024 @@ -222,6 +246,7 @@ module Homebrew raise ensure ignore_interrupts do + original_tab.write keg.relocate_install_names Keg::PREFIX_PLACEHOLDER, prefix, Keg::CELLAR_PLACEHOLDER, cellar end diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 0a483201f..8fae10137 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -741,6 +741,8 @@ class FormulaInstaller tab.tap = formula.tap tab.poured_from_bottle = true + tab.time = Time.now.to_i + tab.head = Homebrew.git_head tab.write end |