Split Travis, packaging-dependent, and OS X scripting. Add reporting.

Author: cgull

.travis.yml

@@ -29,26 +29,30 @@ addons:
     - tmux
     - perl
 
-# OS X dependencies.  For tag builds, reinstall protobuf with
-# --universal --bottle to get a fat library that will run on any
-# machine.  (This takes about 15 minutes on current Travis
-# infrastructure.)
 before_install:
+  # Get full repo and describe this
+  - git fetch --tags --unshallow
+  - git describe --long
+  # OS X dependencies.  The package_deps step takes 15 minutes or so
+  # and is fairly quiet, so wrap it in travis_wait to keep it from
+  # being killed.
   - |
-    if test osx = "${TRAVIS_OS_NAME}"; then
-      brew update
-      brew update
-      brew reinstall protobuf
-      if test -n "${TRAVIS_TAG}"; then
-        brew rm protobuf &&
-        travis_wait 30 brew install protobuf --universal --bottle
+    (
+      set -e
+      if test osx = "${TRAVIS_OS_NAME}"; then
+        macosx/brew-deps.sh install
+        if test -n "${TRAVIS_TAG}"; then
+          travis_wait 30 macosx/brew-deps.sh package_deps
+        else
+          macosx/brew-deps.sh deps
+        fi
+        macosx/brew-deps.sh describe
+        macosx/osx-xcode.sh describe
       fi
-      brew reinstall tmux
-      brew --version
-      brew info --json=v1 --installed
-    fi
-  - git fetch --tags --unshallow
-
+    )
+  # Describe this system.
+  - id
+  - env
 # 'make distcheck', and OS X package build on tag builds.
 script:
   - ./autogen.sh
@@ -58,9 +62,10 @@ script:
   - |
     if test osx = "${TRAVIS_OS_NAME}" && test -n "${TRAVIS_TAG}"; then
       (
-        cd macosx &&
-        env MACOSX_DEPLOYMENT_TARGET=10.10 ./build.sh &&
-        ln ${TRAVIS_TAG}.pkg mosh.pkg &&
+        set -e
+        cd macosx
+        env MACOSX_DEPLOYMENT_TARGET=10.10 ./build.sh
+        ln ${TRAVIS_TAG}.pkg mosh.pkg
         shasum -a 256 mosh.pkg
       )
     fi

macosx/brew-deps.sh

@@ -0,0 +1,71 @@
+#!/bin/sh
+
+#
+# Install Homebrew dependencies
+#
+# This script handles build dependencies other than those provided by
+# MacOS and Xcode, for a Mosh build using macosx/build.sh or the
+# native autoconf/automake build for CI.  It is intended to be used by
+# a build system, and should be agnostic to any particular system.
+#
+# Similar scripts could be developed for MacPorts, direct dependency
+# builds, etc.
+#
+
+#
+# Install and/or configure the system used to provide dependencies.
+#
+install()
+{
+    # Straight from https://brew.sh
+    if ! brew --version > /dev/null 2>&1; then
+	/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+    fi
+}
+
+#
+# Install up-to-date build dependencies required for a development or
+# CI build.  These dependencies only need to provide runtime
+# dependencies for the build system, support for things like previous
+# OS versions and fat binaries is not needed.
+#
+deps()
+{
+    brew update
+    brew update
+    brew reinstall tmux
+    brew reinstall protobuf
+}
+
+#
+# Install build dependencies required for the MacOS package build.
+# Runtime dependencies are required to support the targeted OS X
+# version, static libraries, and fat binaries for the package build.
+#
+# This reinstalls protobuf with --universal --bottle to get a fat
+# library that will run on any machine.  (This takes about 15 minutes
+# on current Travis infrastructure.)
+#
+package_deps()
+{
+    deps
+    brew rm protobuf
+    brew install protobuf --universal --bottle
+}
+
+#
+# Describe the dependencies installed and used as best as possible.
+#
+describe()
+{
+    printf "Homebrew version:\n"
+    brew --version
+    printf "Homebrew dump:\n"
+    brew info --json=v1 --installed
+}
+
+#
+# Do something.
+#
+set -e
+"$@"

macosx/osx-xcode.sh

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+#
+# OS X and Xcode support script.
+#
+
+#
+# Describe the OS X and Xcode installation, patches, etc as best as possible.
+#
+describe()
+{
+    printf "OS X packages:\n"
+    pkgutil --pkgs
+    printf "Xcode version:\n"
+    xcodebuild -version
+    printf "Xcode path:\n"
+    xcode-select --print-path
+    # System Profiler's XML can be read more easily with plutil -p, or
+    # saved with an .spx extension and opend with the System Profiler
+    # GUI.
+    printf "System Profiler:\n"
+    system_profiler -xml 2>/dev/null
+    printf "OS X report end.\n"
+}
+
+#
+# Do something.
+#
+set -e
+"$@"