aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordinkypumpkin2012-01-30 11:30:14 +0000
committerAdam Vandenberg2012-02-04 10:11:17 -0800
commitfb01c6e9f5d7d8ae0c8d23fa00c73c5e6aff8a93 (patch)
tree82498dc4ef6c337111320a0c0d68da5d1f2e2ac8
parentaa5c2e6e27b82227890f38695f66c197a9f4207f (diff)
downloadhomebrew-fb01c6e9f5d7d8ae0c8d23fa00c73c5e6aff8a93.tar.bz2
ffmpeg: Remove version string generation for HEAD builds
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
-rw-r--r--Library/Formula/ffmpeg.rb28
1 files changed, 0 insertions, 28 deletions
diff --git a/Library/Formula/ffmpeg.rb b/Library/Formula/ffmpeg.rb
index 1b31a33a2..43cc0bd8e 100644
--- a/Library/Formula/ffmpeg.rb
+++ b/Library/Formula/ffmpeg.rb
@@ -74,8 +74,6 @@ class Ffmpeg < Formula
end
end
- write_version_file if ARGV.build_head?
-
system "make install"
if ARGV.include? "--with-tools"
@@ -84,30 +82,4 @@ class Ffmpeg < Formula
end
end
- # Makefile expects to run in git repo and generate a version number
- # with 'git describe' command (see version.sh) but Homebrew build
- # runs in temp copy created via git checkout-index, so 'git describe'
- # does not work. Work around by writing VERSION file in build directory
- # to be picked up by version.sh. Note that VERSION file will already
- # exist in release versions, so this only applies to git HEAD builds.
- def write_version_file
- return if File.exists?("VERSION")
- git_tag = "UNKNOWN"
- Dir.chdir(cached_download) do
- ver = `./version.sh`.chomp
- if not $?.success? or ver == "UNKNOWN"
- # fall back to git
- ver = `git describe --tags --match N --always`.chomp
- if not $?.success?
- opoo "Could not determine build version from git repository - set to #{git_tag}"
- else
- git_tag = "git-#{ver}"
- end
- else
- git_tag = ver
- end
- end
- File.open("VERSION","w") {|f| f.puts git_tag}
- end
-
end