<!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>[152129] contrib/mp-buildbot</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/152129">152129</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2016-08-29 08:58:33 -0700 (Mon, 29 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>mpbb: Rename "--workdir" to "--work-dir"
In option names, consistently separate words with hyphens/underscores
(e.g., "--staging-dir").</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#contribmpbuildbotREADMEmd">contrib/mp-buildbot/README.md</a></li>
<li><a href="#contribmpbuildbotmpbb">contrib/mp-buildbot/mpbb</a></li>
<li><a href="#contribmpbuildbotmpbbcheckout">contrib/mp-buildbot/mpbb-checkout</a></li>
<li><a href="#contribmpbuildbotmpbbgatherarchives">contrib/mp-buildbot/mpbb-gather-archives</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="contribmpbuildbotREADMEmd"></a>
<div class="modfile"><h4>Modified: contrib/mp-buildbot/README.md (152128 => 152129)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/mp-buildbot/README.md 2016-08-29 15:43:47 UTC (rev 152128)
+++ contrib/mp-buildbot/README.md 2016-08-29 15:58:33 UTC (rev 152129)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx">
</span><span class="cx"> mpbb checkout \
</span><span class="cx"> --prefix /opt/local \
</span><del>- --workdir /tmp/scratch \
</del><ins>+ --work-dir /tmp/scratch \
</ins><span class="cx"> --svn-url https://svn.macports.org/repository/macports/trunk \
</span><span class="cx"> --svn-revision 123456
</span><span class="cx">
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> mpbb gather-archives \
</span><span class="cx"> --prefix /opt/local \
</span><del>- --workdir /tmp/scratch \
</del><ins>+ --work-dir /tmp/scratch \
</ins><span class="cx"> --archive-site https://packages.macports.org \
</span><span class="cx"> --staging-dir /tmp/scratch/staging
</span><span class="cx">
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> - `$option_svn_url`:
</span><span class="cx"> The URL of a Subversion repository containing the MacPorts `base`
</span><span class="cx"> and `dports` directory trees.
</span><del>-- `$option_workdir`:
</del><ins>+- `$option_work_dir`:
</ins><span class="cx"> A directory for storing temporary data. It is guaranteed to
</span><span class="cx"> persist for the duration of an `mpbb` run, so it may be used to
</span><span class="cx"> share ancillary files (e.g., a Subversion checkout of the ports
</span></span></pre></div>
<a id="contribmpbuildbotmpbb"></a>
<div class="modfile"><h4>Modified: contrib/mp-buildbot/mpbb (152128 => 152129)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/mp-buildbot/mpbb 2016-08-29 15:43:47 UTC (rev 152128)
+++ contrib/mp-buildbot/mpbb 2016-08-29 15:58:33 UTC (rev 152129)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> option_default_svn=$(which svn)
</span><span class="cx"> option_default_svn_revision=HEAD
</span><span class="cx"> option_default_svn_url=https://svn.macports.org/repository/macports/trunk
</span><del>-option_default_workdir=${PWD:-/tmp/mp-buildbot}
</del><ins>+option_default_work_dir=${PWD:-/tmp/mp-buildbot}
</ins><span class="cx">
</span><span class="cx"> option_archive_site=$option_default_archive_site
</span><span class="cx"> option_help=$option_default_help
</span><span class="lines">@@ -25,8 +25,8 @@
</span><span class="cx"> option_svn=$option_default_svn
</span><span class="cx"> option_svn_revision=$option_default_svn_revision
</span><span class="cx"> option_svn_url=$option_default_svn_url
</span><del>-option_workdir=$option_default_workdir
-option_logdir="${option_workdir}/logs"
</del><ins>+option_work_dir=$option_default_work_dir
+option_logdir="${option_work_dir}/logs"
</ins><span class="cx">
</span><span class="cx"> # Print $0 and arguments to standard error.
</span><span class="cx"> # Unset IFS to ensure "$*" uses spaces as separators.
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> on the archive server. Defaults to the 'archive-staging' subfolder in the
</span><span class="cx"> current directory.
</span><span class="cx">
</span><del>- --workdir WORKDIR
</del><ins>+ --work-dir WORKDIR
</ins><span class="cx"> A scratch area that mpbb will use to put temporary files, ideally kept
</span><span class="cx"> between builds. Your MacPorts installation in --prefix needs to be able to
</span><span class="cx"> access this location. Defaults to your current directory, or
</span><span class="lines">@@ -171,9 +171,9 @@
</span><span class="cx"> option_svn_revision=$2
</span><span class="cx"> shift
</span><span class="cx"> ;;
</span><del>- --workdir)
- option_workdir=$2
- option_logdir="${option_workdir}/logs"
</del><ins>+ --work-dir)
+ option_work_dir=$2
+ option_logdir="${option_work_dir}/logs"
</ins><span class="cx"> shift
</span><span class="cx"> ;;
</span><span class="cx"> --)
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> usage
</span><span class="cx"> fi
</span><span class="cx"> ## Otherwise, run the command and deal with errors
</span><del>-export PORTSRC="${option_workdir}/macports.conf"
</del><ins>+export PORTSRC="${option_work_dir}/macports.conf"
</ins><span class="cx"> if ! $command "$@"; then
</span><span class="cx"> err "Failed to run $command"
</span><span class="cx"> exit 1
</span></span></pre></div>
<a id="contribmpbuildbotmpbbcheckout"></a>
<div class="modfile"><h4>Modified: contrib/mp-buildbot/mpbb-checkout (152128 => 152129)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/mp-buildbot/mpbb-checkout 2016-08-29 15:43:47 UTC (rev 152128)
+++ contrib/mp-buildbot/mpbb-checkout 2016-08-29 15:58:33 UTC (rev 152129)
</span><span class="lines">@@ -14,10 +14,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> checkout() {
</span><del>- # $option_workdir is set in mpbb, which sources this script
</del><ins>+ # $option_work_dir is set in mpbb, which sources this script
</ins><span class="cx"> # shellcheck disable=SC2154
</span><del>- dports_svn=${option_workdir}/dports
- tools_svn=${option_workdir}/tools
</del><ins>+ dports_svn=${option_work_dir}/dports
+ tools_svn=${option_work_dir}/tools
</ins><span class="cx"> # $option_svn is set in mpbb
</span><span class="cx"> # shellcheck disable=SC2154
</span><span class="cx"> svn=${option_svn}
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> "${tools_svn}" || return $?
</span><span class="cx"> else
</span><span class="cx"> echo "Checking out macports tools from svn..."
</span><del>- mkdir -p "${option_workdir}"
</del><ins>+ mkdir -p "${option_work_dir}"
</ins><span class="cx"> "$svn" checkout --non-interactive \
</span><span class="cx"> -r HEAD "${svn_url}/base/portmgr/jobs" \
</span><span class="cx"> "${tools_svn}" || return $?
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> "${dports_svn}" || return $?
</span><span class="cx"> else
</span><span class="cx"> echo "Checking out macports from svn..."
</span><del>- mkdir -p "${option_workdir}"
</del><ins>+ mkdir -p "${option_work_dir}"
</ins><span class="cx"> "$svn" checkout --non-interactive \
</span><span class="cx"> -r "${svn_rev}" "${svn_url}/dports" \
</span><span class="cx"> "${dports_svn}" || return $?
</span><span class="lines">@@ -64,14 +64,14 @@
</span><span class="cx"> # shellcheck disable=SC2154
</span><span class="cx"> (cd "${dports_svn}" && "${option_prefix}/bin/portindex") || return $?
</span><span class="cx">
</span><del>- cat > "${option_workdir}/macports.conf" <<EOF || return $?
</del><ins>+ cat > "${option_work_dir}/macports.conf" <<EOF || return $?
</ins><span class="cx"> # Automatically overwritten by mpbb-checkout
</span><span class="cx"> # Do not edit !!!
</span><del>-sources_conf ${option_workdir}/sources.conf
</del><ins>+sources_conf ${option_work_dir}/sources.conf
</ins><span class="cx"> host_blacklist aarnet.au.distfiles.macports.org aarnet.au.packages.macports.org cjj.kr.distfiles.macports.org cjj.kr.packages.macports.org fco.it.distfiles.macports.org fco.it.packages.macports.org her.gr.distfiles.macports.org her.gr.packages.macports.org jnb.za.distfiles.macports.org jnb.za.packages.macports.org jog.id.distfiles.macports.org jog.id.packages.macports.org lil.fr.distfiles.macports.org lil.fr.packages.macports.org mse.uk.distfiles.macports.org mse.uk.packages.macports.org nou.nc.distfiles.macports.org nou.nc.packages.macports.org nue.de.distfiles.macports.org nue.de.packages.macports.org osl.no.distfiles.macports.org osl.no.packages.macports.org sea.us.distfiles.macports.org sea.us.packages.macports.org ykf.ca.distfiles.macports.org ykf.ca.packages.macports.org
</span><span class="cx"> EOF
</span><span class="cx">
</span><del>- cat > "${option_workdir}/sources.conf" <<EOF || return $?
</del><ins>+ cat > "${option_work_dir}/sources.conf" <<EOF || return $?
</ins><span class="cx"> # Automatically overwritten by mpbb-checkout
</span><span class="cx"> # Do not edit !!!
</span><span class="cx"> file://${dports_svn} [default]
</span></span></pre></div>
<a id="contribmpbuildbotmpbbgatherarchives"></a>
<div class="modfile"><h4>Modified: contrib/mp-buildbot/mpbb-gather-archives (152128 => 152129)</h4>
<pre class="diff"><span>
<span class="info">--- contrib/mp-buildbot/mpbb-gather-archives 2016-08-29 15:43:47 UTC (rev 152128)
+++ contrib/mp-buildbot/mpbb-gather-archives 2016-08-29 15:58:33 UTC (rev 152129)
</span><span class="lines">@@ -33,9 +33,9 @@
</span><span class="cx"> # $option_archive_site is set in mpbb
</span><span class="cx"> # shellcheck disable=SC2154
</span><span class="cx"> if ! ${curl} -fIsL "${option_archive_site}/${archive_port}/${archive_basename}" > /dev/null; then
</span><del>- # $option_workdir is set in mpbb
</del><ins>+ # $option_work_dir is set in mpbb
</ins><span class="cx"> # shellcheck disable=SC2154
</span><del>- if "${tclsh}" "${option_workdir}/tools/port_binary_distributable.tcl" -v "${archive_port}"; then
</del><ins>+ if "${tclsh}" "${option_work_dir}/tools/port_binary_distributable.tcl" -v "${archive_port}"; then
</ins><span class="cx"> echo "Staging archive for upload: ${archive_basename}"
</span><span class="cx"> mkdir -p "${option_staging_dir}/${archive_port}" || { status=$?; break; }
</span><span class="cx"> ln "${archive_path}" "${option_staging_dir}/${archive_port}/${archive_basename}" || { status=$?; break; }
</span></span></pre>
</div>
</div>
</body>
</html>