subversion - add note about linking Java libs

1 files changed, 25 insertions, 18 deletions

diff --git a/Library/Formula/subversion.rb b/Library/Formula/subversion.rb
index 347e3f8cd..da5c95446 100644
--- a/Library/Formula/subversion.rb
+++ b/Library/Formula/subversion.rb
@@ -1,5 +1,8 @@
 require 'formula'
 
+def build_java?; ARGV.include? "--java"; end
+def build_universal?; ARGV.include? '--universal'; end
+
 # On 10.5 we need newer versions of apr, neon etc.
 # On 10.6 we only need a newer version of neon
 class SubversionDeps <Formula
@@ -14,8 +17,7 @@ class Subversion <Formula
   
   aka 'svn'
 
-  # Only need this on Snow Leopard; for Leopard the deps package 
-  # builds it.
+  # On Snow Leopard, build a new neon. For Leopard, the deps above include this.
   depends_on 'neon' if MACOS_VERSION >= 10.6
 
   def options
@@ -31,33 +33,31 @@ class Subversion <Formula
     SubversionDeps.new.brew { d.install Dir['*'] }
   end
 
-  def setup_snow_leopard
+  def check_neon_arch
     # Check that Neon was built universal if we are building w/ --universal
-    if ARGV.include? '--universal'
-      neon = Formula.factory('neon')
-      unless neon.installed?
-        neon_arch = archs_for_command(neon.lib+'libneon.dylib')
-        unless neon_arch.universal?
-          opoo "A universal build was requested, but neon was already built for a single arch."
-          puts "You may need to `brew rm neon` first."
-        end
+    neon = Formula.factory('neon')
+    unless neon.installed?
+      neon_arch = archs_for_command(neon.lib+'libneon.dylib')
+      unless neon_arch.universal?
+        opoo "A universal build was requested, but neon was already built for a single arch."
+        puts "You may need to `brew rm neon` first."
       end
     end
   end
 
   def install
-    if ARGV.include? "--java" and not ARGV.include? '--universal'
+    if build_java? and not build_universal?
       opoo "A non-Universal Java build was requested."
       puts "To use Java bindings with various Java IDEs, you might need a universal build:"
       puts "  brew install --universal --java subversion"
     end
 
-    ENV.universal_binary if ARGV.include? '--universal'
+    ENV.universal_binary if build_universal?
 
     if MACOS_VERSION < 10.6
       setup_leopard
     else
-      setup_snow_leopard
+      check_neon_arch if build_universal?
     end
 
     # Use existing system zlib
@@ -73,18 +73,25 @@ class Subversion <Formula
             "--without-apache-libexecdir",
             "--without-berkeley-db"]
 
-    if ARGV.include? "--java"
-      args << "--enable-javahl" << "--without-jikes"
-    end
+    args << "--enable-javahl" << "--without-jikes" if build_java?
 
     system "./configure", *args
     system "make"
     system "make install"
 
-    if ARGV.include? "--java"
+    if build_java?
       ENV.j1 # This build isn't parallel safe
       system "make javahl"
       system "make install-javahl"
     end
   end
+
+  def caveats
+    if build_java?
+      <<-EOS.undent
+        You may need to link the Java bindings into the Java Extensions folder:
+          sudo ln -s #{HOMEBREW_PREFIX}/lib/libsvnjavahl-1.dylib /Library/Java/Extensions
+      EOS
+    end
+  end
 end