<!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>[151658] contrib/mp-buildbot</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/151658">151658</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2016-08-19 06:05:51 -0700 (Fri, 19 Aug 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>mp-buildbot: preliminary support for variants</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#contribmpbuildbotmpbb">contrib/mp-buildbot/mpbb</a></li>
<li><a href="#contribmpbuildbotmpbbinstalldependencies">contrib/mp-buildbot/mpbb-install-dependencies</a></li>
<li><a href="#contribmpbuildbotmpbbinstallport">contrib/mp-buildbot/mpbb-install-port</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="contribmpbuildbotmpbb"></a>
<div class="modfile"><h4>Modified: contrib/mp-buildbot/mpbb (151657 => 151658)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/mp-buildbot/mpbb        2016-08-19 13:04:46 UTC (rev 151657)
+++ contrib/mp-buildbot/mpbb        2016-08-19 13:05:51 UTC (rev 151658)
</span><span class="lines">@@ -8,6 +8,7 @@
</span><span class="cx"> option_default_archive_site=https://packages.macports.org
</span><span class="cx"> option_default_help=0
</span><span class="cx"> option_default_port=
</span><ins>+option_default_variants=
</ins><span class="cx"> option_default_prefix=/opt/local
</span><span class="cx"> option_default_staging_dir=${PWD:-/tmp/mp-buildbot}/archive-staging
</span><span class="cx"> option_default_svn=$(which svn)
</span><span class="lines">@@ -18,6 +19,7 @@
</span><span class="cx"> option_archive_site=$option_default_archive_site
</span><span class="cx"> option_help=$option_default_help
</span><span class="cx"> option_port=$option_default_port
</span><ins>+option_variants=$option_default_variants
</ins><span class="cx"> option_prefix=$option_default_prefix
</span><span class="cx"> option_staging_dir=$option_default_staging_dir
</span><span class="cx"> option_svn=$option_default_svn
</span><span class="lines">@@ -52,6 +54,10 @@
</span><span class="cx">    Name of the port to build in MacPorts. This is required for the steps that
</span><span class="cx">    build a port.
</span><span class="cx"> 
</span><ins>+ --variants VARIANTS
+   An optional string with port variants (empty by default; not fully
+   functional yet).
+
</ins><span class="cx">  --prefix PREFIX
</span><span class="cx">    The prefix of the MacPorts installation that will build the ports. Defaults
</span><span class="cx">    to $option_default_prefix.
</span><span class="lines">@@ -139,6 +145,10 @@
</span><span class="cx">                     option_port=$2
</span><span class="cx">                     shift
</span><span class="cx">                     ;;
</span><ins>+                --variants)
+                    option_variants=$2
+                    shift
+                    ;;
</ins><span class="cx">                 --prefix)
</span><span class="cx">                     option_prefix=$2
</span><span class="cx">                     shift
</span></span></pre></div>
<a id="contribmpbuildbotmpbbinstalldependencies"></a>
<div class="modfile"><h4>Modified: contrib/mp-buildbot/mpbb-install-dependencies (151657 => 151658)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/mp-buildbot/mpbb-install-dependencies        2016-08-19 13:04:46 UTC (rev 151657)
+++ contrib/mp-buildbot/mpbb-install-dependencies        2016-08-19 13:05:51 UTC (rev 151658)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">     # calculate list of dependencies in-order
</span><span class="cx">     # $option_prefix and $thisdir are set in mpbb
</span><span class="cx">     # shellcheck disable=SC2154
</span><del>-    dependencies=$(&quot;${option_prefix}/bin/port-tclsh&quot; &quot;${thisdir}/tools/dependencies.tcl&quot; &quot;${option_port}&quot;)
</del><ins>+    dependencies=$(&quot;${option_prefix}/bin/port-tclsh&quot; &quot;${thisdir}/tools/dependencies.tcl&quot; &quot;${option_port}&quot; &quot;${option_variants}&quot;)
</ins><span class="cx">     if [ $? -ne 0 ]; then
</span><span class="cx">         echo &quot;Calculating dependencies for '${option_port}' failed, aborting.&quot; &gt;&amp;2
</span><span class="cx">         echo &quot;Building '${option_port}' ... [ERROR] (failed to calculate dependencies)&quot; &gt;&gt; &quot;$log_subports_progress&quot;
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">         echo -n &quot;${text} ... &quot; &gt;&gt; &quot;$log_status_dependencies&quot;
</span><span class="cx">         # $depvariants isn't quoted on purpose
</span><span class="cx">         # shellcheck disable=SC2086
</span><del>-        if ! &quot;${option_prefix}/bin/port&quot; -d install --unrequested &quot;$depname&quot; $depvariants; then
</del><ins>+        if ! &quot;${option_prefix}/bin/port&quot; -d install --unrequested &quot;$depname&quot; $depvariants ${option_variants}; then
</ins><span class="cx">             echo &quot;Build of dependency '${depname}' failed, aborting.&quot; &gt;&amp;2
</span><span class="cx">             echo &quot;[FAIL]&quot; &gt;&gt; &quot;$log_status_dependencies&quot;
</span><span class="cx">             echo &quot;Building '${option_port}' ... [ERROR] (failed to install dependency '${depname}')&quot; &gt;&gt; &quot;$log_subports_progress&quot;
</span></span></pre></div>
<a id="contribmpbuildbotmpbbinstallport"></a>
<div class="modfile"><h4>Modified: contrib/mp-buildbot/mpbb-install-port (151657 => 151658)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/mp-buildbot/mpbb-install-port        2016-08-19 13:04:46 UTC (rev 151657)
+++ contrib/mp-buildbot/mpbb-install-port        2016-08-19 13:05:51 UTC (rev 151658)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">     time_start=$(date +%s)
</span><span class="cx">     # $option_prefix is set in mpbb
</span><span class="cx">     # shellcheck disable=SC2154
</span><del>-    if ! &quot;${option_prefix}/bin/port&quot; -dk install &quot;${option_port}&quot;; then
</del><ins>+    if ! &quot;${option_prefix}/bin/port&quot; -dk install &quot;${option_port}&quot; ${option_variants}; then
</ins><span class="cx">         echo &quot;Build of '${option_port}' failed.&quot;
</span><span class="cx">         # log: summary for the portwatcher
</span><span class="cx">         echo &quot;Building '${option_port}' ... [ERROR]&quot; &gt;&gt; &quot;$log_subports_progress&quot;
</span></span></pre>
</div>
</div>

</body>
</html>