<!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>[118304] trunk/base/src</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/118304">118304</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-03-29 12:21:58 -0700 (Sat, 29 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: Delay displaying notes for installed ports until the end of the current operation
Mostly written by Jeremy Lavergne (snc).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcmacports10macportstcl">trunk/base/src/macports1.0/macports.tcl</a></li>
<li><a href="#trunkbasesrcportporttcl">trunk/base/src/port/port.tcl</a></li>
<li><a href="#trunkbasesrcport10portactivatetcl">trunk/base/src/port1.0/portactivate.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcmacports10macportstcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/macports.tcl (118303 => 118304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/macports.tcl 2014-03-29 19:20:00 UTC (rev 118303)
+++ trunk/base/src/macports1.0/macports.tcl 2014-03-29 19:21:58 UTC (rev 118304)
</span><span class="lines">@@ -1294,6 +1294,14 @@
</span><span class="cx"> $workername alias ui_progress_download $macports::ui_options(progress_download)
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ # notifications callback
+ if {[info exists macports::ui_options(notifications_append)]} {
+ $workername alias ui_notifications_append $macports::ui_options(notifications_append)
+ } else {
+ # provide a no-op if notifications_append wasn't set. See http://wiki.tcl.tk/3044
+ $workername alias ui_notifications_append return -level 0
+ }
+
</ins><span class="cx"> $workername alias ui_prefix ui_prefix
</span><span class="cx"> $workername alias ui_channels ui_channels
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbasesrcportporttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port/port.tcl (118303 => 118304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port/port.tcl 2014-03-29 19:20:00 UTC (rev 118303)
+++ trunk/base/src/port/port.tcl 2014-03-29 19:21:58 UTC (rev 118304)
</span><span class="lines">@@ -4639,6 +4639,9 @@
</span><span class="cx"> registry::exclusive_unlock
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ # Print notifications of just-activated ports.
+ portclient::notifications::display
+
</ins><span class="cx"> # semaphore to exit
</span><span class="cx"> if {$action_status == -999} break
</span><span class="cx"> }
</span><span class="lines">@@ -5167,7 +5170,75 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+namespace eval portclient::notifications {
+ ##
+ # Ports whose notifications to display; these were either installed
+ # or requested to be installed.
+ variable notificationsToPrint
+ array set notificationsToPrint {}
</ins><span class="cx">
</span><ins>+ ##
+ # Add a port to the list for printing notifications.
+ #
+ # @param name
+ # The name of the port.
+ # @param note
+ # A list of notes to be stored for the given port.
+ proc append {name notes} {
+ variable notificationsToPrint
+
+ set notificationsToPrint($name) $notes
+ }
+
+ ##
+ # Print port notifications.
+ #
+ proc display {} {
+ global env
+ variable notificationsToPrint
+
+ # Display notes at the end of the activation phase.
+ if {[array size notificationsToPrint] > 0} {
+ ui_notice "---> Some of the ports you installed have notes:"
+ foreach {name notes} [array get notificationsToPrint] {
+ ui_notice " $name has the following notes:"
+
+ # If env(COLUMNS) exists, limit each line's width to this width.
+ if {[info exists env(COLUMNS)]} {
+ set maxlen $env(COLUMNS)
+
+ foreach note $notes {
+ foreach line [split $note "\n"] {
+ set joiner ""
+ set lines ""
+ set newline " "
+
+ foreach word [split $line " "] {
+ if {[string length $newline] + [string length $word] >= $maxlen} {
+ lappend lines $newline
+ set newline " "
+ set joiner ""
+ }
+ ::append newline $joiner $word
+ set joiner " "
+ }
+ if {$newline ne {}} {
+ lappend lines $newline
+ }
+ ui_notice [join $lines "\n"]
+ }
+ }
+ } else {
+ foreach note $notes {
+ ui_notice $note
+ }
+ }
+ }
+ }
+ }
+}
+
+
</ins><span class="cx"> ##########################################
</span><span class="cx"> # Main
</span><span class="cx"> ##########################################
</span><span class="lines">@@ -5222,6 +5293,8 @@
</span><span class="cx"> set ui_options(progress_generic) portclient::progress::generic
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+set ui_options(notifications_append) portclient::notifications::append
+
</ins><span class="cx"> # Get arguments remaining after option processing
</span><span class="cx"> set remaining_args [lrange $cmd_argv $cmd_argn end]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbasesrcport10portactivatetcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portactivate.tcl (118303 => 118304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portactivate.tcl 2014-03-29 19:20:00 UTC (rev 118303)
+++ trunk/base/src/port1.0/portactivate.tcl 2014-03-29 19:21:58 UTC (rev 118304)
</span><span class="lines">@@ -60,42 +60,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> proc portactivate::activate_main {args} {
</span><del>- global env subport version revision portvariants user_options PortInfo startupitem.autostart UI_PREFIX
</del><ins>+ global subport version revision portvariants user_options PortInfo
</ins><span class="cx">
</span><span class="cx"> registry_activate $subport $version $revision $portvariants [array get user_options]
</span><del>-
- # Display notes at the end of the activation phase.
- if {[info exists PortInfo(notes)] && $PortInfo(notes) ne {}} {
- ui_notice ""
- foreach note $PortInfo(notes) {
- # If env(COLUMNS) exists, limit each line's width to this width.
- if {[info exists env(COLUMNS)]} {
- set maxlen $env(COLUMNS)
-
- foreach line [split $note "\n"] {
- set joiner ""
- set lines ""
- set newline ""
-
- foreach word [split $line " "] {
- if {[string length $newline] + [string length $word] >= $maxlen} {
- lappend lines $newline
- set newline ""
- set joiner ""
- }
- append newline $joiner $word
- set joiner " "
- }
- if {$newline ne {}} {
- lappend lines $newline
- }
- ui_notice [join $lines "\n"]
- }
- } else {
- ui_notice $note
- }
- }
- ui_notice ""
</del><ins>+ if {[info exists PortInfo(notes)] && [llength $PortInfo(notes)] > 0} {
+ ui_notifications_append $subport $PortInfo(notes)
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return 0
</span></span></pre>
</div>
</div>
</body>
</html>