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 27, 2020
1 parent a7433eb commit c88c36e
Showing 1 changed file with 22 additions and 5 deletions.
27 changes: 22 additions & 5 deletions CI/travis/make_darwin
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,30 @@

if [ "x${COVERITY_SCAN_PROJECT_NAME}" != "x" ] ; then exit 0; fi


build_osx() {
FLAGS=$1
echo "### cmake ${FLAGS}"
cmake ${FLAGS} ..

echo "### make"
make

if [ "$TRAVIS" = "true" ] ; then
# make sure everything can be found during make package
echo "### Installing package as root"
sudo make install
echo "### Deleting install_manifest.txt (created as root)"
sudo rm ./install_manifest.txt
fi

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"

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"
make package
ls

0 comments on commit c88c36e

Please sign in to comment.