You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2017/02/28 22:35:40 UTC

[4/6] mesos git commit: Updated docker-build.sh with CMake specifics.

Updated docker-build.sh with CMake specifics.

This tweaks the cmake build command and comments in our Docker build
helper script.  The updates are:
  * Bootstrap is not needed for CMake builds.
  * `make check` now builds everything.
  * `make distcheck` is not supported, nor planned to be supported.


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/1fa32999
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/1fa32999
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/1fa32999

Branch: refs/heads/master
Commit: 1fa329997b5b0683587ebfad31e6faf56c26a38c
Parents: 3eccf7e
Author: Joseph Wu <jo...@apache.org>
Authored: Tue Feb 28 13:50:51 2017 -0800
Committer: Joseph Wu <jo...@apache.org>
Committed: Tue Feb 28 14:33:45 2017 -0800

----------------------------------------------------------------------
 support/docker-build.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/1fa32999/support/docker-build.sh
----------------------------------------------------------------------
diff --git a/support/docker-build.sh b/support/docker-build.sh
index ac251d3..d16766b 100755
--- a/support/docker-build.sh
+++ b/support/docker-build.sh
@@ -158,11 +158,9 @@ else
 	    CONFIGURATION="$CONFIGURATION $element=1"
 	done
 
-	# MESOS-5433: `distcheck` is not currently supported by our CMake scripts.
-	# MESOS-5624: In source build is not yet supported.
-	# Also, we run `make` in addition to `make check` because the latter only
-	# compiles stout and libprocess sources and tests.
-	append_dockerfile "CMD ./bootstrap && mkdir build && cd build && cmake $CONFIGURATION .. && make -j6 check && make -j6"
+	# MESOS-5433: `distcheck` is not supported.
+	# MESOS-5624: In source build is not supported.
+	append_dockerfile "CMD mkdir build && cd build && cmake $CONFIGURATION .. && make -j6 check"
 	;;
       *)
 	echo "Unknown build tool $BUILDTOOL"