<!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>[151047] 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/151047">151047</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2016-08-06 06:00:13 -0700 (Sat, 06 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>mp-buildbot: Install dependencies one-by-one
Install dependencies step by step in install-dependencies so that we can track
which dependencies failed and start building a fail cache again. Additionally,
this fixes a problem where
> port echo depof:wine
would print a list of dependencies but those dependencies were not installed
with the +universal variant as required. To do this, tools/dependencies.tcl
calls mportdepends, which determines the necessary variants of the
dependencies.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#contribmpbuildbotmpbbinstalldependencies">contrib/mp-buildbot/mpbb-install-dependencies</a></li>
</ul>
<h3>Added 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="contribmpbuildbotmpbbinstalldependencies"></a>
<div class="modfile"><h4>Modified: contrib/mp-buildbot/mpbb-install-dependencies (151046 => 151047)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/mp-buildbot/mpbb-install-dependencies 2016-08-06 12:45:17 UTC (rev 151046)
+++ contrib/mp-buildbot/mpbb-install-dependencies 2016-08-06 13:00:13 UTC (rev 151047)
</span><span class="lines">@@ -10,19 +10,40 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> install-dependencies() {
</span><ins>+ local dependencies
+
</ins><span class="cx"> if [ -z "${option_port}" ]; then
</span><span class="cx"> errmsg "--port is required"
</span><span class="cx"> return 1
</span><span class="cx"> fi
</span><span class="cx">
</span><del>- # skip if the port has no dependencies
- if [ -z "$(${option_prefix}/bin/port echo depof:${option_port})" ]; then
</del><ins>+ # calculate list of dependencies in-order
+ dependencies=$("${option_prefix}/bin/port-tclsh" "${thisdir}/tools/dependencies.tcl" "${option_port}")
+ if [ $? -ne 0 ]; then
+ echo "Calculating dependencies for '${option_port}' failed, cleaning up..." >&2
+ cleanup
+ return 1
+ fi
+
+ if [ -z "$dependencies" ]; then
+ echo "'${option_port}' has no dependencies, continuing..."
</ins><span class="cx"> return 0
</span><span class="cx"> fi
</span><span class="cx">
</span><del>- if ! "${option_prefix}/bin/port" -d install --unrequested depof:"${option_port}"; then
- echo "Build failed, cleaning up..."
- cleanup
- return 1
- fi
</del><ins>+ echo "Installing dependencies:"
+ echo "$dependencies" | sed -E 's/^/ - /'
+
+ echo "$dependencies" | while read dependency; do
+ # Split portname +variant1+variant2 into portname and variants, where
+ # the variants are optional.
+ depname=${dependency%% *}
+ depvariants=${dependency:${#depname}}
+
+ echo "Installing dependency '${depname}', variants: '${depvariants}'"
+ if ! "${option_prefix}/bin/port" -d install --unrequested "$depname" $depvariants; then
+ echo "Build of dependency '${depname}' failed, cleaning up..." >&2
+ cleanup
+ return 1
+ fi
+ done
</ins><span class="cx"> }
</span></span></pre></div>
<a id="contribmpbuildbottoolsdependenciestcl"></a>
<div class="addfile"><h4>Added: contrib/mp-buildbot/tools/dependencies.tcl (0 => 151047)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/mp-buildbot/tools/dependencies.tcl (rev 0)
+++ contrib/mp-buildbot/tools/dependencies.tcl 2016-08-06 13:00:13 UTC (rev 151047)
</span><span class="lines">@@ -0,0 +1,115 @@
</span><ins>+#!/usr/bin/env port-tclsh
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# Writes a list of dependencies for a given port including variants (e.g. if
+# the universal variant is required) to stdout.
+#
+# Copyright (c) 2016 The MacPorts Project.
+# Copyright (c) 2016 Clemens Lang <cal@macports.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in
+# the documentation and/or other materials provided with the
+# distribution.
+# 3. Neither the name of the MacPorts project, nor the names of any contributors
+# may be used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
+# AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package require macports
+
+if {[llength $::argv] == 0} {
+ puts stderr "Usage: $argv0 <portname>"
+ exit 1
+}
+
+# initialize macports
+if {[catch {mportinit "" "" ""} result]} {
+ ui_error "$errorInfo"
+ ui_error "Failed to initialize ports sytem: $result"
+ exit 1
+}
+
+# look up the path of the Portfile for the given port
+set portname [lindex $::argv 0]
+#try -pass_signal {
+try {
+ set result [mportlookup $portname]
+ if {[llength $result] < 2} {
+ ui_error "No such port: $portname"
+ exit 1
+ }
+} catch {{*} eCode eMessage} {
+ ui_error "mportlookup $portname failed: $eMessage"
+ exit 1
+}
+
+# open the port so we can run dependency calculation
+array set portinfo [lindex $result 1]
+#try -pass_signal {
+try {
+ set mport [mportopen $portinfo(porturl) [list subport $portname] {}]
+} catch {{*} eCode eMessage} {
+ ui_error "mportopen ${portinfo(porturl)} failed: $eMessage"
+ exit 1
+}
+
+# gather a list of dependencies with the correct variants (+universal is dealt
+# with in specific ways)
+if {[mportdepends $mport "activate"] != 0} {
+ ui_error "mportdepends $portname activate failed."
+ exit 1
+}
+
+# sort these dependencies topologically; exclude the given port itself
+set dlist [dlist_append_dependents $macports::open_mports $mport {}]
+dlist_delete dlist $mport
+
+## print dependencies with variants
+foreach ditem $dlist {
+ set depname [ditem_key $ditem provides]
+ array set depinfo [mportinfo $ditem]
+
+ puts [string trim "$depname $depinfo(canonical_active_variants)"]
+}
+
+# close all open ports
+foreach ditem $dlist {
+ #try -pass_signal {
+ try {
+ mportclose $ditem
+ } catch {{*} eCode eMessage} {
+ ui_warn "mportclose [ditem_key $ditem provides] failed: $eMessage"
+ }
+}
+#try -pass_signal {
+try {
+ mportclose $mport
+} catch {{*} eCode eMessage} {
+ ui_error "mportclose $portname failed: $eMessage"
+ exit 1
+}
+
+# shut down MacPorts
+#try -pass_signal {
+try {
+ mportshutdown
+} catch {{*} eCode eMessage} {
+ ui_error "mportshutdown failed: $eMessage"
+ exit 1
+}
</ins><span class="cx">Property changes on: contrib/mp-buildbot/tools/dependencies.tcl
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
</div>
</body>
</html>