From e5cd0111a9e9db7704452ed5f2c118ebedeea613 Mon Sep 17 00:00:00 2001 From: JP Simard Date: Thu, 14 Jul 2022 13:52:07 -0400 Subject: [PATCH 1/3] Remove Tulsi configuration & docs Now that we've integrated with rules_xcodeproj and that's working well. Signed-off-by: JP Simard --- docs/root/development/tools/tulsi.rst | 31 ------ envoy-mobile.tulsiproj/Configs/all.tulsigen | 115 -------------------- envoy-mobile.tulsiproj/project.tulsiconf | 27 ----- 3 files changed, 173 deletions(-) delete mode 100644 docs/root/development/tools/tulsi.rst delete mode 100644 envoy-mobile.tulsiproj/Configs/all.tulsigen delete mode 100644 envoy-mobile.tulsiproj/project.tulsiconf diff --git a/docs/root/development/tools/tulsi.rst b/docs/root/development/tools/tulsi.rst deleted file mode 100644 index b90b045e35..0000000000 --- a/docs/root/development/tools/tulsi.rst +++ /dev/null @@ -1,31 +0,0 @@ -.. _tulsi_development: - -Tulsi Development -================= - -`Tulsi `_ is a tool that aims to integrate -Bazel with Xcode in order to generate, build, and run Bazel-based projects with -the Xcode IDE which is commonly used for Apple/iOS development. - -Configuration files for Tulsi are checked into the Envoy Mobile repository in order to: - -- Provide a way to generate Xcode projects to build the Envoy Mobile library -- Reduce barrier to entry for iOS engineers hoping to contribute - -Using Tulsi with Envoy Mobile ------------------------------ - -To get started using Tulsi with Envoy Mobile: - -1. Download and `install Tulsi `_ -2. Open the :repo:`envoy-mobile.tulsiproj ` file -3. From the ``Packages`` tab, click ``Bazel..`` and select the ``bazelw`` binary from at the root of the Envoy Mobile directory (to ensure you're building with the correct version of Bazel) -4. Click on the ``Configs`` tab in Tulsi, and click ``Generate`` -5. Open up the Xcode project, and build - -Known issues ------------- - -Code completion for Swift for Tulsi-based project is currently broken. -It's being tracked in -`Tulsi issue #96 `_. diff --git a/envoy-mobile.tulsiproj/Configs/all.tulsigen b/envoy-mobile.tulsiproj/Configs/all.tulsigen deleted file mode 100644 index 164ebe87b6..0000000000 --- a/envoy-mobile.tulsiproj/Configs/all.tulsigen +++ /dev/null @@ -1,115 +0,0 @@ -{ - "additionalFilePaths" : [ - "library/swift/BUILD", - "test/swift/BUILD" - ], - "buildTargets" : [ - "//examples/objective-c/hello_world:app", - "//examples/objective-c/hello_world:appmain", - "//examples/swift/hello_world:app", - "//examples/swift/hello_world:appmain", - "//library/swift:ios_lib", - "//test/swift/integration:cancel_stream_test", - "//test/swift/integration:cancel_stream_test_lib", - "//test/swift/integration:direct_response_contains_headers_integration_test", - "//test/swift/integration:direct_response_contains_headers_integration_test_lib", - "//test/swift/integration:direct_response_exact_headers_match_integration_test", - "//test/swift/integration:direct_response_exact_headers_match_integration_test_lib", - "//test/swift/integration:direct_response_exact_path_match_integration_test", - "//test/swift/integration:direct_response_exact_path_match_integration_test_lib", - "//test/swift/integration:direct_response_filter_mutation_integration_test", - "//test/swift/integration:direct_response_filter_mutation_integration_test_lib", - "//test/swift/integration:direct_response_prefix_headers_match_integration_test", - "//test/swift/integration:direct_response_prefix_headers_match_integration_test_lib", - "//test/swift/integration:direct_response_prefix_path_match_integration_test", - "//test/swift/integration:direct_response_prefix_path_match_integration_test_lib", - "//test/swift/integration:direct_response_suffix_path_match_integration_test", - "//test/swift/integration:direct_response_suffix_path_match_integration_test_lib", - "//test/swift/integration:grpc_receive_error_test", - "//test/swift/integration:grpc_receive_error_test_lib", - "//test/swift/integration:receive_data_test", - "//test/swift/integration:receive_data_test_lib", - "//test/swift/integration:receive_error_test", - "//test/swift/integration:receive_error_test_lib", - "//test/swift/integration:send_data_test", - "//test/swift/integration:send_data_test_lib", - "//test/swift/integration:send_headers_test", - "//test/swift/integration:send_headers_test_lib", - "//test/swift/integration:send_trailers_test", - "//test/swift/integration:send_trailers_test_lib", - "//test/swift:counter_tests", - "//test/swift:counter_tests_lib", - "//test/swift:element_tests", - "//test/swift:element_tests_lib", - "//test/swift:engine_builder_tests", - "//test/swift:engine_builder_tests_lib", - "//test/swift:grpc_request_headers_builder_tests", - "//test/swift:grpc_request_headers_builder_tests_lib", - "//test/swift:grpc_stream_tests", - "//test/swift:grpc_stream_tests_lib", - "//test/swift:headers_builder_tests", - "//test/swift:headers_builder_tests_lib", - "//test/swift:pulse_client_impl_tests", - "//test/swift:pulse_client_impl_tests_lib", - "//test/swift:request_headers_builder_tests", - "//test/swift:request_headers_builder_tests_lib", - "//test/swift:response_headers_tests", - "//test/swift:response_headers_tests_lib", - "//test/swift:retry_policy_mapper_tests", - "//test/swift:retry_policy_mapper_tests_lib", - "//test/swift:retry_policy_tests", - "//test/swift:retry_policy_tests_lib" - ], - "optionSet" : { - "BazelBuildOptionsDebug" : { - "p" : "$(inherited)" - }, - "BazelBuildOptionsRelease" : { - "p" : "$(inherited)" - }, - "BazelBuildStartupOptionsDebug" : { - "p" : "$(inherited)" - }, - "BazelBuildStartupOptionsRelease" : { - "p" : "$(inherited)" - }, - "BuildActionPostActionScript" : { - "p" : "$(inherited)" - }, - "BuildActionPreActionScript" : { - "p" : "$(inherited)" - }, - "CommandlineArguments" : { - "p" : "$(inherited)" - }, - "EnvironmentVariables" : { - "p" : "$(inherited)" - }, - "IncludeBuildSources" : { - "p" : "YES" - }, - "LaunchActionPostActionScript" : { - "p" : "$(inherited)" - }, - "LaunchActionPreActionScript" : { - "p" : "$(inherited)" - }, - "ProjectPrioritizesSwift" : { - "p" : "YES" - }, - "TestActionPostActionScript" : { - "p" : "$(inherited)" - }, - "TestActionPreActionScript" : { - "p" : "$(inherited)" - } - }, - "projectName" : "envoy-mobile", - "sourceFilters" : [ - "examples/...", - "library", - "library/objective-c/...", - "library/swift", - "library/swift/..." - ] -} diff --git a/envoy-mobile.tulsiproj/project.tulsiconf b/envoy-mobile.tulsiproj/project.tulsiconf deleted file mode 100644 index e20a5bc134..0000000000 --- a/envoy-mobile.tulsiproj/project.tulsiconf +++ /dev/null @@ -1,27 +0,0 @@ -{ - "configDefaults" : { - "optionSet" : { - "BazelBuildOptionsDebug" : { - "p" : "--config=ios" - }, - "BazelBuildOptionsRelease" : { - "p" : "--config=release-ios --ios_multi_cpus=i386,x86_64,armv7,arm64" - }, - "IncludeBuildSources" : { - "p" : "YES" - }, - "ProjectPrioritizesSwift" : { - "p" : "YES" - } - } - }, - "packages" : [ - "library/swift", - "test/swift", - "examples/objective-c/hello_world", - "examples/swift/hello_world", - "test/swift/integration" - ], - "projectName" : "envoy-mobile", - "workspaceRoot" : ".." -} From 9ff013adff0a3f6bc6e0a4d701d5cef32b69128d Mon Sep 17 00:00:00 2001 From: JP Simard Date: Thu, 14 Jul 2022 14:26:57 -0400 Subject: [PATCH 2/3] Update tools.rst Signed-off-by: JP Simard --- docs/root/development/tools/tools.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/root/development/tools/tools.rst b/docs/root/development/tools/tools.rst index 3a3492b5c5..5fae98cc0c 100644 --- a/docs/root/development/tools/tools.rst +++ b/docs/root/development/tools/tools.rst @@ -6,7 +6,7 @@ Development Tools .. toctree:: :maxdepth: 2 - tulsi + ios_local intellij This documentation outlines additional tools that may prove useful when From c327db2514753e41312e3c12c95242573134e512 Mon Sep 17 00:00:00 2001 From: JP Simard Date: Thu, 14 Jul 2022 14:29:01 -0400 Subject: [PATCH 3/3] fixup! Update tools.rst Signed-off-by: JP Simard --- docs/root/development/tools/tools.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/root/development/tools/tools.rst b/docs/root/development/tools/tools.rst index 5fae98cc0c..2861ac5488 100644 --- a/docs/root/development/tools/tools.rst +++ b/docs/root/development/tools/tools.rst @@ -6,7 +6,6 @@ Development Tools .. toctree:: :maxdepth: 2 - ios_local intellij This documentation outlines additional tools that may prove useful when