<!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>[138375] branches/gsoc15-dependency/base/src/macports1.0</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/138375">138375</a></dd>
<dt>Author</dt> <dd>ijackson@macports.org</dd>
<dt>Date</dt> <dd>2015-07-06 10:45:15 -0700 (Mon, 06 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Call create_pool from macports_libsolv.tcl instead of macports.tcl
Instead of calling macports::libsolv::create_pool in macports.tcl
do set pool [create_pool] wherever $pool is required i.e search and
depcalc. In dep_calc add {*} so that jobs can be appended with multiple
ports. Configure Jobs about how to continue with the ports i.e Installing
them.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesgsoc15dependencybasesrcmacports10macportstcl">branches/gsoc15-dependency/base/src/macports1.0/macports.tcl</a></li>
<li><a href="#branchesgsoc15dependencybasesrcmacports10macports_libsolvtcl">branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesgsoc15dependencybasesrcmacports10macportstcl"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-dependency/base/src/macports1.0/macports.tcl (138374 => 138375)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-dependency/base/src/macports1.0/macports.tcl 2015-07-06 17:31:00 UTC (rev 138374)
+++ branches/gsoc15-dependency/base/src/macports1.0/macports.tcl 2015-07-06 17:45:15 UTC (rev 138375)
</span><span class="lines">@@ -2049,9 +2049,10 @@
</span><span class="cx">
</span><span class="cx"> ## Use libsolv Dependency Calculation if -l is passed
</span><span class="cx"> if {[info exists macports::global_options(ports_depengine)]} {
</span><del>- if {[macports::_target_needs_deps $target]} {
- macports::libsolv::create_pool
- set dep_res [macports::libsolv::dep_calc $portname]
</del><ins>+ if {$macports::global_options(ports_depengine) eq "libsolv"} {
+ if {[macports::_target_needs_deps $target]} {
+ set dep_res [macports::libsolv::dep_calc $portname]
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2750,7 +2751,6 @@
</span><span class="cx"> ## Use libsolv search if -l is passed
</span><span class="cx"> if {[info exists macports::global_options(ports_depengine)]} {
</span><span class="cx"> if {$macports::global_options(ports_depengine) eq "libsolv"} {
</span><del>- macports::libsolv::create_pool
</del><span class="cx"> # macports::libsolv::print
</span><span class="cx"> set search_res [macports::libsolv::search $pattern \
</span><span class="cx"> $case_sensitive $matchstyle $field]
</span></span></pre></div>
<a id="branchesgsoc15dependencybasesrcmacports10macports_libsolvtcl"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl (138374 => 138375)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl 2015-07-06 17:31:00 UTC (rev 138374)
+++ branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl 2015-07-06 17:45:15 UTC (rev 138375)
</span><span class="lines">@@ -160,9 +160,8 @@
</span><span class="cx"> ## createwhatprovides creates hash over all the provides of the package \
</span><span class="cx"> # This method is necessary before we can run any lookups on provides.
</span><span class="cx"> $pool createwhatprovides
</span><del>- } else {
- return {}
</del><span class="cx"> }
</span><ins>+ return $pool
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ## Search using libsolv. Needs some more work.
</span><span class="lines">@@ -175,7 +174,7 @@
</span><span class="cx"> # Add more info to the solv's to search into more details of the ports (description, \
</span><span class="cx"> # homepage, category, etc.
</span><span class="cx"> proc search {pattern {case_sensitive yes} {matchstyle regexp} {field name}} {
</span><del>- variable pool
</del><ins>+ set pool [create_pool]
</ins><span class="cx"> variable portindexinfo
</span><span class="cx">
</span><span class="cx"> set matches [list]
</span><span class="lines">@@ -250,7 +249,7 @@
</span><span class="cx">
</span><span class="cx"> ## Dependency calculation using libsolv
</span><span class="cx"> proc dep_calc {portname} {
</span><del>- variable pool
</del><ins>+ set pool [create_pool]
</ins><span class="cx"> ui_msg "$macports::ui_prefix Computing dependencies for $portname using libsolv"
</span><span class="cx"> set jobs [list]
</span><span class="cx"> foreach arg $portname {
</span><span class="lines">@@ -262,7 +261,10 @@
</span><span class="cx"> if {[$sel isempty]} {
</span><span class="cx"> set sel [$pool select $arg [expr $flags | $solv::Selection_SELECTION_NOCASE]]
</span><span class="cx"> }
</span><del>- lappend jobs [$sel jobs $solv::Job_SOLVER_INSTALL]
</del><ins>+ lappend jobs {*}[$sel jobs $solv::Job_SOLVER_INSTALL]
</ins><span class="cx"> }
</span><ins>+ foreach job $jobs {
+ $job configure -how $solv::Job_SOLVER_INSTALL
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>