<!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>[139553] branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl</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/139553">139553</a></dd>
<dt>Author</dt> <dd>ijackson@macports.org</dd>
<dt>Date</dt> <dd>2015-08-20 01:54:59 -0700 (Thu, 20 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update comment headers.
Add more information to the comment headers. Update the
To Do and Done list.</pre>
<h3>Modified Paths</h3>
<ul>
<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="branchesgsoc15dependencybasesrcmacports10macports_libsolvtcl"></a>
<div class="modfile"><h4>Modified: branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl (139552 => 139553)</h4>
<pre class="diff"><span>
<span class="info">--- branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl 2015-08-20 08:24:32 UTC (rev 139552)
+++ branches/gsoc15-dependency/base/src/macports1.0/macports_libsolv.tcl 2015-08-20 08:54:59 UTC (rev 139553)
</span><span class="lines">@@ -60,16 +60,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ## Procedure to create the libsolv pool. This is similar to PortIndex. \
</span><del>- # Read the PortIndex contents and write into libsolv readable solv's.
</del><ins>+ # Read the PortIndex contents and write into libsolv readable solv's (solvables).
</ins><span class="cx"> # To Do:
</span><span class="cx"> # Add additional information regarding arch, vendor, etc to solv.
</span><del>- # Add obsoletes information to solv by parsing the replaced_by field in PortIndex. \
- # They mean the converse of each other, hence cannot assign them directly.
</del><span class="cx"> # Done:
</span><span class="cx"> # Add epoch, version and revision to each solv.
</span><span class="cx"> # Add more info to solv about its description, long_description, license, category and homepage.
</span><span class="cx"> # Add dependency information to each solv.
</span><span class="cx"> # Create a repo of installed packages for dependency calculation and Transaction summary.
</span><ins>+ # Add obsoletes information to solv by parsing the replaced_by field in PortIndex. \
+ # They mean the converse of each other, hence cannot assign them directly.
</ins><span class="cx"> proc create_pool {} {
</span><span class="cx"> variable pool
</span><span class="cx"> variable portindexinfo
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> ## Variable for replace_by to set obsoletes of solv.
</span><span class="cx"> variable replaced_by
</span><span class="cx">
</span><del>- ## Variable to map portname to its solv
</del><ins>+ ## Variable to map portname to its corresponding solvable.
</ins><span class="cx"> variable solvs
</span><span class="cx">
</span><span class="cx"> ## Check if libsolv cache (pool) is already created or not.
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx">
</span><span class="cx"> set solvid [$solvable cget -id]
</span><span class="cx">
</span><del>- ## Add extra info to repodata i.e. Summary, Description, etc to the solvables
</del><ins>+ ## Add extra info to repodata i.e. Summary, Description, License, homepage, category to the solvables
</ins><span class="cx"> # Valid constant fields can be found at src/knownid.h of libsolv.
</span><span class="cx"> if {[info exists portinfo(description)]} {
</span><span class="cx"> $repodata set_str $solvid $solv::SOLVABLE_SUMMARY $portinfo(description)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx">
</span><span class="cx"> ## Add dependency information to solvable using portinfo
</span><span class="cx"> # $marker i.e last arg to add_deparray is set to 1 for build dependencies
</span><del>- # and -1 for runtime dependencies
</del><ins>+ # and -1 for runtime dependencies (Still need to figure this out correctly).
</ins><span class="cx"> foreach {fieldname deptype marker} $fields {
</span><span class="cx"> if {[info exists portinfo($fieldname)]} {
</span><span class="cx"> foreach dep $portinfo($fieldname) {
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> ## Set portinfo of each solv object. Map it to correct solvid.
</span><span class="cx"> set portindexinfo([$solvable cget -id]) $line
</span><span class="cx">
</span><del>- ## Set solv's to its portname
</del><ins>+ ## Map portname to its correspoding solvable.
</ins><span class="cx"> set solvs($name) $solvable
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx"> return $pool
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ## Search using libsolv. Needs some more work.
</del><ins>+ ## Search using libsolv.
</ins><span class="cx"> # To Do list:
</span><span class="cx"> # Add support for searching in License and other fields too. Some changes to be made port.tcl to
</span><span class="cx"> # support these options to be passed i.e. --license
</span><span class="lines">@@ -289,8 +289,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ ## Dataiterator procedure will iterate over the solvables and return the matched solv's.
</ins><span class="cx"> set di [$pool Dataiterator $search_option $pattern $di_flag]
</span><span class="cx">
</span><ins>+ ## Add the matched solvables to the Selection (set of solvables).
</ins><span class="cx"> while {[set data [$di __next__]] ne "NULL"} {
</span><span class="cx"> $sel add_raw $solv::Job_SOLVER_SOLVABLE [$data cget -solvid]
</span><span class="cx"> }
</span><span class="lines">@@ -312,15 +314,19 @@
</span><span class="cx"> return $matches
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ## Dependency calculation using libsolv
</del><ins>+ ## Dependency calculation using libsolv.
+ # Pass the complete list of ports to dep_calc instead of calling
+ # it for every single portname. This helps to optimize the end result
+ # and resolving conflicts between multiple ports.
</ins><span class="cx"> proc dep_calc {portlist} {
</span><span class="cx"> set pool [create_pool]
</span><span class="cx"> variable portindexinfo
</span><ins>+ ## Uncomment the following line for debuging output related to solvables and pool information.
</ins><span class="cx"> # $pool set_debuglevel 3
</span><span class="cx">
</span><del>- ## List of ports to be installed
</del><ins>+ ## Create list of ports to be installed.
</ins><span class="cx"> set portname [list]
</span><del>- ## Append portname to $portname after extracting them from $portlist
</del><ins>+ ## Append portnames to $portname list after extracting them from $portlist.
</ins><span class="cx"> foreach portspec $portlist {
</span><span class="cx"> array set portinfo $portspec
</span><span class="cx"> set pname $portinfo(name)
</span><span class="lines">@@ -346,7 +352,7 @@
</span><span class="cx"> lappend jobs {*}[$sel jobs $solv::Job_SOLVER_INSTALL]
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ## Solve the jobs
</del><ins>+ ## Solve the jobs.
</ins><span class="cx"> set solver [$pool Solver]
</span><span class="cx"> while {yes} {
</span><span class="cx"> set jobs_list [list]
</span><span class="lines">@@ -362,6 +368,7 @@
</span><span class="cx"> break
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ ## Conflict Resolution.
</ins><span class="cx"> ## Find a solution for the problems found.
</span><span class="cx"> foreach problem $problems {
</span><span class="cx"> ui_debug "Problem [$problem cget -id]/[llength $problems]"
</span><span class="lines">@@ -395,7 +402,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ## Transaction Part
</del><ins>+ ## Create Transaction.
+ # To Do:
+ # Add support for uninstall, reinstall, upgrade and downgrade (Versioned portname required).
+ # Done:
+ # Create list of ports to be installed.
</ins><span class="cx"> set trans [$solver transaction]
</span><span class="cx"> if {[$trans isempty]} {
</span><span class="cx"> puts "Nothing to do"
</span></span></pre>
</div>
</div>
</body>
</html>