diff options
| author | Dominyk Tiller | 2016-09-10 19:29:42 +0100 |
|---|---|---|
| committer | GitHub | 2016-09-10 19:29:42 +0100 |
| commit | 7fb915319d391dfc20367be08005c1f9e154c81e (patch) | |
| tree | 34e7c7c580e0b5bd7570bdecec399af40b7e559e | |
| parent | b73580070e3b69d679ad10fff4eac4471c0c8ff3 (diff) | |
| parent | 02843613cc6ff96f9edadc2b434ad12cf6e37938 (diff) | |
| download | brew-7fb915319d391dfc20367be08005c1f9e154c81e.tar.bz2 | |
Merge pull request #904 from DomT4/sierra
Sierra: update diagnostic message, pkg-config, Xcode doc
| -rw-r--r-- | Library/Homebrew/extend/os/mac/diagnostic.rb | 20 | ||||
| -rw-r--r-- | Library/Homebrew/os/mac/pkgconfig/10.12/sqlite3.pc | 2 | ||||
| -rw-r--r-- | share/doc/homebrew/Xcode.md | 2 |
3 files changed, 15 insertions, 9 deletions
diff --git a/Library/Homebrew/extend/os/mac/diagnostic.rb b/Library/Homebrew/extend/os/mac/diagnostic.rb index a2f715890..7fb13af85 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? + message = <<-EOS.undent + Your Xcode (#{MacOS::Xcode.version}) is outdated + Please update to Xcode #{MacOS::Xcode.latest_version}. + #{MacOS::Xcode.update_instructions} + EOS + if OS::Mac.prerelease? - xcode_select_nudge = <<-EOS.undent + 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 /path/to/Xcode-beta.app + sudo xcode-select --switch /Applications/Xcode.app + Current developer directory is: + #{current_path} EOS end - - <<-EOS.undent - Your Xcode (#{MacOS::Xcode.version}) is outdated - Please update to Xcode #{MacOS::Xcode.latest_version}. - #{MacOS::Xcode.update_instructions}#{xcode_select_nudge} - EOS + message end def check_clt_up_to_date diff --git a/Library/Homebrew/os/mac/pkgconfig/10.12/sqlite3.pc b/Library/Homebrew/os/mac/pkgconfig/10.12/sqlite3.pc index 98c1575eb..da7a06981 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} diff --git a/share/doc/homebrew/Xcode.md b/share/doc/homebrew/Xcode.md index 967049997..9af12b6ab 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 |