Skip to content

Commit

Permalink
Travis-CI: Update OSX building to the same as Linux
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
rgetz committed Apr 28, 2020
1 parent 5d7d176 commit 8a5d43b
Showing 1 changed file with 25 additions and 5 deletions.
30 changes: 25 additions & 5 deletions CI/travis/make_darwin
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 8a5d43b

Please sign in to comment.