From 8a5d43b877e6d4b8f0fcc49616a1dbb3399cbabe Mon Sep 17 00:00:00 2001 From: Robin Getz Date: Mon, 27 Apr 2020 18:21:11 -0400 Subject: [PATCH] Travis-CI: Update OSX building to the same as Linux We updated the Linux build script to leave some markers in the travis-ci log '###', which makes it much easier to search for, and get to the interesting things, so add that to the OS-X versions. Signed-off-by: Robin Getz --- CI/travis/make_darwin | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/CI/travis/make_darwin b/CI/travis/make_darwin index 2e583d021..6503e7955 100755 --- a/CI/travis/make_darwin +++ b/CI/travis/make_darwin @@ -2,13 +2,33 @@ if [ "x${COVERITY_SCAN_PROJECT_NAME}" != "x" ] ; then exit 0; fi + +build_osx() { + FLAGS=$1 + echo "### cmake ${FLAGS}" + cmake ${FLAGS} .. + + echo "### make" + make + + echo "### files are" + ls +} + cd $TRAVIS_BUILD_DIR/build -cmake -DOSX_PACKAGE=ON -DPYTHON_BINDINGS=ON .. -make -ls +build_osx "-DOSX_PACKAGE=ON -DPYTHON_BINDINGS=ON -DWITH_EXAMPLES=ON" + +# do not do this in the function, it will not install twice. +if [ "$TRAVIS" = "true" ] ; then + echo "### Installing package as root" + sudo make install + echo "### Deleting install_manifest.txt (created as root)" + sudo rm ./install_manifest.txt +fi cd $TRAVIS_BUILD_DIR/build_tar -cmake -DOSX_PACKAGE=OFF -DENABLE_PACKAGING=ON -DPYTHON_BINDINGS=ON .. -make +build_osx "-DOSX_PACKAGE=OFF -DENABLE_PACKAGING=ON -DPYTHON_BINDINGS=ON" +echo "### make package" make package +echo "### files are" ls