[152129] contrib/mp-buildbot
larryv at macports.org
larryv at macports.org
Mon Aug 29 08:58:33 PDT 2016
Revision: 152129
https://trac.macports.org/changeset/152129
Author: larryv at macports.org
Date: 2016-08-29 08:58:33 -0700 (Mon, 29 Aug 2016)
Log Message:
-----------
mpbb: Rename "--workdir" to "--work-dir"
In option names, consistently separate words with hyphens/underscores
(e.g., "--staging-dir").
Modified Paths:
--------------
contrib/mp-buildbot/README.md
contrib/mp-buildbot/mpbb
contrib/mp-buildbot/mpbb-checkout
contrib/mp-buildbot/mpbb-gather-archives
Modified: contrib/mp-buildbot/README.md
===================================================================
--- 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)
@@ -23,7 +23,7 @@
mpbb checkout \
--prefix /opt/local \
- --workdir /tmp/scratch \
+ --work-dir /tmp/scratch \
--svn-url https://svn.macports.org/repository/macports/trunk \
--svn-revision 123456
@@ -51,7 +51,7 @@
mpbb gather-archives \
--prefix /opt/local \
- --workdir /tmp/scratch \
+ --work-dir /tmp/scratch \
--archive-site https://packages.macports.org \
--staging-dir /tmp/scratch/staging
@@ -100,7 +100,7 @@
- `$option_svn_url`:
The URL of a Subversion repository containing the MacPorts `base`
and `dports` directory trees.
-- `$option_workdir`:
+- `$option_work_dir`:
A directory for storing temporary data. It is guaranteed to
persist for the duration of an `mpbb` run, so it may be used to
share ancillary files (e.g., a Subversion checkout of the ports
Modified: contrib/mp-buildbot/mpbb
===================================================================
--- 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)
@@ -14,7 +14,7 @@
option_default_svn=$(which svn)
option_default_svn_revision=HEAD
option_default_svn_url=https://svn.macports.org/repository/macports/trunk
-option_default_workdir=${PWD:-/tmp/mp-buildbot}
+option_default_work_dir=${PWD:-/tmp/mp-buildbot}
option_archive_site=$option_default_archive_site
option_help=$option_default_help
@@ -25,8 +25,8 @@
option_svn=$option_default_svn
option_svn_revision=$option_default_svn_revision
option_svn_url=$option_default_svn_url
-option_workdir=$option_default_workdir
-option_logdir="${option_workdir}/logs"
+option_work_dir=$option_default_work_dir
+option_logdir="${option_work_dir}/logs"
# Print $0 and arguments to standard error.
# Unset IFS to ensure "$*" uses spaces as separators.
@@ -82,7 +82,7 @@
on the archive server. Defaults to the 'archive-staging' subfolder in the
current directory.
- --workdir WORKDIR
+ --work-dir WORKDIR
A scratch area that mpbb will use to put temporary files, ideally kept
between builds. Your MacPorts installation in --prefix needs to be able to
access this location. Defaults to your current directory, or
@@ -171,9 +171,9 @@
option_svn_revision=$2
shift
;;
- --workdir)
- option_workdir=$2
- option_logdir="${option_workdir}/logs"
+ --work-dir)
+ option_work_dir=$2
+ option_logdir="${option_work_dir}/logs"
shift
;;
--)
@@ -200,7 +200,7 @@
usage
fi
## Otherwise, run the command and deal with errors
-export PORTSRC="${option_workdir}/macports.conf"
+export PORTSRC="${option_work_dir}/macports.conf"
if ! $command "$@"; then
err "Failed to run $command"
exit 1
Modified: contrib/mp-buildbot/mpbb-checkout
===================================================================
--- 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)
@@ -14,10 +14,10 @@
}
checkout() {
- # $option_workdir is set in mpbb, which sources this script
+ # $option_work_dir is set in mpbb, which sources this script
# shellcheck disable=SC2154
- dports_svn=${option_workdir}/dports
- tools_svn=${option_workdir}/tools
+ dports_svn=${option_work_dir}/dports
+ tools_svn=${option_work_dir}/tools
# $option_svn is set in mpbb
# shellcheck disable=SC2154
svn=${option_svn}
@@ -37,7 +37,7 @@
"${tools_svn}" || return $?
else
echo "Checking out macports tools from svn..."
- mkdir -p "${option_workdir}"
+ mkdir -p "${option_work_dir}"
"$svn" checkout --non-interactive \
-r HEAD "${svn_url}/base/portmgr/jobs" \
"${tools_svn}" || return $?
@@ -54,7 +54,7 @@
"${dports_svn}" || return $?
else
echo "Checking out macports from svn..."
- mkdir -p "${option_workdir}"
+ mkdir -p "${option_work_dir}"
"$svn" checkout --non-interactive \
-r "${svn_rev}" "${svn_url}/dports" \
"${dports_svn}" || return $?
@@ -64,14 +64,14 @@
# shellcheck disable=SC2154
(cd "${dports_svn}" && "${option_prefix}/bin/portindex") || return $?
- cat > "${option_workdir}/macports.conf" <<EOF || return $?
+ cat > "${option_work_dir}/macports.conf" <<EOF || return $?
# Automatically overwritten by mpbb-checkout
# Do not edit !!!
-sources_conf ${option_workdir}/sources.conf
+sources_conf ${option_work_dir}/sources.conf
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
EOF
- cat > "${option_workdir}/sources.conf" <<EOF || return $?
+ cat > "${option_work_dir}/sources.conf" <<EOF || return $?
# Automatically overwritten by mpbb-checkout
# Do not edit !!!
file://${dports_svn} [default]
Modified: contrib/mp-buildbot/mpbb-gather-archives
===================================================================
--- 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)
@@ -33,9 +33,9 @@
# $option_archive_site is set in mpbb
# shellcheck disable=SC2154
if ! ${curl} -fIsL "${option_archive_site}/${archive_port}/${archive_basename}" > /dev/null; then
- # $option_workdir is set in mpbb
+ # $option_work_dir is set in mpbb
# shellcheck disable=SC2154
- if "${tclsh}" "${option_workdir}/tools/port_binary_distributable.tcl" -v "${archive_port}"; then
+ if "${tclsh}" "${option_work_dir}/tools/port_binary_distributable.tcl" -v "${archive_port}"; then
echo "Staging archive for upload: ${archive_basename}"
mkdir -p "${option_staging_dir}/${archive_port}" || { status=$?; break; }
ln "${archive_path}" "${option_staging_dir}/${archive_port}/${archive_basename}" || { status=$?; break; }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160829/64827401/attachment.html>
More information about the macports-changes
mailing list