<!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>[64420] 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="http://trac.macports.org/changeset/64420">64420</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2010-03-04 20:59:26 -0800 (Thu, 04 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>store os.platform and os.major in registry</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrccregistrysqlc">trunk/base/src/cregistry/sql.c</a></li>
<li><a href="#trunkbasesrcport10portinstalltcl">trunk/base/src/port1.0/portinstall.tcl</a></li>
<li><a href="#trunkbasesrcregistry20entryobjc">trunk/base/src/registry2.0/entryobj.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrccregistrysqlc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/cregistry/sql.c (64419 => 64420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/cregistry/sql.c 2010-03-05 04:48:21 UTC (rev 64419)
+++ trunk/base/src/cregistry/sql.c 2010-03-05 04:59:26 UTC (rev 64420)
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx"> "location TEXT, epoch INTEGER, version TEXT COLLATE VERSION, "
</span><span class="cx"> "revision INTEGER, variants TEXT, default_variants TEXT, "
</span><span class="cx"> "state TEXT, date DATETIME, installtype TEXT, archs TEXT, "
</span><del>- "requested INT, "
</del><ins>+ "requested INT, os_platform TEXT, os_major INTEGER, "
</ins><span class="cx"> "UNIQUE (name, epoch, version, revision, variants), "
</span><span class="cx"> "UNIQUE (url, epoch, version, revision, variants)"
</span><span class="cx"> ")",
</span></span></pre></div>
<a id="trunkbasesrcport10portinstalltcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portinstall.tcl (64419 => 64420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portinstall.tcl 2010-03-05 04:48:21 UTC (rev 64419)
+++ trunk/base/src/port1.0/portinstall.tcl 2010-03-05 04:59:26 UTC (rev 64420)
</span><span class="lines">@@ -144,7 +144,8 @@
</span><span class="cx"> worksrcdir UI_PREFIX destroot revision maintainers ports_force \
</span><span class="cx"> portvariants default_variants targets depends_lib PortInfo epoch license \
</span><span class="cx"> registry.installtype registry.path registry.format \
</span><del>- os.arch configure.build_arch configure.universal_archs supported_archs
</del><ins>+ os.arch configure.build_arch configure.universal_archs supported_archs \
+ os.platform os.major
</ins><span class="cx">
</span><span class="cx"> if {[string equal ${registry.format} "receipt_sqlite"]} {
</span><span class="cx"> # registry2.0
</span><span class="lines">@@ -166,6 +167,8 @@
</span><span class="cx">
</span><span class="cx"> set regref [registry::entry create $name $version $revision $portvariants $epoch]
</span><span class="cx">
</span><ins>+ $regref os_platform ${os.platform}
+ $regref os_major ${os.major}
</ins><span class="cx"> if {$supported_archs == "noarch"} {
</span><span class="cx"> $regref archs noarch
</span><span class="cx"> } elseif {[variant_exists universal] && [variant_isset universal]} {
</span><span class="lines">@@ -222,6 +225,8 @@
</span><span class="cx">
</span><span class="cx"> registry_prop_store $regref categories $categories
</span><span class="cx">
</span><ins>+ registry_prop_store $regref os_platform ${os.platform}
+ registry_prop_store $regref os_major ${os.major}
</ins><span class="cx"> if {$supported_archs == "noarch"} {
</span><span class="cx"> registry_prop_store $regref archs noarch
</span><span class="cx"> } elseif {[variant_exists universal] && [variant_isset universal]} {
</span></span></pre></div>
<a id="trunkbasesrcregistry20entryobjc"></a>
<div class="modfile"><h4>Modified: trunk/base/src/registry2.0/entryobj.c (64419 => 64420)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/registry2.0/entryobj.c 2010-03-05 04:48:21 UTC (rev 64419)
+++ trunk/base/src/registry2.0/entryobj.c 2010-03-05 04:59:26 UTC (rev 64420)
</span><span class="lines">@@ -53,6 +53,8 @@
</span><span class="cx"> "state",
</span><span class="cx"> "installtype",
</span><span class="cx"> "archs",
</span><ins>+ "os_platform",
+ "os_major",
</ins><span class="cx"> NULL
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -374,6 +376,8 @@
</span><span class="cx"> { "state", entry_obj_prop },
</span><span class="cx"> { "installtype", entry_obj_prop },
</span><span class="cx"> { "archs", entry_obj_prop },
</span><ins>+ { "os_platform", entry_obj_prop },
+ { "os_major", entry_obj_prop },
</ins><span class="cx"> /* filemap */
</span><span class="cx"> { "map", entry_obj_filemap },
</span><span class="cx"> { "unmap", entry_obj_filemap },
</span></span></pre>
</div>
</div>
</body>
</html>