[151658] contrib/mp-buildbot

[mojca at macports.org]

Revision: 151658
          https://trac.macports.org/changeset/151658
Author:   mojca at macports.org
Date:     2016-08-19 06:05:51 -0700 (Fri, 19 Aug 2016)
Log Message:
-----------
mp-buildbot: preliminary support for variants

Modified Paths:
--------------
    contrib/mp-buildbot/mpbb
    contrib/mp-buildbot/mpbb-install-dependencies
    contrib/mp-buildbot/mpbb-install-port

Modified: contrib/mp-buildbot/mpbb
===================================================================
--- contrib/mp-buildbot/mpbb	2016-08-19 13:04:46 UTC (rev 151657)
+++ contrib/mp-buildbot/mpbb	2016-08-19 13:05:51 UTC (rev 151658)
@@ -8,6 +8,7 @@
 option_default_archive_site=https://packages.macports.org
 option_default_help=0
 option_default_port=
+option_default_variants=
 option_default_prefix=/opt/local
 option_default_staging_dir=${PWD:-/tmp/mp-buildbot}/archive-staging
 option_default_svn=$(which svn)
@@ -18,6 +19,7 @@
 option_archive_site=$option_default_archive_site
 option_help=$option_default_help
 option_port=$option_default_port
+option_variants=$option_default_variants
 option_prefix=$option_default_prefix
 option_staging_dir=$option_default_staging_dir
 option_svn=$option_default_svn
@@ -52,6 +54,10 @@
    Name of the port to build in MacPorts. This is required for the steps that
    build a port.
 
+ --variants VARIANTS
+   An optional string with port variants (empty by default; not fully
+   functional yet).
+
  --prefix PREFIX
    The prefix of the MacPorts installation that will build the ports. Defaults
    to $option_default_prefix.
@@ -139,6 +145,10 @@
                     option_port=$2
                     shift
                     ;;
+                --variants)
+                    option_variants=$2
+                    shift
+                    ;;
                 --prefix)
                     option_prefix=$2
                     shift

Modified: contrib/mp-buildbot/mpbb-install-dependencies
===================================================================
--- contrib/mp-buildbot/mpbb-install-dependencies	2016-08-19 13:04:46 UTC (rev 151657)
+++ contrib/mp-buildbot/mpbb-install-dependencies	2016-08-19 13:05:51 UTC (rev 151658)
@@ -30,7 +30,7 @@
     # calculate list of dependencies in-order
     # $option_prefix and $thisdir are set in mpbb
     # shellcheck disable=SC2154
-    dependencies=$("${option_prefix}/bin/port-tclsh" "${thisdir}/tools/dependencies.tcl" "${option_port}")
+    dependencies=$("${option_prefix}/bin/port-tclsh" "${thisdir}/tools/dependencies.tcl" "${option_port}" "${option_variants}")
     if [ $? -ne 0 ]; then
         echo "Calculating dependencies for '${option_port}' failed, aborting." >&2
         echo "Building '${option_port}' ... [ERROR] (failed to calculate dependencies)" >> "$log_subports_progress"
@@ -60,7 +60,7 @@
         echo -n "${text} ... " >> "$log_status_dependencies"
         # $depvariants isn't quoted on purpose
         # shellcheck disable=SC2086
-        if ! "${option_prefix}/bin/port" -d install --unrequested "$depname" $depvariants; then
+        if ! "${option_prefix}/bin/port" -d install --unrequested "$depname" $depvariants ${option_variants}; then
             echo "Build of dependency '${depname}' failed, aborting." >&2
             echo "[FAIL]" >> "$log_status_dependencies"
             echo "Building '${option_port}' ... [ERROR] (failed to install dependency '${depname}')" >> "$log_subports_progress"

Modified: contrib/mp-buildbot/mpbb-install-port
===================================================================
--- contrib/mp-buildbot/mpbb-install-port	2016-08-19 13:04:46 UTC (rev 151657)
+++ contrib/mp-buildbot/mpbb-install-port	2016-08-19 13:05:51 UTC (rev 151658)
@@ -32,7 +32,7 @@
     time_start=$(date +%s)
     # $option_prefix is set in mpbb
     # shellcheck disable=SC2154
-    if ! "${option_prefix}/bin/port" -dk install "${option_port}"; then
+    if ! "${option_prefix}/bin/port" -dk install "${option_port}" ${option_variants}; then
         echo "Build of '${option_port}' failed."
         # log: summary for the portwatcher
         echo "Building '${option_port}' ... [ERROR]" >> "$log_subports_progress"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160819/4dd884b5/attachment.html>