diff options
| author | Misty De Meo | 2012-01-22 22:32:15 -0600 |
|---|---|---|
| committer | Misty De Meo | 2012-01-25 21:45:19 -0600 |
| commit | d121bcdadae49e570de0a4fcf4c71499c5f2c846 (patch) | |
| tree | 733834b0de1c624c26d2169a5fbc3ceea8bf6a69 /Library/Homebrew/formula_installer.rb | |
| parent | b3092ea3f7e0540fef839a77d2b3afa9cfd64255 (diff) | |
| download | brew-d121bcdadae49e570de0a4fcf4c71499c5f2c846.tar.bz2 | |
Add `devel` to the DSL, + stable and bottle blocks
This commit adds a `devel` entry to the DSL, allowing formulae to
specify an unstable branch.
`devel` takes a block, which should contain standard `url` and `md5`
fields (and `version`, if necessary). This must come after the standard
DSL fields.
This commit also migrates over all formulae currently using `devel` to
the new syntax, as well as formulae which used `head` for non-VCS urls.
The new syntax is also available for `stable` and `bottle`. `stable` is
an option alongside the old syntax. `bottle` replaces the old syntax.
Note that the @stable ivar in Formula has been renamed to @standard,
and the @bottle ivar has been renamed to @bottle_url.
Closes Homebrew/homebrew#9735.
Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
Diffstat (limited to 'Library/Homebrew/formula_installer.rb')
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index deee2b956..c5f0f999e 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -15,8 +15,8 @@ class FormulaInstaller @f = ff @show_header = true @ignore_deps = ARGV.include? '--ignore-dependencies' || ARGV.interactive? - @install_bottle = !ff.bottle.nil? && !ARGV.build_from_source? && - Pathname.new(ff.bottle).version == ff.version + @install_bottle = !ff.bottle_url.nil? && !ARGV.build_from_source? && + Pathname.new(ff.bottle_url).version == ff.version end def install @@ -189,7 +189,7 @@ class FormulaInstaller def pour HOMEBREW_CACHE.mkpath - downloader = CurlBottleDownloadStrategy.new f.bottle, f.name, f.version, nil + downloader = CurlBottleDownloadStrategy.new f.bottle_url, f.name, f.version, nil downloader.fetch f.verify_download_integrity downloader.tarball_path, f.bottle_sha1, "SHA1" HOMEBREW_CELLAR.cd do |