Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bazel: rename BUILD.wip to BUILD, some small Istio motivated build ru… #663

Merged
merged 1 commit into from
Mar 31, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
/ci/bazel-*
/ci/prebuilt/thirdparty
/ci/prebuilt/thirdparty_build
BUILD
cscope.*
BROWSE
.deps
File renamed without changes.
File renamed without changes.
5 changes: 4 additions & 1 deletion bazel/envoy_build_system.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ def envoy_cc_library(name,
def envoy_cc_binary(name,
srcs = [],
data = [],
linkstatic = 0,
visibility = None,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

where is this used?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

linkstatic is used now to build both dynamic and static binaries in source/exe/BUILD. visibility is unused, I was using it while playing around with Istio, but it doesn't hurt to have it.

deps = []):
native.cc_binary(
name = name,
Expand All @@ -66,7 +68,8 @@ def envoy_cc_binary(name,
"-pthread",
"-lrt",
],
linkstatic = 1,
linkstatic = linkstatic,
visibility = visibility,
deps = deps + [
"//source/precompiled:precompiled_includes",
],
Expand Down
7 changes: 0 additions & 7 deletions bazel/sync-from-wip.sh

This file was deleted.

8 changes: 0 additions & 8 deletions bazel/sync-to-wip.sh

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
22 changes: 20 additions & 2 deletions source/exe/BUILD.wip → source/exe/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,18 @@ load("//bazel:envoy_build_system.bzl", "envoy_cc_library", "envoy_cc_binary")

envoy_cc_binary(
name = "envoy",
srcs = ["main.cc"],
deps = ["envoy_main_lib"],
)

envoy_cc_binary(
name = "envoy-static",
linkstatic = 1,
deps = ["envoy_main_lib"],
)

envoy_cc_library(
name = "envoy_common_lib",
deps = [
":hot_restart_lib",
"//source/common/event:libevent_lib",
"//source/common/local_info:local_info_lib",
"//source/common/network:utility_lib",
Expand All @@ -33,6 +42,15 @@ envoy_cc_binary(
],
)

envoy_cc_library(
name = "envoy_main_lib",
srcs = ["main.cc"],
deps = [
":envoy_common_lib",
":hot_restart_lib",
],
)

envoy_cc_library(
name = "hot_restart_lib",
srcs = ["hot_restart.cc"],
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.