<!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>[146828] contrib/buildbot-test</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/146828">146828</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2016-03-18 10:14:44 -0700 (Fri, 18 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add new configuration options for prefixes
slaveprefix is for which prefix packages should be built.
toolsprefix will be used for utilities, for example svn.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#contribbuildbottestconfigjsonsample">contrib/buildbot-test/config.json.sample</a></li>
<li><a href="#contribbuildbottestmastercfg">contrib/buildbot-test/master.cfg</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="contribbuildbottestconfigjsonsample"></a>
<div class="modfile"><h4>Modified: contrib/buildbot-test/config.json.sample (146827 => 146828)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/buildbot-test/config.json.sample 2016-03-18 17:11:49 UTC (rev 146827)
+++ contrib/buildbot-test/config.json.sample 2016-03-18 17:14:44 UTC (rev 146828)
</span><span class="lines">@@ -7,5 +7,7 @@
</span><span class="cx"> "htpasswdfile": "htpasswd",
</span><span class="cx"> "mpbbsvnurl": "https://svn.macports.org/repository/macports/contrib/mp-buildbot",
</span><span class="cx"> "svnurl": "https://svn.macports.org/repository/macports/trunk",
</span><del>- "archivesite": "http://packages.macports.org"
</del><ins>+ "archivesite": "http://packages.macports.org",
+ "slaveprefix": "/opt/local",
+ "toolsprefix": "/opt/mports"
</ins><span class="cx"> }
</span></span></pre></div>
<a id="contribbuildbottestmastercfg"></a>
<div class="modfile"><h4>Modified: contrib/buildbot-test/master.cfg (146827 => 146828)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/buildbot-test/master.cfg 2016-03-18 17:11:49 UTC (rev 146827)
+++ contrib/buildbot-test/master.cfg 2016-03-18 17:14:44 UTC (rev 146828)
</span><span class="lines">@@ -28,12 +28,14 @@
</span><span class="cx"> mpbbsvnurl = "https://svn.macports.org/repository/macports/contrib/mp-buildbot"
</span><span class="cx"> svnurl = "https://svn.macports.org/repository/macports/trunk"
</span><span class="cx"> archivesite = "http://packages.macports.org"
</span><ins>+slaveprefix = "/opt/local"
+toolsprefix = "/opt/mports"
</ins><span class="cx">
</span><span class="cx"> if os.path.exists(_path('config.json')):
</span><span class="cx"> with open(_path('config.json')) as f:
</span><span class="cx"> configdata = json.load(f)
</span><span class="cx"> locals = locals()
</span><del>- for key in ["production", "privkey", "slaveport", "httpport", "buildboturl", "htpasswdfile", "mpbbsvnurl", "svnurl", "archivesite"]:
</del><ins>+ for key in ["production", "privkey", "slaveport", "httpport", "buildboturl", "htpasswdfile", "mpbbsvnurl", "svnurl", "archivesite", "slaveprefix", "toolsprefix"]:
</ins><span class="cx"> if configdata[key]:
</span><span class="cx"> locals[key] = configdata[key]
</span><span class="cx">
</span><span class="lines">@@ -216,21 +218,15 @@
</span><span class="cx"> self.setProperty('fullportlist', ' '.join(portset))
</span><span class="cx">
</span><span class="cx">
</span><del>-# can't run with PREFIX/SRC_PREFIX inside the workdir in production,
</del><ins>+# can't run with prefix inside the workdir in production,
</ins><span class="cx"> # because archives must be built with prefix=/opt/local
</span><span class="cx"> if production:
</span><span class="cx"> prefix='/opt/local'
</span><del>- src_prefix='/opt/mports'
</del><span class="cx"> dlhost='packages@packages-origin.macports.org'
</span><span class="cx"> dlpath='/var/www/html/packages'
</span><span class="cx"> else:
</span><del>- prefix='/opt/local'
- src_prefix='/opt/dports'
- tools_prefix='/opt/mports'
</del><ins>+ prefix=slaveprefix
</ins><span class="cx">
</span><del>- #prefix='%(workdir)s/opt/local'
- #src_prefix='%(workdir)s/opt/mports'
-
</del><span class="cx"> dlpath='./deployed_archives'
</span><span class="cx"> dlhost=''
</span><span class="cx">
</span><span class="lines">@@ -365,7 +361,7 @@
</span><span class="cx"> name="portbuilder-" + plat,
</span><span class="cx"> slavenames=["ports-" + plat],
</span><span class="cx"> factory=portbuilder_factory,
</span><del>- env={"PATH": tools_prefix + "/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"})]
</del><ins>+ env={"PATH": toolsprefix + "/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"})]
</ins><span class="cx">
</span><span class="cx"> ####### STATUS TARGETS
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>