diff options
| author | Mike McQuaid | 2013-01-27 22:34:53 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2013-01-30 21:29:19 -0800 |
| commit | 063d5e5b7815e2b14dd11a7bc477e37613ad4801 (patch) | |
| tree | 13121c0fb483089f7eb46ecd20e78e2e272bcfd5 /Library | |
| parent | 6555c0a2605a5db184e245f6fb7fd494dfb76ec6 (diff) | |
| download | homebrew-063d5e5b7815e2b14dd11a7bc477e37613ad4801.tar.bz2 | |
jpeg: support version format.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Formula/jpeg.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/test/test_versions.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/version.rb | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/Library/Formula/jpeg.rb b/Library/Formula/jpeg.rb index f226baf8e..f6dcbe834 100644 --- a/Library/Formula/jpeg.rb +++ b/Library/Formula/jpeg.rb @@ -3,7 +3,6 @@ require 'formula' class Jpeg < Formula homepage 'http://www.ijg.org' url 'http://www.ijg.org/files/jpegsrc.v8d.tar.gz' - version '8d' sha1 'f080b2fffc7581f7d19b968092ba9ebc234556ff' bottle do @@ -13,7 +12,8 @@ class Jpeg < Formula end def install - ENV.universal_binary # Builds universal libs. Default is static & shared. + ENV.universal_binary + # Builds static and shared libraries. system "./configure", "--prefix=#{prefix}", "--disable-dependency-tracking" system "make install" end diff --git a/Library/Homebrew/test/test_versions.rb b/Library/Homebrew/test/test_versions.rb index 0458481b4..bdda4093b 100644 --- a/Library/Homebrew/test/test_versions.rb +++ b/Library/Homebrew/test/test_versions.rb @@ -243,6 +243,10 @@ class VersionParsingTests < Test::Unit::TestCase assert_version_detected '1.2.0-rc2', 'http://www.apache.org/dyn/closer.cgi?path=/cassandra/1.2.0/apache-cassandra-1.2.0-rc2-bin.tar.gz' end + def test_jpeg_style + assert_version_detected '8d', 'http://www.ijg.org/files/jpegsrc.v8d.tar.gz' + end + # def test_version_ghc_style # assert_version_detected '7.0.4', 'http://www.haskell.org/ghc/dist/7.0.4/ghc-7.0.4-x86_64-apple-darwin.tar.bz2' # assert_version_detected '7.0.4', 'http://www.haskell.org/ghc/dist/7.0.4/ghc-7.0.4-i386-apple-darwin.tar.bz2' diff --git a/Library/Homebrew/version.rb b/Library/Homebrew/version.rb index 192463ed8..982c83bfe 100644 --- a/Library/Homebrew/version.rb +++ b/Library/Homebrew/version.rb @@ -183,6 +183,10 @@ class Version # e.g. http://mirrors.jenkins-ci.org/war/1.486/jenkins.war m = /\/(\d\.\d+)\//.match(spec.to_s) return m.captures.first unless m.nil? + + # e.g. http://www.ijg.org/files/jpegsrc.v8d.tar.gz + m = /\.v(\d+[a-z]?)/.match(stem) + return m.captures.first unless m.nil? end # DSL for defining comparators |