<!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>[140488] 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/140488">140488</a></dd>
<dt>Author</dt> <dd>khindenburg@macports.org</dd>
<dt>Date</dt> <dd>2015-09-20 06:43:33 -0700 (Sun, 20 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add depends_test to handle the test dependencies of ports
https://lists.macosforge.org/pipermail/macports-dev/2015-September/031366.html
#38208</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="#trunkbasesrcportportindextcl">trunk/base/src/port/portindex.tcl</a></li>
<li><a href="#trunkbasesrcport10portdependstcl">trunk/base/src/port1.0/portdepends.tcl</a></li>
<li><a href="#trunkbasesrcport10portlinttcl">trunk/base/src/port1.0/portlint.tcl</a></li>
<li><a href="#trunkbasesrcport10portutiltcl">trunk/base/src/port1.0/portutil.tcl</a></li>
<li><a href="#trunkbasesrcregistry20portuninstalltcl">trunk/base/src/registry2.0/portuninstall.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 (140487 => 140488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/macports.tcl 2015-09-20 13:17:47 UTC (rev 140487)
+++ trunk/base/src/macports1.0/macports.tcl 2015-09-20 13:43:33 UTC (rev 140488)
</span><span class="lines">@@ -3437,7 +3437,7 @@
</span><span class="cx"> patch {return "depends_fetch depends_extract"}
</span><span class="cx"> configure -
</span><span class="cx"> build {return "depends_fetch depends_extract depends_build depends_lib"}
</span><del>- test -
</del><ins>+ test {return "depends_fetch depends_extract depends_build depends_lib depends_run depends_test"}
</ins><span class="cx"> destroot {return "depends_fetch depends_extract depends_build depends_lib depends_run"}
</span><span class="cx"> dmg -
</span><span class="cx"> pkg -
</span></span></pre></div>
<a id="trunkbasesrcportporttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port/port.tcl (140487 => 140488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port/port.tcl 2015-09-20 13:17:47 UTC (rev 140487)
+++ trunk/base/src/port/port.tcl 2015-09-20 13:43:33 UTC (rev 140488)
</span><span class="lines">@@ -101,6 +101,7 @@
</span><span class="cx">
</span><span class="cx"> Pseudo-portnames starting with variants:, variant:, description:, depends:,
</span><span class="cx"> depends_lib:, depends_run:, depends_build:, depends_fetch:, depends_extract:,
</span><ins>+depends_test:,
</ins><span class="cx"> portdir:, homepage:, epoch:, platforms:, platform:, name:, long_description:,
</span><span class="cx"> maintainers:, maintainer:, categories:, category:, version:, revision:, and
</span><span class="cx"> license: each select a set of ports based on a regex search of metadata
</span><span class="lines">@@ -1073,7 +1074,7 @@
</span><span class="cx">
</span><span class="cx"> # gather its deps
</span><span class="cx"> set results {}
</span><del>- set deptypes {depends_fetch depends_extract depends_build depends_lib depends_run}
</del><ins>+ set deptypes {depends_fetch depends_extract depends_build depends_lib depends_run depends_test}
</ins><span class="cx">
</span><span class="cx"> set deplist {}
</span><span class="cx"> foreach type $deptypes {
</span><span class="lines">@@ -1367,6 +1368,7 @@
</span><span class="cx"> ^depends_run: -
</span><span class="cx"> ^depends_extract: -
</span><span class="cx"> ^depends_fetch: -
</span><ins>+ ^depends_test: -
</ins><span class="cx"> ^replaced_by: -
</span><span class="cx"> ^revision: -
</span><span class="cx"> ^subport: -
</span><span class="lines">@@ -1395,6 +1397,7 @@
</span><span class="cx"> add_multiple_ports reslist [get_matching_ports $pat no regexp "depends_run"]
</span><span class="cx"> add_multiple_ports reslist [get_matching_ports $pat no regexp "depends_extract"]
</span><span class="cx"> add_multiple_ports reslist [get_matching_ports $pat no regexp "depends_fetch"]
</span><ins>+ add_multiple_ports reslist [get_matching_ports $pat no regexp "depends_test"]
</ins><span class="cx">
</span><span class="cx"> set el 1
</span><span class="cx"> }
</span><span class="lines">@@ -2055,6 +2058,7 @@
</span><span class="cx"> depends_build 1
</span><span class="cx"> depends_lib 1
</span><span class="cx"> depends_run 1
</span><ins>+ depends_test 1
</ins><span class="cx"> maintainers 1
</span><span class="cx"> platforms 1
</span><span class="cx"> variants 1
</span><span class="lines">@@ -2072,6 +2076,7 @@
</span><span class="cx"> depends_build "Build Dependencies"
</span><span class="cx"> depends_run "Runtime Dependencies"
</span><span class="cx"> depends_lib "Library Dependencies"
</span><ins>+ depends_test "Test Dependencies"
</ins><span class="cx"> description "Brief Description"
</span><span class="cx"> long_description "Description"
</span><span class="cx"> fullname "Full Name: "
</span><span class="lines">@@ -2095,6 +2100,7 @@
</span><span class="cx"> depends_build 22
</span><span class="cx"> depends_run 22
</span><span class="cx"> depends_lib 22
</span><ins>+ depends_test 22
</ins><span class="cx"> description 22
</span><span class="cx"> long_description 22
</span><span class="cx"> homepage 22
</span><span class="lines">@@ -2114,6 +2120,7 @@
</span><span class="cx"> set options(ports_info_depends_build) yes
</span><span class="cx"> set options(ports_info_depends_lib) yes
</span><span class="cx"> set options(ports_info_depends_run) yes
</span><ins>+ set options(ports_info_depends_test) yes
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Set up our field separators
</span><span class="lines">@@ -2164,6 +2171,7 @@
</span><span class="cx"> ports_info_skip_line ports_info_depends_fetch
</span><span class="cx"> ports_info_depends_extract ports_info_depends_build
</span><span class="cx"> ports_info_depends_lib ports_info_depends_run
</span><ins>+ ports_info_depends_test
</ins><span class="cx"> ports_info_conflicts
</span><span class="cx"> ports_info_platforms ports_info_license
</span><span class="cx"> ports_info_maintainers
</span><span class="lines">@@ -2938,7 +2946,7 @@
</span><span class="cx"> if {[info exists options(ports_${action}_no-build)] && [string is true -strict $options(ports_${action}_no-build)]} {
</span><span class="cx"> set deptypes {depends_lib depends_run}
</span><span class="cx"> } else {
</span><del>- set deptypes {depends_fetch depends_extract depends_build depends_lib depends_run}
</del><ins>+ set deptypes {depends_fetch depends_extract depends_build depends_lib depends_run depends_test}
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> array unset portinfo
</span><span class="lines">@@ -3013,7 +3021,7 @@
</span><span class="cx"> set deplist {}
</span><span class="cx"> set deps_output {}
</span><span class="cx"> set ndeps 0
</span><del>- array set labeldict {depends_fetch Fetch depends_extract Extract depends_build Build depends_lib Library depends_run Runtime}
</del><ins>+ array set labeldict {depends_fetch Fetch depends_extract Extract depends_build Build depends_lib Library depends_run Runtime depends_test Test}
</ins><span class="cx"> # get list of direct deps
</span><span class="cx"> foreach type $deptypes {
</span><span class="cx"> if {[info exists portinfo($type)]} {
</span><span class="lines">@@ -3651,6 +3659,7 @@
</span><span class="cx"> set options(ports_search_depends_build) yes
</span><span class="cx"> set options(ports_search_depends_lib) yes
</span><span class="cx"> set options(ports_search_depends_run) yes
</span><ins>+ set options(ports_search_depends_test) yes
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Array to hold given filters
</span><span class="lines">@@ -4374,7 +4383,7 @@
</span><span class="cx"> array set cmd_opts_array {
</span><span class="cx"> edit {{editor 1}}
</span><span class="cx"> info {category categories conflicts depends_fetch depends_extract
</span><del>- depends_build depends_lib depends_run
</del><ins>+ depends_build depends_lib depends_run depends_test
</ins><span class="cx"> depends description epoch fullname heading homepage index license
</span><span class="cx"> line long_description
</span><span class="cx"> maintainer maintainers name patchfiles platform platforms portdir
</span><span class="lines">@@ -4384,7 +4393,7 @@
</span><span class="cx"> rdeps {index no-build full}
</span><span class="cx"> rdependents {full}
</span><span class="cx"> search {case-sensitive category categories depends_fetch
</span><del>- depends_extract depends_build depends_lib depends_run
</del><ins>+ depends_extract depends_build depends_lib depends_run depends_test
</ins><span class="cx"> depends description epoch exact glob homepage line
</span><span class="cx"> long_description maintainer maintainers name platform
</span><span class="cx"> platforms portdir regex revision variant variants version}
</span></span></pre></div>
<a id="trunkbasesrcportportindextcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port/portindex.tcl (140487 => 140488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port/portindex.tcl 2015-09-20 13:17:47 UTC (rev 140487)
+++ trunk/base/src/port/portindex.tcl 2015-09-20 13:43:33 UTC (rev 140488)
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx"> set fd [open $tempportindex w]
</span><span class="cx"> set save_prefix ${macports::prefix}
</span><span class="cx"> foreach key {categories depends_fetch depends_extract depends_build \
</span><del>- depends_lib depends_run description epoch homepage \
</del><ins>+ depends_lib depends_run depends_test description epoch homepage \
</ins><span class="cx"> long_description maintainers name platforms revision variants \
</span><span class="cx"> version portdir replaced_by license installs_libs conflicts} {
</span><span class="cx"> set keepkeys($key) 1
</span></span></pre></div>
<a id="trunkbasesrcport10portdependstcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portdepends.tcl (140487 => 140488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portdepends.tcl 2015-09-20 13:17:47 UTC (rev 140487)
+++ trunk/base/src/port1.0/portdepends.tcl 2015-09-20 13:43:33 UTC (rev 140488)
</span><span class="lines">@@ -38,15 +38,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # define options
</span><del>-options depends_fetch depends_extract depends_build depends_run depends_lib depends
</del><ins>+options depends_fetch depends_extract depends_build depends_run depends_lib depends_test depends
</ins><span class="cx"> # Export options via PortInfo
</span><del>-options_export depends_fetch depends_extract depends_build depends_lib depends_run
</del><ins>+options_export depends_fetch depends_extract depends_build depends_lib depends_run depends_test
</ins><span class="cx">
</span><span class="cx"> option_proc depends_fetch portdepends::validate_depends_options
</span><span class="cx"> option_proc depends_extract portdepends::validate_depends_options
</span><span class="cx"> option_proc depends_build portdepends::validate_depends_options
</span><span class="cx"> option_proc depends_run portdepends::validate_depends_options
</span><span class="cx"> option_proc depends_lib portdepends::validate_depends_options
</span><ins>+option_proc depends_test portdepends::validate_depends_options
</ins><span class="cx">
</span><span class="cx"> # New option for the new dependency. We generate a warning because we don't handle this yet.
</span><span class="cx"> option_proc depends portdepends::validate_depends_options_new
</span></span></pre></div>
<a id="trunkbasesrcport10portlinttcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portlint.tcl (140487 => 140488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portlint.tcl 2015-09-20 13:17:47 UTC (rev 140487)
+++ trunk/base/src/port1.0/portlint.tcl 2015-09-20 13:43:33 UTC (rev 140488)
</span><span class="lines">@@ -339,8 +339,8 @@
</span><span class="cx"> global os.platform os.arch os.version version revision epoch \
</span><span class="cx"> description long_description platforms categories all_variants \
</span><span class="cx"> maintainers license homepage master_sites checksums patchfiles \
</span><del>- depends_fetch depends_extract depends_lib depends_build \
- depends_run distfiles fetch.type lint_portsystem lint_platforms \
</del><ins>+ depends_fetch depends_extract depends_lib depends_build depends_run \
+ depends_test distfiles fetch.type lint_portsystem lint_platforms \
</ins><span class="cx"> lint_required lint_optional replaced_by conflicts
</span><span class="cx"> set portarch [get_canonical_archs]
</span><span class="cx">
</span><span class="lines">@@ -507,6 +507,9 @@
</span><span class="cx"> if {[info exists depends_run]} {
</span><span class="cx"> lappend all_depends {*}$depends_run
</span><span class="cx"> }
</span><ins>+ if {[info exists depends_test]} {
+ lappend all_depends {*}$depends_test
+ }
</ins><span class="cx"> foreach depspec $all_depends {
</span><span class="cx"> set dep [lindex [split $depspec :] end]
</span><span class="cx"> if {[catch {set res [mport_lookup $dep]} error]} {
</span><span class="lines">@@ -523,7 +526,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Check for multiple dependencies
</span><del>- foreach deptype {depends_extract depends_lib depends_build depends_run} {
</del><ins>+ foreach deptype {depends_extract depends_lib depends_build depends_run depends_test} {
</ins><span class="cx"> if {[info exists $deptype]} {
</span><span class="cx"> array set depwarned {}
</span><span class="cx"> foreach depspec [set $deptype] {
</span></span></pre></div>
<a id="trunkbasesrcport10portutiltcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/portutil.tcl (140487 => 140488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/portutil.tcl 2015-09-20 13:17:47 UTC (rev 140487)
+++ trunk/base/src/port1.0/portutil.tcl 2015-09-20 13:43:33 UTC (rev 140488)
</span><span class="lines">@@ -1444,8 +1444,7 @@
</span><span class="cx"> patch { set deptypes "depends_fetch depends_extract" }
</span><span class="cx"> configure -
</span><span class="cx"> build { set deptypes "depends_fetch depends_extract depends_lib depends_build" }
</span><del>-
- test -
</del><ins>+ test { set deptypes "depends_fetch depends_extract depends_lib depends_build depends_run depends_test" }
</ins><span class="cx"> destroot -
</span><span class="cx"> dmg -
</span><span class="cx"> pkg -
</span></span></pre></div>
<a id="trunkbasesrcregistry20portuninstalltcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/registry2.0/portuninstall.tcl (140487 => 140488)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/registry2.0/portuninstall.tcl 2015-09-20 13:17:47 UTC (rev 140487)
+++ trunk/base/src/registry2.0/portuninstall.tcl 2015-09-20 13:43:33 UTC (rev 140488)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> # generate list of all dependencies of the port
</span><span class="cx"> proc generate_deplist {port {optslist ""}} {
</span><span class="cx">
</span><del>- set deptypes {depends_fetch depends_extract depends_build depends_lib depends_run}
</del><ins>+ set deptypes {depends_fetch depends_extract depends_build depends_lib depends_run depends_test}
</ins><span class="cx"> set all_dependencies {}
</span><span class="cx"> # look up deps from the saved portfile if possible
</span><span class="cx"> if {![catch {set mport [mportopen_installed [$port name] [$port version] [$port revision] [$port variants] $optslist]}]} {
</span></span></pre>
</div>
</div>
</body>
</html>