[152624] contrib/mp-buildbot
larryv at macports.org
larryv at macports.org
Tue Sep 13 07:25:42 PDT 2016
Revision: 152624
https://trac.macports.org/changeset/152624
Author: larryv at macports.org
Date: 2016-09-13 07:25:42 -0700 (Tue, 13 Sep 2016)
Log Message:
-----------
mpbb: Remove --port and --prefix from subcommands
The updated Buildbot configuration is now live.
Shortest deprecation periods ever!
Modified Paths:
--------------
contrib/mp-buildbot/mpbb
contrib/mp-buildbot/mpbb-checkout
contrib/mp-buildbot/mpbb-cleanup
contrib/mp-buildbot/mpbb-gather-archives
contrib/mp-buildbot/mpbb-install-dependencies
contrib/mp-buildbot/mpbb-install-port
contrib/mp-buildbot/mpbb-selfupdate
Modified: contrib/mp-buildbot/mpbb
===================================================================
--- contrib/mp-buildbot/mpbb 2016-09-13 14:25:38 UTC (rev 152623)
+++ contrib/mp-buildbot/mpbb 2016-09-13 14:25:42 UTC (rev 152624)
@@ -47,7 +47,6 @@
# Use sensible defaults for options that weren't set on the command line.
# shellcheck disable=SC2154
{
- : "${option_port=}"
: "${option_prefix=/opt/local}"
: "${option_work_dir=${PWD:-/tmp/mp-buildbot}}"
}
Modified: contrib/mp-buildbot/mpbb-checkout
===================================================================
--- contrib/mp-buildbot/mpbb-checkout 2016-09-13 14:25:38 UTC (rev 152623)
+++ contrib/mp-buildbot/mpbb-checkout 2016-09-13 14:25:42 UTC (rev 152624)
@@ -130,7 +130,7 @@
checkout() {
local args
- parseopt git::,jobs-url:,ports-branch:,ports-commit:,ports-url:,prefix:,svn::,svn-url: "$@" \
+ parseopt git::,jobs-url:,ports-branch:,ports-commit:,ports-url:,svn::,svn-url: "$@" \
|| return
# shellcheck disable=SC2086
set -- ${args+"${args[@]}"}
Modified: contrib/mp-buildbot/mpbb-cleanup
===================================================================
--- contrib/mp-buildbot/mpbb-cleanup 2016-09-13 14:25:38 UTC (rev 152623)
+++ contrib/mp-buildbot/mpbb-cleanup 2016-09-13 14:25:42 UTC (rev 152624)
@@ -18,13 +18,8 @@
}
cleanup() {
- local args
- parseopt prefix: "$@" || return
- # shellcheck disable=SC2086
- set -- ${args+"${args[@]}"}
-
# if this is the very first build, selfupdate did not install port yet
- # $option_prefix is set by parseopt
+ # $option_prefix is set in mpbb
# shellcheck disable=SC2154
if [ ! -e "${option_prefix}/bin/port" ]; then
echo "---> Skipping cleanup"
Modified: contrib/mp-buildbot/mpbb-gather-archives
===================================================================
--- contrib/mp-buildbot/mpbb-gather-archives 2016-09-13 14:25:38 UTC (rev 152623)
+++ contrib/mp-buildbot/mpbb-gather-archives 2016-09-13 14:25:42 UTC (rev 152624)
@@ -31,7 +31,7 @@
gather-archives() {
local args
- parseopt archive-site:,prefix:,staging-dir: "$@" || return
+ parseopt archive-site:,staging-dir: "$@" || return
: "${option_archive_site=https://packages.macports.org}"
# shellcheck disable=SC2154
: "${option_staging_dir=${option_work_dir}/archive-staging}"
Modified: contrib/mp-buildbot/mpbb-install-dependencies
===================================================================
--- contrib/mp-buildbot/mpbb-install-dependencies 2016-09-13 14:25:38 UTC (rev 152623)
+++ contrib/mp-buildbot/mpbb-install-dependencies 2016-09-13 14:25:42 UTC (rev 152624)
@@ -26,14 +26,7 @@
}
install-dependencies() {
- local args
- parseopt port:,prefix: "$@" || return
- # shellcheck disable=SC2154
- : "${option_port=}"
- # shellcheck disable=SC2086
- set -- ${args+"${args[@]}"}
-
- local port=${1-${option_port}}
+ local port=${1-}
if [[ -z $port ]]; then
err "Must specify a port"
return 1
Modified: contrib/mp-buildbot/mpbb-install-port
===================================================================
--- contrib/mp-buildbot/mpbb-install-port 2016-09-13 14:25:38 UTC (rev 152623)
+++ contrib/mp-buildbot/mpbb-install-port 2016-09-13 14:25:42 UTC (rev 152624)
@@ -26,14 +26,7 @@
}
install-port() {
- local args
- parseopt port:,prefix: "$@" || return
- # shellcheck disable=SC2154
- : "${option_port=}"
- # shellcheck disable=SC2086
- set -- ${args+"${args[@]}"}
-
- local port=${1-${option_port}}
+ local port=${1-}
if [[ -z $port ]]; then
err "Must specify a port"
return 1
Modified: contrib/mp-buildbot/mpbb-selfupdate
===================================================================
--- contrib/mp-buildbot/mpbb-selfupdate 2016-09-13 14:25:38 UTC (rev 152623)
+++ contrib/mp-buildbot/mpbb-selfupdate 2016-09-13 14:25:42 UTC (rev 152624)
@@ -19,11 +19,6 @@
}
selfupdate() {
- local args
- parseopt prefix: "$@" || return
- # shellcheck disable=SC2086
- set -- ${args+"${args[@]}"}
-
# $option_prefix is set in mpbb
# shellcheck disable=SC2154
if [ ! -f "${option_prefix}/bin/port" ]; then
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160913/c8053a84/attachment-0001.html>
More information about the macports-changes
mailing list