<!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>[152489] contrib/mp-buildbot/tools/dependencies.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/152489">152489</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2016-09-11 04:07:27 -0700 (Sun, 11 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>mp-buildbot: Support variants in dependency calc
Adding a failcache to avoid wasting time requires a path per port that
we can use to cache the result of the last build. Since we're planning
to support variants in mp-buildbot, this path needs to be
variant-specific as well. In order to implement the fail cache, we thus
need working variant support first.
Fix a bug in the variant calculation of dependencies that would trigger
in the following situation:
port bar:
depends_lib port:foo
port foo:
default_variants +foo +bar
./tools/dependencies.tcl bar -bar
This setup used to print "foo +foo" only, but passing that to "port
install" would still install foo with the bar variant. With this change,
the correct value "foo -bar+foo" is printed instead.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#contribmpbuildbottoolsdependenciestcl">contrib/mp-buildbot/tools/dependencies.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="contribmpbuildbottoolsdependenciestcl"></a>
<div class="modfile"><h4>Modified: contrib/mp-buildbot/tools/dependencies.tcl (152488 => 152489)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/mp-buildbot/tools/dependencies.tcl 2016-09-11 10:23:57 UTC (rev 152488)
+++ contrib/mp-buildbot/tools/dependencies.tcl 2016-09-11 11:07:27 UTC (rev 152489)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> package require macports
</span><span class="cx">
</span><span class="cx"> if {[llength $::argv] == 0} {
</span><del>- puts stderr "Usage: $argv0 <portname>"
</del><ins>+ puts stderr "Usage: $argv0 <portname> \[(+|-)variant...\]"
</ins><span class="cx"> exit 1
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -59,11 +59,19 @@
</span><span class="cx"> exit 1
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+# parse the given variants from the command line
+array set variants {}
+foreach item [lrange $::argv 1 end] {
+ foreach {_ sign variant} [regexp -all -inline -- {([-+])([[:alpha:]_]+[\w\.]*)} $item] {
+ set variants($variant) $sign
+ }
+}
+
</ins><span class="cx"> # open the port so we can run dependency calculation
</span><span class="cx"> array set portinfo [lindex $result 1]
</span><span class="cx"> #try -pass_signal {...}
</span><span class="cx"> try {
</span><del>- set mport [mportopen $portinfo(porturl) [list subport $portname] {}]
</del><ins>+ set mport [mportopen $portinfo(porturl) [list subport $portname] [array get variants]]
</ins><span class="cx"> } catch {{*} eCode eMessage} {
</span><span class="cx"> ui_error "mportopen ${portinfo(porturl)} failed: $eMessage"
</span><span class="cx"> exit 1
</span><span class="lines">@@ -82,9 +90,59 @@
</span><span class="cx">
</span><span class="cx"> ## print dependencies with variants
</span><span class="cx"> proc printdependency {ditem} {
</span><ins>+ global variants
+
</ins><span class="cx"> array set depinfo [mportinfo $ditem]
</span><span class="cx">
</span><del>- puts [string trim "$depinfo(name) $depinfo(canonical_active_variants)"]
</del><ins>+ # There's a conceptual problem here: We need to calculate the string to
+ # pass to port(1) to build this exact port with its variants, but the
+ # active_variants array does not contain an entry for explicitly
+ # deactivated default_variants.
+ #
+ # To calculate the correct string with the explicitly disabled default
+ # variants, if any, we need the default variants first. Unfortunately the
+ # only way to get the set of default variants is opening the port without
+ # any.
+ #
+ # Given the active_variants of the current dependency calculation and the
+ # ones from a pristine port without variants, calculate the required
+ # string.
+
+ # open the port without variants to determine the default variants
+ if {[llength [array get variants]] > 0} {
+ #try -pass_signal {...}
+ try {
+ set result [mportlookup $depinfo(name)]
+ if {[llength $result] < 2} {
+ ui_error "No such port: $depinfo(name)"
+ exit 1
+ }
+
+ # open the port so we can calculate the default variants
+ array set defaultvariant_portinfo [lindex $result 1]
+ set defaultvariant_mport [mportopen $defaultvariant_portinfo(porturl) [list subport $depinfo(name)] {}]
+ array set defaultvariant_info [mportinfo $defaultvariant_mport]
+ array set default_variants $defaultvariant_info(active_variants)
+ mportclose $defaultvariant_mport
+ }
+ } else {
+ array set default_variants {}
+ }
+
+ set variantstring ""
+ array set active_variants $depinfo(active_variants)
+
+ set relevant_variants [lsort -unique [concat [array names active_variants] [array names default_variants]]]
+ foreach variant $relevant_variants {
+ if {[info exists active_variants($variant)]} {
+ append variantstring "$active_variants($variant)$variant"
+ } else {
+ # the only case where this situation can occur is a default variant that was explicitly disabled
+ append variantstring "-$variant"
+ }
+ }
+
+ puts [string trim "$depinfo(name) $variantstring"]
</ins><span class="cx"> }
</span><span class="cx"> dlist_eval $dlist {} [list printdependency]
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>