Skip to content

build: modify include paths to be more bazel friendly#16711

Merged
mattklein123 merged 15 commits intoenvoyproxy:mainfrom
yanavlasov:include-prefix
Jun 4, 2021
Merged

build: modify include paths to be more bazel friendly#16711
mattklein123 merged 15 commits intoenvoyproxy:mainfrom
yanavlasov:include-prefix

Conversation

@yanavlasov
Copy link
Copy Markdown
Contributor

@yanavlasov yanavlasov commented May 27, 2021

Commit Message:
Make Envoy include structure more bazel friendly to make it possible to build Envoy using gcc toolchain.

  1. Move include/envoy one level up. 'git mv include/envoy envoy'.
  2. Use full path when including files in the 'source/' directory.

Risk Level: Low (but it will break external repos that depend on Envoy)
Testing: Unit Tests
Docs Changes: N/A
Release Notes: N/A
Platform Specific Features: N/A
Fixes #16196

Signed-off-by: Yan Avlasov <yavlasov@google.com>
Signed-off-by: Yan Avlasov <yavlasov@google.com>
Signed-off-by: Yan Avlasov <yavlasov@google.com>
Signed-off-by: Yan Avlasov <yavlasov@google.com>
@htuch
Copy link
Copy Markdown
Member

htuch commented May 28, 2021

Cool! Thanks for looking into making things less magic with includes.

For at least the include/envoy directory, can we just git mv include/envoy envoy? This would then avoid having to change any source files and not have the awkward #include "include/envoy/..." pattern.

@jmarantz
Copy link
Copy Markdown
Contributor

I like git mv include/envoy envoy.

@jmarantz jmarantz closed this May 31, 2021
@jmarantz
Copy link
Copy Markdown
Contributor

totally didn't mean to do that.

@jmarantz jmarantz reopened this May 31, 2021
@alyssawilk
Copy link
Copy Markdown
Contributor

eh, while I don't like changing 1000 paths, I like source vs include. If we're going to move files I'd be inclined to nix the envoy and have source paths reflect include paths (include/common/http) but that's probably too much of a pain

@mattklein123 mattklein123 removed their assignment Jun 1, 2021
This reverts commit 02ada9a.
Signed-off-by: Yan Avlasov <yavlasov@google.com>
Signed-off-by: Yan Avlasov <yavlasov@google.com>
Signed-off-by: Yan Avlasov <yavlasov@google.com>
Signed-off-by: Yan Avlasov <yavlasov@google.com>
@yanavlasov yanavlasov changed the title build: Use full path for files in the include/ directory build: modify include paths to be more bazel friendly Jun 3, 2021
Signed-off-by: Yan Avlasov <yavlasov@google.com>
Signed-off-by: Yan Avlasov <yavlasov@google.com>
Signed-off-by: Yan Avlasov <yavlasov@google.com>
Signed-off-by: Yan Avlasov <yavlasov@google.com>
Copy link
Copy Markdown
Member

@mattklein123 mattklein123 left a comment

Choose a reason for hiding this comment

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

Thanks for slogging through this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

gcc build is failing for test targets that depend on //source/exe:envoy_common_lib

6 participants