<!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>[129381] contrib/mpab</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/129381">129381</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2014-12-11 12:34:16 -0800 (Thu, 11 Dec 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>mpab: handle failure caching and skipping due to failed deps for ports with bin/lib/path deps</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#contribmpabchrootscriptsbuildports">contrib/mpab/chroot-scripts/buildports</a></li>
<li><a href="#contribmpabmpabfunctions">contrib/mpab/mpab-functions</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#contribmpabchrootscriptsdep_portstcl">contrib/mpab/chroot-scripts/dep_ports.tcl</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="contribmpabchrootscriptsbuildports"></a>
<div class="modfile"><h4>Modified: contrib/mpab/chroot-scripts/buildports (129380 => 129381)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/mpab/chroot-scripts/buildports        2014-12-11 20:02:28 UTC (rev 129380)
+++ contrib/mpab/chroot-scripts/buildports        2014-12-11 20:34:16 UTC (rev 129381)
</span><span class="lines">@@ -99,20 +99,12 @@
</span><span class="cx">          echo &quot;skipping, portfile not modified since last failure&quot; | tee -a ${PROGRESSLOG} | tee ${PORTRESULTSDIR}/fail/${portName}.log
</span><span class="cx">          skipPort=1
</span><span class="cx">       else
</span><del>-         portDeps=`${PREFIX}/bin/port info --index --depends --line ${portName} | /usr/bin/tr ',' ' '`
-         nonPortDeps=&quot;&quot;
-         for oneDep in ${portDeps}; do
-            depType=`echo ${oneDep} | /usr/bin/awk -F : '{print $1}'`
-            if [[ $depType == &quot;port&quot; ]]; then
-               depName=`echo ${oneDep} | /usr/bin/awk -F : '{print $2}'`
-               if [[ -f ${PORTRESULTSDIR}/fail/${depName}.log ]]; then
-                  skipPort=1
-                  echo &quot;skipping, $depName previously failed and is needed&quot; | tee -a ${PROGRESSLOG}
-                  echo &quot;${portName} not built due to failed dependency $depName&quot; &gt; ${PORTRESULTSDIR}/fail/${portName}.log
-                  break
-               fi
-            else
-               nonPortDeps=1
</del><ins>+         for oneDep in `$TCLSH /var/tmp/dep_ports.tcl $portName`; do
+            if [[ -f ${PORTRESULTSDIR}/fail/${oneDep}.log ]]; then
+                skipPort=1
+                echo &quot;skipping, $oneDep previously failed and is needed&quot; | tee -a ${PROGRESSLOG}
+                echo &quot;${portName} not built due to failed dependency $oneDep&quot; &gt; ${PORTRESULTSDIR}/fail/${portName}.log
+                break
</ins><span class="cx">             fi
</span><span class="cx">          done
</span><span class="cx">       fi
</span><span class="lines">@@ -126,10 +118,7 @@
</span><span class="cx">             /bin/mv ${PORTRESULTSDIR}/${portName}.log ${PORTRESULTSDIR}/fail
</span><span class="cx">             echo &quot;failure&quot; | tee -a ${PROGRESSLOG}
</span><span class="cx">             ${PREFIX}/bin/port clean --work $portName rdepof:${portName}
</span><del>-            # check that it definitely failed in its own right before caching
-            if [[ -z &quot;$nonPortDeps&quot; ]]; then
-               touch -r ${portFile} ${FAILCACHE}/${portName}
-            fi
</del><ins>+            touch -r ${portFile} ${FAILCACHE}/${portName}
</ins><span class="cx">          fi
</span><span class="cx">          uninstallPorts
</span><span class="cx">          if [[ $? != 0 ]]; then
</span></span></pre></div>
<a id="contribmpabchrootscriptsdep_portstclfromrev129380contribmpabchrootscriptsarchivepathtcl"></a>
<div class="copfile"><h4>Copied: contrib/mpab/chroot-scripts/dep_ports.tcl (from rev 129380, contrib/mpab/chroot-scripts/archivepath.tcl) (0 => 129381)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/mpab/chroot-scripts/dep_ports.tcl                                (rev 0)
+++ contrib/mpab/chroot-scripts/dep_ports.tcl        2014-12-11 20:34:16 UTC (rev 129381)
</span><span class="lines">@@ -0,0 +1,105 @@
</span><ins>+#!/bin/sh
+# \
+if /usr/bin/which -s port-tclsh; then exec port-tclsh &quot;$0&quot; -i `which port-tclsh` &quot;$@&quot;; else exec /usr/bin/tclsh &quot;$0&quot; -i /usr/bin/tclsh &quot;$@&quot;; fi
+#
+# Prints the list of ports that the given port depends on. (Nothing is
+# printed for deps that are fulfilled by files not provided by any port.)
+#
+# Copyright (c) 2013-2014 The MacPorts Project.
+#
+# 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.
+
+if {[info exists env(PREFIX)]} {
+    set prefix $env(PREFIX)
+} else {
+    set prefix /opt/local
+}
+
+if {[llength $::argv] == 0} {
+    puts stderr &quot;Usage: $argv0 &lt;portname&gt;&quot;
+    exit 1
+} elseif {[llength $::argv] &gt;= 3 &amp;&amp; [lindex $argv 0] eq &quot;-i&quot;} {
+    set prefixFromInterp [file dirname [file dirname [lindex $argv 1]]]
+    if {$prefixFromInterp ne $prefix} {
+        if {[file executable ${prefix}/bin/port-tclsh]} {
+            exec ${prefix}/bin/port-tclsh $argv0 {*}[lrange $::argv 2 end] &lt;@stdin &gt;@stdout 2&gt;@stderr
+            exit 0
+        } else {
+            puts stderr &quot;No port-tclsh found in ${prefix}/bin&quot;
+            exit 1
+        }
+    }
+    set ::argv [lrange $::argv 2 end]
+}
+
+package require macports
+
+if {[catch {mportinit &quot;&quot; &quot;&quot; &quot;&quot;} result]} {
+   ui_error &quot;$errorInfo&quot;
+   ui_error &quot;Failed to initialize ports sytem: $result&quot;
+   exit 1
+}
+
+set portname [lindex $::argv 0]
+if {[llength $::argv] &gt; 1} {
+    set variations [lindex $::argv 1]
+} else {
+    set variations &quot;&quot;
+}
+
+if {[catch {set one_result [mportlookup $portname]}] || [llength $one_result] &lt; 2} {
+    # just print nothing, MPAB will notice the missing port itself
+    puts &quot;&quot;
+    exit 0
+}
+
+array set portinfo [lindex $one_result 1]
+if {[info exists portinfo(porturl)]} {
+    if {[catch {set mport [mportopen $portinfo(porturl) [list subport $portinfo(name)] $variations]}]} {
+        ui_warn &quot;failed to open port: $portname&quot;
+        puts &quot;&quot;
+        exit 0
+    } else {
+        array unset portinfo
+        array set portinfo [mportinfo $mport]
+        set workername [ditem_key $mport workername]
+        set dep_ports &quot;&quot;
+        # get the actual fulfilling port for each depspec
+        foreach deptype {depends_fetch depends_extract depends_build depends_lib depends_run} {
+            if {![info exists portinfo($deptype)]} {
+                continue
+            }
+            foreach depspec $portinfo($deptype) {
+                set dep_portname [$workername eval _get_dep_port $depspec]
+                if {$dep_portname ne &quot;&quot;} {
+                    lappend dep_ports $dep_portname
+                }
+            }
+        }
+        puts [join $dep_ports]
+    }
+    catch {mportclose $mport}
+}
</ins></span></pre></div>
<a id="contribmpabmpabfunctions"></a>
<div class="modfile"><h4>Modified: contrib/mpab/mpab-functions (129380 => 129381)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/mpab/mpab-functions        2014-12-11 20:02:28 UTC (rev 129380)
+++ contrib/mpab/mpab-functions        2014-12-11 20:34:16 UTC (rev 129381)
</span><span class="lines">@@ -276,6 +276,7 @@
</span><span class="cx"> 
</span><span class="cx">    cp -p ${baseDir}/chroot-scripts/genportlist.tcl ${chrootPath}/var/tmp/
</span><span class="cx">    cp -p ${baseDir}/chroot-scripts/archivepath.tcl ${chrootPath}/var/tmp/
</span><ins>+   cp -p ${baseDir}/chroot-scripts/dep_ports.tcl ${chrootPath}/var/tmp/
</ins><span class="cx"> 
</span><span class="cx">    rm -f ${chrootPath}/var/tmp/progress.log ${baseDir}/progress.log
</span><span class="cx">    touch ${baseDir}/progress.log
</span></span></pre>
</div>
</div>

</body>
</html>