llvm3[345]: omit point release from version suffix

Fixes Homebrew#449.
iggyvolz · Jun 3, 2014 · 0092422 · 0092422
1 parent 4d8a0bd
commit 0092422
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/llvm33.rb b/llvm33.rb
@@ -2,6 +2,7 @@
 
 class Llvm33 < Formula
   homepage  'http://llvm.org/'
+  revision 1
 
   stable do
     url 'http://llvm.org/releases/3.3/llvm-3.3.src.tar.gz'
@@ -223,13 +224,13 @@ def install
     # Link executables to bin and add suffix to avoid conflicts
     Dir.glob(install_prefix/'bin/*') do |exec_path|
       basename = File.basename(exec_path)
-      bin.install_symlink exec_path => "#{basename}-#{version}"
+      bin.install_symlink exec_path => "#{basename}-#{ver}"
     end
 
     # Also link man pages
     Dir.glob(install_prefix/'share/man/man1/*') do |manpage|
       basename = File.basename(manpage, ".1")
-      man1.install_symlink manpage => "#{basename}-#{version}.1"
+      man1.install_symlink manpage => "#{basename}-#{ver}.1"
     end
   end
 

diff --git a/llvm34.rb b/llvm34.rb
@@ -2,6 +2,7 @@
 
 class Llvm34 < Formula
   homepage  'http://llvm.org/'
+  revision 1
 
   stable do
     url 'http://llvm.org/releases/3.4.1/llvm-3.4.1.src.tar.gz'
@@ -209,13 +210,13 @@ def install
     # Link executables to bin and add suffix to avoid conflicts
     Dir.glob(install_prefix/'bin/*') do |exec_path|
       basename = File.basename(exec_path)
-      bin.install_symlink exec_path => "#{basename}-#{version}"
+      bin.install_symlink exec_path => "#{basename}-#{ver}"
     end
 
     # Also link man pages
     Dir.glob(install_prefix/'share/man/man1/*') do |manpage|
       basename = File.basename(manpage, ".1")
-      man1.install_symlink manpage => "#{basename}-#{version}.1"
+      man1.install_symlink manpage => "#{basename}-#{ver}.1"
     end
   end
 

diff --git a/llvm35.rb b/llvm35.rb
@@ -178,13 +178,13 @@ def install
     # Link executables to bin and add suffix to avoid conflicts
     Dir.glob(install_prefix/'bin/*') do |exec_path|
       basename = File.basename(exec_path)
-      bin.install_symlink exec_path => "#{basename}-#{version}"
+      bin.install_symlink exec_path => "#{basename}-#{ver}"
     end
 
     # Also link man pages
     Dir.glob(install_prefix/'share/man/man1/*') do |manpage|
       basename = File.basename(manpage, ".1")
-      man1.install_symlink manpage => "#{basename}-#{version}.1"
+      man1.install_symlink manpage => "#{basename}-#{ver}.1"
     end
   end