From aa3ce859a70b101735f98576e8cb9c659dc6ba6d Mon Sep 17 00:00:00 2001 From: Dominyk Tiller Date: Fri, 9 Sep 2016 22:10:43 +0100 Subject: [PATCH 1/3] diagnostic: tweak check_xcode_up_to_date messaging --- Library/Homebrew/extend/os/mac/diagnostic.rb | 22 ++++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb index a2f715890c..7fb13af85d 100644 --- a/Library/Homebrew/extend/os/mac/diagnostic.rb +++ b/Library/Homebrew/extend/os/mac/diagnostic.rb @@ -63,18 +63,22 @@ module Homebrew def check_xcode_up_to_date return unless MacOS::Xcode.installed? && MacOS::Xcode.outdated? - if OS::Mac.prerelease? - xcode_select_nudge = <<-EOS.undent - If #{MacOS::Xcode.latest_version} is installed, you may need to: - sudo xcode-select --switch /path/to/Xcode-beta.app - EOS - end - - <<-EOS.undent + message = <<-EOS.undent Your Xcode (#{MacOS::Xcode.version}) is outdated Please update to Xcode #{MacOS::Xcode.latest_version}. - #{MacOS::Xcode.update_instructions}#{xcode_select_nudge} + #{MacOS::Xcode.update_instructions} EOS + + if OS::Mac.prerelease? + current_path = Utils.popen_read("/usr/bin/xcode-select", "-p") + message += <<-EOS.undent + If #{MacOS::Xcode.latest_version} is installed, you may need to: + sudo xcode-select --switch /Applications/Xcode.app + Current developer directory is: + #{current_path} + EOS + end + message end def check_clt_up_to_date From 397cd1244060e0317474ca198e6e761bf3a72d10 Mon Sep 17 00:00:00 2001 From: Dominyk Tiller Date: Sat, 10 Sep 2016 00:07:01 +0100 Subject: [PATCH 2/3] pkg-config: update Sierra's sqlite version --- Library/Homebrew/os/mac/pkgconfig/10.12/sqlite3.pc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/os/mac/pkgconfig/10.12/sqlite3.pc b/Library/Homebrew/os/mac/pkgconfig/10.12/sqlite3.pc index 98c1575ebf..da7a06981a 100644 --- a/Library/Homebrew/os/mac/pkgconfig/10.12/sqlite3.pc +++ b/Library/Homebrew/os/mac/pkgconfig/10.12/sqlite3.pc @@ -5,7 +5,7 @@ includedir=${prefix}/include Name: SQLite Description: SQL database engine -Version: 3.13.0 +Version: 3.14.0 Libs: -L${libdir} -lsqlite3 Libs.private: Cflags: -I${includedir} From 02843613cc6ff96f9edadc2b434ad12cf6e37938 Mon Sep 17 00:00:00 2001 From: Dominyk Tiller Date: Sat, 10 Sep 2016 00:58:25 +0100 Subject: [PATCH 3/3] xcode: document Sierra Xcode --- share/doc/homebrew/Xcode.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/doc/homebrew/Xcode.md b/share/doc/homebrew/Xcode.md index 9670499970..9af12b6abb 100644 --- a/share/doc/homebrew/Xcode.md +++ b/share/doc/homebrew/Xcode.md @@ -11,6 +11,7 @@ Tools available for your platform: 10.9 | 6.2 | 6.2 10.10 | 7.2.1 | 7.2 10.11 | 7.3.1 | 7.3 + 10.12 | 8.0 | 8.0 ## Compiler Version Database @@ -64,6 +65,7 @@ Tools available for your platform: 7.2.1 | — | — | — | — | 7.0 (700.1.81) | - 7.3 | — | — | — | — | 7.3 (703.0.29) | - 7.3.1 | — | — | — | — | 7.3 (703.0.31) | - + 8.0 | — | — | — | — | 8.0 (800.0.38) | - ## References to Xcode and compiler versions in code When a new Xcode release is made, the following things need to be