Skip to content

Commit 8a5d43b

Browse files
committed
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 <[email protected]>
1 parent 5d7d176 commit 8a5d43b

File tree

1 file changed

+25
-5
lines changed

1 file changed

+25
-5
lines changed

CI/travis/make_darwin

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,33 @@
22

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

5+
6+
build_osx() {
7+
FLAGS=$1
8+
echo "### cmake ${FLAGS}"
9+
cmake ${FLAGS} ..
10+
11+
echo "### make"
12+
make
13+
14+
echo "### files are"
15+
ls
16+
}
17+
518
cd $TRAVIS_BUILD_DIR/build
6-
cmake -DOSX_PACKAGE=ON -DPYTHON_BINDINGS=ON ..
7-
make
8-
ls
19+
build_osx "-DOSX_PACKAGE=ON -DPYTHON_BINDINGS=ON -DWITH_EXAMPLES=ON"
20+
21+
# do not do this in the function, it will not install twice.
22+
if [ "$TRAVIS" = "true" ] ; then
23+
echo "### Installing package as root"
24+
sudo make install
25+
echo "### Deleting install_manifest.txt (created as root)"
26+
sudo rm ./install_manifest.txt
27+
fi
928

1029
cd $TRAVIS_BUILD_DIR/build_tar
11-
cmake -DOSX_PACKAGE=OFF -DENABLE_PACKAGING=ON -DPYTHON_BINDINGS=ON ..
12-
make
30+
build_osx "-DOSX_PACKAGE=OFF -DENABLE_PACKAGING=ON -DPYTHON_BINDINGS=ON"
31+
echo "### make package"
1332
make package
33+
echo "### files are"
1434
ls

0 commit comments

Comments
 (0)