Move X11 machinery into MacOS::XQuartz namespace

In order to better support Xcode-only systems, where X11 libs and
executables live under /usr/X11 but headers live in the SDK, move the
x11_* helper methods into a new module.

This allows us to keep some of the CLT/Xcode-only and Apple X11/XQuartz
logic hidden from outside code, like ENV.x11.

Since Apple's X11 is actually XQuartz, name the module "MacOS::XQuartz".

2 files changed, 225 insertions, 0 deletions

diff --git a/Library/Homebrew/macos/xcode.rb b/Library/Homebrew/macos/xcode.rb
new file mode 100644
index 000000000..0c8139c62
--- /dev/null
+++ b/Library/Homebrew/macos/xcode.rb
@@ -0,0 +1,161 @@
+module MacOS::Xcode extend self
+
+  V4_BUNDLE_ID = "com.apple.dt.Xcode"
+  V3_BUNDLE_ID = "com.apple.Xcode"
+  V4_BUNDLE_PATH = Pathname.new("/Applications/Xcode.app")
+  V3_BUNDLE_PATH = Pathname.new("/Developer/Applications/Xcode.app")
+
+  # Locate the "current Xcode folder" via xcode-select. See:
+  # man xcode-select
+  def folder
+    @folder ||= `xcode-select -print-path 2>/dev/null`.strip
+  end
+
+  # Xcode 4.3 tools hang if "/" is set
+  def bad_xcode_select_path?
+    folder == "/"
+  end
+
+  def prefix
+    @prefix ||= begin
+      path = Pathname.new folder
+      if path.absolute? and (path/'usr/bin/make').executable?
+        path
+      elsif File.executable? '/Developer/usr/bin/make'
+        # we do this to support cowboys who insist on installing
+        # only a subset of Xcode
+        Pathname.new '/Developer'
+      elsif (V4_BUNDLE_PATH/'Contents/Developer/usr/bin/make').executable?
+        # fallback for broken Xcode 4.3 installs
+        V4_BUNDLE_PATH/'Contents/Developer'
+      else
+        # Ask Spotlight where Xcode is. If the user didn't install the
+        # helper tools and installed Xcode in a non-conventional place, this
+        # is our only option. See: http://superuser.com/questions/390757
+        path = MacOS.app_with_bundle_id(V4_BUNDLE_ID) ||
+          MacOS.app_with_bundle_id(V3_BUNDLE_ID)
+
+        unless path.nil?
+          path += "Contents/Developer"
+          path if (path/'usr/bin/make').executable?
+        end
+      end
+    end
+  end
+
+  def installed?
+    # Telling us whether the Xcode.app is installed or not.
+    @installed ||= V4_BUNDLE_PATH.exist? ||
+      V3_BUNDLE_PATH.exist? ||
+      MacOS.app_with_bundle_id(V4_BUNDLE_ID) ||
+      MacOS.app_with_bundle_id(V3_BUNDLE_ID) ||
+      false
+  end
+
+  def version
+    # may return a version string
+    # that is guessed based on the compiler, so do not
+    # use it in order to check if Xcode is installed.
+    @version ||= begin
+      return "0" unless MACOS
+
+      # this shortcut makes version work for people who don't realise you
+      # need to install the CLI tools
+      xcode43build = V4_BUNDLE_PATH/'Contents/Developer/usr/bin/xcodebuild'
+      if xcode43build.file?
+        `#{xcode43build} -version 2>/dev/null` =~ /Xcode (\d(\.\d)*)/
+        return $1 if $1
+      end
+
+      # Xcode 4.3 xc* tools hang indefinately if xcode-select path is set thus
+      raise if bad_xcode_select_path?
+
+      raise unless which "xcodebuild"
+      `xcodebuild -version 2>/dev/null` =~ /Xcode (\d(\.\d)*)/
+      raise if $1.nil? or not $?.success?
+      $1
+    rescue
+      # For people who's xcode-select is unset, or who have installed
+      # xcode-gcc-installer or whatever other combinations we can try and
+      # supprt. See https://github.com/mxcl/homebrew/wiki/Xcode
+      case MacOS.llvm_build_version.to_i
+      when 1..2063 then "3.1.0"
+      when 2064..2065 then "3.1.4"
+      when 2366..2325
+        # we have no data for this range so we are guessing
+        "3.2.0"
+      when 2326
+        # also applies to "3.2.3"
+        "3.2.4"
+      when 2327..2333 then "3.2.5"
+      when 2335
+        # this build number applies to 3.2.6, 4.0 and 4.1
+        # https://github.com/mxcl/homebrew/wiki/Xcode
+        "4.0"
+      else
+        case (MacOS.clang_version.to_f * 10).to_i
+        when 0
+          "dunno"
+        when 1..14
+          "3.2.2"
+        when 15
+          "3.2.4"
+        when 16
+          "3.2.5"
+        when 17..20
+          "4.0"
+        when 21
+          "4.1"
+        when 22..30
+          "4.2"
+        when 31
+          "4.3"
+        when 40
+          "4.4"
+        else
+          "4.4"
+        end
+      end
+    end
+  end
+
+  def provides_autotools?
+    version.to_f < 4.3
+  end
+
+  def provides_gcc?
+    version.to_f < 4.3
+  end
+end
+
+module MacOS::CLT extend self
+  STANDALONE_PKG_ID = "com.apple.pkg.DeveloperToolsCLILeo"
+  FROM_XCODE_PKG_ID = "com.apple.pkg.DeveloperToolsCLI"
+
+  # This is true ift he standard UNIX tools are present under /usr. For
+  # Xcode < 4.3, this is the standard location. Otherwise, it means that
+  # the user has installed the "Command Line Tools for Xcode" package.
+  def installed?
+    MacOS.dev_tools_path == Pathname.new("/usr/bin")
+  end
+
+  def version
+    # Version string (a pretty damn long one) of the CLT package.
+    # Note, that different ways to install the CLTs lead to different
+    # version numbers.
+    @version ||= begin
+      standalone = MacOS.pkgutil_info(STANDALONE_PKG_ID)
+      from_xcode = MacOS.pkgutil_info(FROM_XCODE_PKG_ID)
+
+      if not standalone.empty?
+        standalone =~ /version: (.*)$/
+        $1
+      elsif not from_xcode.empty?
+        from_xcode =~ /version: (.*)$/
+        $1
+      else
+        nil
+      end
+    end
+  end
+end
diff --git a/Library/Homebrew/macos/xquartz.rb b/Library/Homebrew/macos/xquartz.rb
new file mode 100644
index 000000000..d00c55680
--- /dev/null
+++ b/Library/Homebrew/macos/xquartz.rb
@@ -0,0 +1,64 @@
+module MacOS::XQuartz extend self
+  FORGE_BUNDLE_ID = "org.macosforge.xquartz.X11"
+  APPLE_BUNDLE_ID = "org.x.X11"
+
+  # This returns the version number of XQuartz, not of the upstream X.org.
+  # The X11.app distributed by Apple is also XQuartz, and therefore covered
+  # by this method.
+  def version
+    path = MacOS.app_with_bundle_id(FORGE_BUNDLE_ID) || MacOS.app_with_bundle_id(APPLE_BUNDLE_ID)
+    version = if not path.nil? and path.exist?
+      `mdls -raw -name kMDItemVersion "#{path}" 2>/dev/null`.strip
+    end
+  end
+
+  # This should really be private, but for compatibility reasons it must
+  # remain public. New code should use MacOS::XQuartz.{bin,lib,include}
+  # instead, as that accounts for Xcode-only systems.
+  def prefix
+    @prefix ||= if Pathname.new('/opt/X11/lib/libpng.dylib').exist?
+      Pathname.new('/opt/X11')
+    elsif Pathname.new('/usr/X11/lib/libpng.dylib').exist?
+      Pathname.new('/usr/X11')
+    end
+  end
+
+  def installed?
+    not prefix.nil?
+  end
+
+  # If XQuartz and/or the CLT are installed, headers will be found under
+  # /opt/X11/include or /usr/X11/include. For Xcode-only systems, they are
+  # found in the SDK, so we use sdk_path for both the headers and libraries.
+  # Confusingly, executables (e.g. config scripts) are only found under
+  # /opt/X11/bin or /usr/X11/bin in all cases.
+  def bin
+    prefix/'bin'
+  end
+
+  def include
+    @include ||= if use_sdk?
+      MacOS.sdk_path/'usr/X11/include'
+    else
+      prefix/'include'
+    end
+  end
+
+  def lib
+    @lib ||= if use_sdk?
+      MacOS.sdk_path/'usr/X11/lib'
+    else
+      prefix/'lib'
+    end
+  end
+
+  def share
+    prefix/'share'
+  end
+
+  private
+
+  def use_sdk?
+    not (prefix.to_s == '/opt/X11' or MacOS::CLT.installed?)
+  end
+end