[152531] contrib/mp-buildbot

[larryv at macports.org]

Revision: 152531
          https://trac.macports.org/changeset/152531
Author:   larryv at macports.org
Date:     2016-09-11 18:59:10 -0700 (Sun, 11 Sep 2016)
Log Message:
-----------
mpbb: Don't hardcode jobs tools location

The location of the jobs tools is used in a couple of places, so
don't repeat ourselves.

Modified Paths:
--------------
    contrib/mp-buildbot/mpbb
    contrib/mp-buildbot/mpbb-checkout
    contrib/mp-buildbot/mpbb-gather-archives

Modified: contrib/mp-buildbot/mpbb
===================================================================
--- contrib/mp-buildbot/mpbb	2016-09-12 01:59:08 UTC (rev 152530)
+++ contrib/mp-buildbot/mpbb	2016-09-12 01:59:10 UTC (rev 152531)
@@ -119,6 +119,7 @@
 
 # shellcheck disable=SC2034 disable=SC2154
 # Not really options, but pretend they are because they're global.
+option_jobs_dir=${option_work_dir}/tools
 option_log_dir=${option_work_dir}/logs
 
 # shellcheck disable=SC2086

Modified: contrib/mp-buildbot/mpbb-checkout
===================================================================
--- contrib/mp-buildbot/mpbb-checkout	2016-09-12 01:59:08 UTC (rev 152530)
+++ contrib/mp-buildbot/mpbb-checkout	2016-09-12 01:59:10 UTC (rev 152531)
@@ -95,7 +95,7 @@
     # shellcheck disable=SC2100 disable=SC2154
     if svn=${option_svn:-$(command -v svn)}; then
         checkout=svn-checkout
-        jobs_dir=${option_work_dir}/tools
+        jobs_dir=${option_jobs_dir}
         if [[ -n ${option_svn_url+_} ]]; then
             : "${option_jobs_url=${option_svn_url}/base/portmgr/jobs}"
             : "${option_ports_url=${option_svn_url}/dports}"

Modified: contrib/mp-buildbot/mpbb-gather-archives
===================================================================
--- contrib/mp-buildbot/mpbb-gather-archives	2016-09-12 01:59:08 UTC (rev 152530)
+++ contrib/mp-buildbot/mpbb-gather-archives	2016-09-12 01:59:10 UTC (rev 152531)
@@ -56,9 +56,9 @@
         archive_basename=$(basename "${archive_path}")
 
         if ! curl -fIsL "${option_archive_site}/${archive_port}/${archive_basename}" > /dev/null; then
-            # $option_work_dir is set in mpbb
+            # $option_jobs_dir is set in mpbb
             # shellcheck disable=SC2154
-            if "${tclsh}" "${option_work_dir}/tools/port_binary_distributable.tcl" -v "${archive_port}"; then
+            if "${tclsh}" "${option_jobs_dir}/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/20160911/df2ab825/attachment.html>