<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/98c57ddc69ae6973d03f6bcf81d0ecf42544136b">https://github.com/macports/macports-base/commit/98c57ddc69ae6973d03f6bcf81d0ecf42544136b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 98c57dd macports.tcl: repeat xcode check for dependencies
</span>98c57dd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 98c57ddc69ae6973d03f6bcf81d0ecf42544136b
</span>Author: Satryaji Aulia <satraul@macports.org>
AuthorDate: Thu Aug 1 13:34:13 2019 +0700
<span style='display:block; white-space:pre;color:#404040;'> macports.tcl: repeat xcode check for dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * repeat _check_xcode_version in _mportexec
</span><span style='display:block; white-space:pre;color:#404040;'> * add portname in _check_xcode_version error message
</span><span style='display:block; white-space:pre;color:#404040;'> * add _archive_available check in _check_xcode_version
</span>---
src/macports1.0/macports.tcl | 1 +
src/port1.0/portutil.tcl | 10 ++++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index c416a92..d9d45ad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2102,6 +2102,7 @@ proc _mportexec {target mport} {
</span> set workername [ditem_key $mport workername]
$workername eval {validate_macportsuser}
if {![catch {$workername eval "check_variants $target"} result] && $result == 0 &&
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![catch {$workername eval {_check_xcode_version}} result] && $result == 0 &&
</span> ![catch {$workername eval {check_supported_archs}} result] && $result == 0 &&
![catch {$workername eval "eval_targets $target"} result] && $result == 0} {
# If auto-clean mode, clean-up after dependency install
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/port1.0/portutil.tcl b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 2db0650..a6fc2ac 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/port1.0/portutil.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3235,7 +3235,11 @@ proc check_supported_archs {} {
</span>
# check if the installed xcode version is new enough
proc _check_xcode_version {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global os.subplatform macosx_version xcodeversion use_xcode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global os.subplatform macosx_version xcodeversion use_xcode subport
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[_archive_available]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
if {${os.subplatform} eq "macosx"} {
switch $macosx_version {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3305,7 +3309,9 @@ proc _check_xcode_version {} {
</span> ui_warn "You downloaded Xcode from the Mac App Store but didn't install it. Run \"Install Xcode\" in the /Applications folder."
}
if {[tbool use_xcode]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "This port requires the full Xcode installation, which was not found on your system. You can install Xcode from the Mac App Store or https://developer.apple.com/xcode/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "Port ${subport} requires a full Xcode installation, which was not found on your system."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "You can install Xcode from the Mac App Store or https://developer.apple.com/xcode/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1
</span> }
} elseif {[vercmp $xcodeversion $min] < 0} {
ui_error "The installed version of Xcode (${xcodeversion}) is too old to use on the installed OS version. Version $rec or later is recommended on macOS ${macosx_version}."
</pre><pre style='margin:0'>
</pre>