<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[115900] trunk/base/src/port1.0/portutil.tcl</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/115900">115900</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-01-13 16:45:21 -0800 (Mon, 13 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>portutil: check for command line tools and Xcode license agreement</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcport10portutiltcl">trunk/base/src/port1.0/portutil.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcport10portutiltcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portutil.tcl (115899 => 115900)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portutil.tcl 2014-01-13 23:27:48 UTC (rev 115899)
+++ trunk/base/src/port1.0/portutil.tcl 2014-01-14 00:45:21 UTC (rev 115900)
</span><span class="lines">@@ -3134,16 +3134,38 @@
</span><span class="cx"> ui_warn "The installed version of Xcode (${xcodeversion}) is known to cause problems. Version $rec or later is recommended on Mac OS X ${macosx_version}."
</span><span class="cx"> }
</span><span class="cx">
</span><del>- # Xcode 4.3 requires the command-line utilities package to be
- # installed.
- if {[vercmp $xcodeversion 4.3] >= 0 ||
- ($xcodeversion == "none" && [file exists "/Applications/Xcode.app"])} {
- if {![file exists "/usr/bin/make"]} {
- ui_warn "The Command Line Tools for Xcode don't appear to be installed; most ports will likely fail to build."
- ui_warn "See http://guide.macports.org/chunked/installing.xcode.html for more information."
</del><ins>+ # Xcode 4.3 and above requires the command-line utilities package to be installed.
+ if {[vercmp $xcodeversion 4.3] >= 0 || ($xcodeversion == "none" && [file exists "/Applications/Xcode.app"])} {
+ if {[vercmp $macosx_version 10.9] >= 0} {
+ # on Mavericks, /usr/bin/make might always installed as a shim into the command line tools installer.
+ # Let's check for /Library/Developer/CommandLineTools, installed by the
+ # com.apple.pkg.CLTools_Executables package.
+ set cltpath "/Library/Developer/CommandLineTools"
+ } else {
+ set cltpath "/"
</ins><span class="cx"> }
</span><ins>+
+ # Check whether /usr/include and /usr/bin/make exist and tell users to install the command line tools, if they don't
+ if { ![file isdirectory [file join $cltpath usr include]]
+ || ![file executable [file join $cltpath usr bin make]]} {
+ ui_warn "The Xcode Command Line Tools don't appear to be installed; most ports will likely fail to build."
+ if {[vercmp $macosx_version 10.9] >= 0} {
+ ui_warn "Install them by running `xcode-select --install'."
+ } else {
+ ui_warn "You can install them from Xcode's Preferences in the Downloads section."
+ ui_warn "See http://guide.macports.org/chunked/installing.xcode.html#installing.xcode.lion.43 for more information."
+ }
+ }
+
+ # Check whether users have agreed to the Xcode license agreement
+ catch {exec [findBinary xcrun $portutil::autoconf::xcrun_path] clang 2>@1} output
+ set output [join [lrange [split $output "\n"] 0 end-1] "\n"]
+ if {[string match -nocase "*license*" $output]} {
+ ui_error "It seems you have not accepted the Xcode license; most ports will fail to build."
+ ui_error "Agree to the license by opening Xcode or running `sudo xcodebuild -license'."
+ return 1
+ }
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> }
</span><span class="cx"> return 0
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>