Refactor multibuild script sourcing a bit

library_builders.sh script in fact needs common_utils.sh.  Source that
script, and put a guard in common_utils.sh to prevent it being sourced
more than once.

README.rst

@@ -45,6 +45,8 @@ functions and variables in earlier scripts:
 * multibuild/travis_osx_steps.sh
 * config.sh
 
+See ``travis_osx_steps.sh`` to review source order.
+
 The OSX build / test and phase are on the OSX VM started by travis-ci.
 Therefore any environment variable defined in the ``.travis.yml`` or bash
 shell scripts listed above are available for your build and test.
@@ -56,8 +58,8 @@ default definitions of these functions.  See below for more details.
 Manylinux
 =========
 
-The build phase is in a Manylinux1 docker container, but the test phase is in a
-clean Ubuntu 14.04 container.
+The build phase is in a Manylinux1 docker container, but the test phase is in
+a clean Ubuntu 14.04 container.
 
 Build phase
 -----------
@@ -72,6 +74,8 @@ following bash scripts:
 * multibuild/library_builders.sh
 * config.sh
 
+See ``docker_build_wrap.sh`` to review the order of script sourcing.
+
 See the definition of ``build_wheel`` in ``multibuild/travis_linux_steps.sh``
 for the environment variables passed from travis-ci to the Manylinux1
 container.
@@ -92,6 +96,8 @@ wrapper script sources the following bash scripts:
 * multibuild/common_utils.sh
 * config.sh
 
+See ``docker_test_wrap.sh`` for script source order.
+
 See ``install_run`` in ``multibuild/travis_linux_steps.sh`` for the
 environment variables passed into the container.
 

common_utils.sh

 #!/bin/bash
 # Utilities for both OSX and Docker Linux
 # Python should be on the PATH
+
+# Only source common_utils once
+if [ -n "$COMMON_UTILS_SOURCED" ]; then
+    return
+fi
+COMMON_UTILS_SOURCED=1
+
+# Turn on exit-if-error
 set -e
 
 MULTIBUILD_DIR=$(dirname "${BASH_SOURCE[0]}")

docker_build_wrap.sh

@@ -15,7 +15,7 @@ WHEEL_SDIR=${WHEEL_SDIR:-wheelhouse}
 
 # Always pull in common and library builder utils
 MULTIBUILD_DIR=$(dirname "${BASH_SOURCE[0]}")
-# This next also sources common utils.
+# These routines also source common_utils.sh
 source $MULTIBUILD_DIR/manylinux_utils.sh
 source $MULTIBUILD_DIR/library_builders.sh
 

library_builders.sh

+# Find, load common utilties
+MULTIBUILD_DIR=$(dirname "${BASH_SOURCE[0]}")
+source $MULTIBUILD_DIR/common_utils.sh
+
 # Recipes for building some libaries
 OPENBLAS_VERSION="${OPENBLAS_VERSION:-0.2.18}"
 # We use system zlib by default - see build_new_zlib

travis_osx_steps.sh

@@ -5,6 +5,7 @@ set -e
 # Get needed utilities
 MULTIBUILD_DIR=$(dirname "${BASH_SOURCE[0]}")
 MB_PYTHON_VERSION=${MB_PYTHON_VERSION:-$TRAVIS_PYTHON_VERSION}
+# These load common_utils.sh
 source $MULTIBUILD_DIR/osx_utils.sh
 source $MULTIBUILD_DIR/library_builders.sh