build: remove cmake support. (#850)

https://68.media.tumblr.com/tumblr_m1powhRVdz1rqnp16o1_r1_500.gif

Fixes #415.

bazel/README.md

@@ -33,7 +33,7 @@ up-to-date with the latest security patches.
 Bazel can also be built with the Docker image used for CI, by installing Docker and executing:
 
 ```
-./ci/run_envoy_docker.sh ./ci/do_ci.sh bazel.debug
+./ci/run_envoy_docker.sh ./ci/do_ci.sh bazel.fastbuild
 ```
 
 See also the [documentation](https://github.com/lyft/envoy/tree/master/ci) for developer use of the

bazel/envoy_build_system.bzl

@@ -6,8 +6,6 @@ def envoy_package():
 # Compute the final copts based on various options.
 def envoy_copts(repository, test = False):
     return [
-        # TODO(htuch): Remove this when Bazel bringup is done.
-        "-DBAZEL_BRINGUP",
         "-Wall",
         "-Wextra",
         "-Werror",

bazel/target_recipes.bzl

@@ -4,8 +4,6 @@
 TARGET_RECIPES = {
     "ares": "cares",
     "backward": "backward",
-    # TODO(htuch): Remove when cmake goes.
-    "cotire": "cotire",
     "event": "libevent",
     "event_pthreads": "libevent",
     # TODO(htuch): This shouldn't be a build recipe, it's a tooling dependency

ci/build_container/Makefile

@@ -10,8 +10,8 @@ CXX ?= g++
 
 # If $(BUILD_DISTINCT) is set in the make environment, the artifacts are built and installed in
 # distinct directories under $(THIRDPARTY_BUILD) and $(THIRDPARTY_SRC). They end up looking like
-# $(THIRDPARTY_BUILD)/protobuf.dep/include, $(THIRDPARTY_BUILD)/cotire.dep/include etc. instead of
-# all being under $(THIRDPARTY_BUILD)/include.
+# $(THIRDPARTY_BUILD)/protobuf.dep/include, etc. instead of all being under
+# $(THIRDPARTY_BUILD)/include.
 DISTINCT_PATH = $(if $(BUILD_DISTINCT),$(@F),)
 
 build-setup = rm -rf $@.build && \

ci/build_setup.sh

@@ -22,8 +22,6 @@ export HOME="${FAKE_HOME}"
 export PYTHONUSERBASE="${FAKE_HOME}"
 
 export BUILD_DIR=/build
-# Make sure that "docker run" has a -v bind mount for /build, since cmake
-# users will only have a bind mount for /source.
 if [[ ! -d "${BUILD_DIR}" ]]
 then
   echo "${BUILD_DIR} mount missing - did you forget -v <something>:${BUILD_DIR}?"

docs/install/building.rst

@@ -1,23 +1,8 @@
 Building
 ========
 
-The Envoy build system uses cmake. In order to ease initial building and for a quick start, we
-provide an Ubuntu 14 based docker container that has everything needed inside of it to build
+The Envoy build system uses Bazel. In order to ease initial building and for a quick start, we
+provide an Ubuntu 16 based docker container that has everything needed inside of it to build
 and *statically link* envoy, see :repo:`ci/README.md`.
 
-In order to build manually, cmake is used like so:
-
-.. code-block:: console
-
-  mkdir build
-  cd build
-  cmake ..
-  make
-
-Note that in order for the above raw build to work, cmake variables will need to be configured so
-that the envoy build can find all of the needed third party dependencies (other variables are also
-available to turn on debug builds, address sanitizer, etc.).
-
-* :repo:`CMakeLists.txt`
-* :repo:`common.cmake`
-* :repo:`thirdparty.cmake`
+In order to build manually, follow the instructions at :repo:`bazel/README.md`.

docs/install/requirements.rst

@@ -9,7 +9,6 @@ recent Linux including Ubuntu 16 LTS.
 Envoy has the following requirements:
 
 * GCC 4.9+ (for C++11 regex support)
-* `cotire <https://github.com/sakra/cotire>`_ (last tested with 1.7.8)
 * `spdlog <https://github.com/gabime/spdlog>`_ (last tested with 0.11.0)
 * `http-parser <https://github.com/nodejs/http-parser>`_ (last tested with 2.7.0)
 * `nghttp2 <https://github.com/nghttp2/nghttp2>`_ (last tested with 1.20.0)

source/common/ratelimit/ratelimit_impl.h

@@ -10,12 +10,8 @@
 #include "envoy/tracing/context.h"
 #include "envoy/upstream/cluster_manager.h"
 
-#ifdef BAZEL_BRINGUP
-#include "common/ratelimit/ratelimit.pb.h"
-#else
-#include "common/generated/ratelimit.pb.h"
-#endif
 #include "common/json/json_loader.h"
+#include "common/ratelimit/ratelimit.pb.h"
 
 namespace RateLimit {