<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/bda6687cd4f38894aa19f9017f7e4564357a561d">https://github.com/macports/macports-base/commit/bda6687cd4f38894aa19f9017f7e4564357a561d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new bda6687 Speed up rev-upgrade scan for C++ stdlib usage
</span>bda6687 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bda6687cd4f38894aa19f9017f7e4564357a561d
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Fri Mar 9 07:46:53 2018 +1100
<span style='display:block; white-space:pre;color:#404040;'> Speed up rev-upgrade scan for C++ stdlib usage
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Make it possible to search for registry files by port id, and use that
</span><span style='display:block; white-space:pre;color:#404040;'> to get all binary files belonging to each port with a single query.
</span>---
src/macports1.0/macports.tcl | 8 ++------
src/registry2.0/fileobj.c | 1 +
2 files changed, 3 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/macports1.0/macports.tcl b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 61cdbe8..6627683 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/macports1.0/macports.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4619,13 +4619,9 @@ proc macports::revupgrade_scanandrebuild {broken_port_counts_name opts} {
</span> $revupgrade_progress update $i $maybe_cxx_len
}
incr i
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set portid [$maybe_port id]
</span> set binary_files {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach maybe_binary [$maybe_port imagefiles] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set filehandle [registry::file open $portid $maybe_binary]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {$filehandle binary} isbinary] && $isbinary} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend binary_files [$filehandle actual_path]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach filehandle [registry::file search id [$maybe_port id] binary 1] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend binary_files [$filehandle actual_path]
</span> }
$maybe_port cxx_stdlib [get_actual_cxx_stdlib $binary_files]
# can't tell after the fact, assume not overridden
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/registry2.0/fileobj.c b/src/registry2.0/fileobj.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 39ab84d..5c26294 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/registry2.0/fileobj.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/registry2.0/fileobj.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,6 +40,7 @@
</span> #include "util.h"
const char* file_props[] = {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ "id",
</span> "path",
"actual_path",
"active",
</pre><pre style='margin:0'>
</pre>