Merge pull request #4 from seletz/fix-linked-python

Update formula to match MacVim formula, fixes python linking.

macvim-split-browser.rb

@@ -8,83 +8,143 @@ class MacvimSplitBrowser < Formula
 
   head 'https://github.com/joelcogen/macvim.git', :branch => 'split-browser'
 
-  def options
-  [
-    ["--custom-icons", "Try to generate custom document icons."],
-    ["--with-cscope", "Build with Cscope support."],
-    ["--override-system-vim", "Override system vim."],
-    ["--with-lua", "Build with Lua scripting support."]
-  ]
-  end
+  option "custom-icons", "Try to generate custom document icons"
+  option "override-system-vim", "Override system vim"
+
+  depends_on :xcode => :build
+  depends_on 'cscope' => :recommended
+  depends_on 'lua' => :optional
+  depends_on 'luajit' => :optional
+  depends_on :python => :recommended
+  depends_on :python3 => :optional
 
-  depends_on 'cscope' if ARGV.include? '--with-cscope'
-  depends_on 'lua' if ARGV.include? '--with-lua'
+  env :std if MacOS.version <= :snow_leopard
+  # Help us! We'd like to use superenv in these environments too
 
   def install
-    # MacVim's Xcode project gets confused by $CC, so remove it
-    ENV['CC'] = "clang"
-    ENV['CFLAGS'] = nil
-    ENV['CXX'] = nil
-    ENV['CXXFLAGS'] = nil
+    # MacVim doesn't have and required any Python package, unset PYTHONPATH.
+    ENV.delete('PYTHONPATH')
 
     # Set ARCHFLAGS so the Python app (with C extension) that is
     # used to create the custom icons will not try to compile in
     # PPC support (which isn't needed in Homebrew-supported systems.)
-    arch = MacOS.prefer_64_bit? ? 'x86_64' : 'i386'
-    ENV['ARCHFLAGS'] = "-arch #{arch}"
-
-    args = ["--with-features=huge",
-            "--with-tlib=ncurses",
-            "--enable-multibyte",
-            "--with-macarchs=#{arch}",
-            "--enable-perlinterp",
-            "--enable-pythoninterp",
-            "--enable-rubyinterp",
-            "--enable-tclinterp"]
-
-    args << "--enable-cscope" if ARGV.include? "--with-cscope"
+    ENV['ARCHFLAGS'] = "-arch #{MacOS.preferred_arch}"
+
+    # If building for 10.7 or up, make sure that CC is set to "clang".
+    ENV.clang if MacOS.version >= :lion
+
+    # macvim HEAD only works with the current Ruby.framework because it builds with -framework Ruby
+    system_ruby = "/System/Library/Frameworks/Ruby.framework/Versions/Current/usr/bin/ruby"
+
+    args = %W[
+      --with-features=huge
+      --enable-multibyte
+      --with-macarchs=#{MacOS.preferred_arch}
+      --enable-perlinterp
+      --enable-rubyinterp
+      --enable-tclinterp
+      --with-ruby-command=#{system_ruby}
+      --with-tlib=ncurses
+      --with-compiledby=Homebrew
+      --with-local-dir=#{HOMEBREW_PREFIX}
+    ]
+
+    args << "--enable-cscope" if build.with? "cscope"
+
+    if build.with? "lua"
+      args << "--enable-luainterp"
+      args << "--with-lua-prefix=#{HOMEBREW_PREFIX}"
+    end
 
-    if ARGV.include? "--with-lua"
+    if build.with? "luajit"
       args << "--enable-luainterp"
       args << "--with-lua-prefix=#{HOMEBREW_PREFIX}"
+      args << "--with-luajit"
+    end
+
+    if build.with? "python"
+      if build.without? "python3"
+        # MacVim seems to link Python by `-framework Python` (instead of
+        # `python-config --ldflags`) and so we have to pass the -F to point to
+        # where the Python.framework is located, we want it to use!
+        # Also the -L is needed for the correct linking. This is a mess but we have
+        # to wait until MacVim is really able to link against different Python's
+        # on the Mac. Note configure detects brewed python correctly, but that
+        # is ignored.
+        # See https://github.com/Homebrew/homebrew/issues/17908
+        py_prefix = Pathname.new `python-config --prefix`.chomp
+        ENV.prepend "LDFLAGS", "-L#{py_prefix}/lib/python2.7/config -F#{py_prefix.parent.parent.parent}"
+        ENV.prepend "CFLAGS", "-F#{py_prefix.parent.parent.parent}"
+
+        args << "--enable-pythoninterp"
+      else
+        args << "--enable-pythoninterp=dynamic" << "--enable-python3interp=dynamic"
+      end
+    elsif build.with? "python3"
+      args << "--enable-python3interp"
+    end
+
+    # configure appends "SDKS/..." to the value of `xcode-select -print-path`,
+    # but this isn't correct on recent Xcode, so we need to set it manually.
+    # FIXME this is a bug, and it should be fixed upstream.
+    unless MacOS::CLT.installed?
+      args << "--with-developer-dir=#{MacOS::Xcode.prefix}/Platforms/MacOSX.platform/Developer"
+      args << "--with-macsdk=#{MacOS.version}"
     end
 
     system "./configure", *args
 
-    # Building custom icons fails for many users, so off by default.
-    unless ARGV.include? "--custom-icons"
+    if build.with? "python"
+      if build.with? "python3"
+        py_prefix = `python-config --prefix`.chomp
+        inreplace "src/auto/config.mk", /-DDYNAMIC_PYTHON_DLL=\\".*\\"/,
+                    %Q[-DDYNAMIC_PYTHON_DLL=\'\"#{py_prefix}/Python\"\']
+        py3_version = /\d\.\d/.match `python3 --version 2>&1`
+        py3_prefix = `python#{py3_version}-config --prefix`.chomp
+        inreplace 'src/auto/config.mk', /-DDYNAMIC_PYTHON3_DLL=\\".*\\"/,
+                  %Q[-DDYNAMIC_PYTHON3_DLL=\'\"#{py3_prefix}/Python\"\']
+      end
+
+      unless Formula["python"].installed?
+        inreplace "src/auto/config.h", "/* #undef PY_NO_RTLD_GLOBAL */",
+                                        "#define PY_NO_RTLD_GLOBAL 1"
+        inreplace "src/auto/config.h", "/* #undef PY3_NO_RTLD_GLOBAL */",
+                                       "#define PY3_NO_RTLD_GLOBAL 1"
+      end
+    end
+
+    if build.include? "custom-icons"
+      # Get the custom font used by the icons
+      system "make", "-C", "src/MacVim/icons", "getenvy"
+    else
+      # Building custom icons fails for many users, so off by default.
       inreplace "src/MacVim/icons/Makefile", "$(MAKE) -C makeicns", ""
       inreplace "src/MacVim/icons/make_icons.py", "dont_create = False", "dont_create = True"
     end
 
-    # Reference: https://github.com/b4winckler/macvim/wiki/building
-    system "cd src/MacVim/icons && make getenvy"
-
     system "make"
 
     prefix.install "src/MacVim/build/Release/MacVim.app"
     inreplace "src/MacVim/mvim", /^# VIM_APP_DIR=\/Applications$/,
-              "VIM_APP_DIR=#{prefix}"
+                                 "VIM_APP_DIR=#{prefix}"
     bin.install "src/MacVim/mvim"
 
     # Create MacVim vimdiff, view, ex equivalents
-    executables = %w[mvimdiff mview mvimex]
-    executables += %w[vi vim vimdiff view vimex] if ARGV.include? "--override-system-vim"
-    executables.each {|f| ln_s bin+'mvim', bin+f}
+    executables = %w[mvimdiff mview mvimex gvim gvimdiff gview gvimex]
+    executables += %w[vi vim vimdiff view vimex] if build.include? "override-system-vim"
+    executables.each { |e| bin.install_symlink "mvim" => e }
   end
 
-  def caveats; <<-EOS.undent
-    This formula will most probably conflict with the macvim formula.
-    If you already installed MacVim from Homebrew, please remove it using:
-        brew uninstall macvim
-
-    MacVim.app installed to:
-      #{prefix}
+  def caveats
+    if build.with? "python" and build.with? "python3"
+      <<-EOS.undent
+        MacVim has been built with dynamic loading of Python 2 and Python 3.
 
-    To link the application to a normal Mac OS X location:
-        brew linkapps
-    or:
-        ln -s #{prefix}/MacVim.app /Applications
-    EOS
+        Note: if MacVim dynamically loads both Python 2 and Python 3, it may
+        crash. For more information, see:
+            http://vimdoc.sourceforge.net/htmldoc/if_pyth.html#python3
+      EOS
+    end
   end
+
 end