From af59e0ad839cc559118ef953eb4971485e22f711 Mon Sep 17 00:00:00 2001 From: Samuel Freilich Date: Wed, 16 Mar 2022 10:49:03 -0700 Subject: Use BUILD.bazel instead of BUILD Bazel accepts either, but this avoids conflicts with build/ subdirs on Mac OS. And it seems to be standard practice for other projects like Abseil. PiperOrigin-RevId: 435095006 --- ink_stroke_modeler/BUILD | 91 --------------- ink_stroke_modeler/BUILD.bazel | 91 +++++++++++++++ ink_stroke_modeler/internal/BUILD | 125 --------------------- ink_stroke_modeler/internal/BUILD.bazel | 125 +++++++++++++++++++++ ink_stroke_modeler/internal/prediction/BUILD | 83 -------------- ink_stroke_modeler/internal/prediction/BUILD.bazel | 83 ++++++++++++++ .../internal/prediction/kalman_filter/BUILD | 58 ---------- .../internal/prediction/kalman_filter/BUILD.bazel | 58 ++++++++++ 8 files changed, 357 insertions(+), 357 deletions(-) delete mode 100644 ink_stroke_modeler/BUILD create mode 100644 ink_stroke_modeler/BUILD.bazel delete mode 100644 ink_stroke_modeler/internal/BUILD create mode 100644 ink_stroke_modeler/internal/BUILD.bazel delete mode 100644 ink_stroke_modeler/internal/prediction/BUILD create mode 100644 ink_stroke_modeler/internal/prediction/BUILD.bazel delete mode 100644 ink_stroke_modeler/internal/prediction/kalman_filter/BUILD create mode 100644 ink_stroke_modeler/internal/prediction/kalman_filter/BUILD.bazel diff --git a/ink_stroke_modeler/BUILD b/ink_stroke_modeler/BUILD deleted file mode 100644 index f0c00c1..0000000 --- a/ink_stroke_modeler/BUILD +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 2022 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -package(default_visibility = ["//visibility:public"]) - -licenses(["notice"]) - -cc_library( - name = "params", - srcs = ["params.cc"], - hdrs = ["params.h"], - visibility = ["//visibility:public"], - deps = [ - ":types", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/types:variant", - ], -) - -cc_test( - name = "params_test", - srcs = ["params_test.cc"], - deps = [ - ":params", - "@com_google_absl//absl/status", - "@com_google_googletest//:gtest_main", - ], -) - -cc_library( - name = "types", - hdrs = ["types.h"], - visibility = ["//visibility:public"], -) - -cc_test( - name = "types_test", - srcs = ["types_test.cc"], - deps = [ - ":types", - "//ink_stroke_modeler/internal:type_matchers", - "@com_google_googletest//:gtest_main", - ], -) - -cc_library( - name = "stroke_modeler", - srcs = ["stroke_modeler.cc"], - hdrs = ["stroke_modeler.h"], - deps = [ - ":params", - ":types", - "//ink_stroke_modeler/internal:internal_types", - "//ink_stroke_modeler/internal:position_modeler", - "//ink_stroke_modeler/internal:stylus_state_modeler", - "//ink_stroke_modeler/internal:wobble_smoother", - "//ink_stroke_modeler/internal/prediction:input_predictor", - "//ink_stroke_modeler/internal/prediction:kalman_predictor", - "//ink_stroke_modeler/internal/prediction:stroke_end_predictor", - "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/memory", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/types:optional", - "@com_google_absl//absl/types:variant", - ], -) - -cc_test( - name = "stroke_modeler_test", - srcs = ["stroke_modeler_test.cc"], - deps = [ - ":params", - ":stroke_modeler", - "//ink_stroke_modeler/internal:type_matchers", - "@com_google_absl//absl/status", - "@com_google_googletest//:gtest_main", - ], -) diff --git a/ink_stroke_modeler/BUILD.bazel b/ink_stroke_modeler/BUILD.bazel new file mode 100644 index 0000000..f0c00c1 --- /dev/null +++ b/ink_stroke_modeler/BUILD.bazel @@ -0,0 +1,91 @@ +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +package(default_visibility = ["//visibility:public"]) + +licenses(["notice"]) + +cc_library( + name = "params", + srcs = ["params.cc"], + hdrs = ["params.h"], + visibility = ["//visibility:public"], + deps = [ + ":types", + "@com_google_absl//absl/status", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/types:variant", + ], +) + +cc_test( + name = "params_test", + srcs = ["params_test.cc"], + deps = [ + ":params", + "@com_google_absl//absl/status", + "@com_google_googletest//:gtest_main", + ], +) + +cc_library( + name = "types", + hdrs = ["types.h"], + visibility = ["//visibility:public"], +) + +cc_test( + name = "types_test", + srcs = ["types_test.cc"], + deps = [ + ":types", + "//ink_stroke_modeler/internal:type_matchers", + "@com_google_googletest//:gtest_main", + ], +) + +cc_library( + name = "stroke_modeler", + srcs = ["stroke_modeler.cc"], + hdrs = ["stroke_modeler.h"], + deps = [ + ":params", + ":types", + "//ink_stroke_modeler/internal:internal_types", + "//ink_stroke_modeler/internal:position_modeler", + "//ink_stroke_modeler/internal:stylus_state_modeler", + "//ink_stroke_modeler/internal:wobble_smoother", + "//ink_stroke_modeler/internal/prediction:input_predictor", + "//ink_stroke_modeler/internal/prediction:kalman_predictor", + "//ink_stroke_modeler/internal/prediction:stroke_end_predictor", + "@com_google_absl//absl/base:core_headers", + "@com_google_absl//absl/memory", + "@com_google_absl//absl/status", + "@com_google_absl//absl/status:statusor", + "@com_google_absl//absl/types:optional", + "@com_google_absl//absl/types:variant", + ], +) + +cc_test( + name = "stroke_modeler_test", + srcs = ["stroke_modeler_test.cc"], + deps = [ + ":params", + ":stroke_modeler", + "//ink_stroke_modeler/internal:type_matchers", + "@com_google_absl//absl/status", + "@com_google_googletest//:gtest_main", + ], +) diff --git a/ink_stroke_modeler/internal/BUILD b/ink_stroke_modeler/internal/BUILD deleted file mode 100644 index bf76f70..0000000 --- a/ink_stroke_modeler/internal/BUILD +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 2022 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -package( - default_visibility = ["//ink_stroke_modeler:__subpackages__"], -) - -licenses(["notice"]) - -cc_library( - name = "internal_types", - hdrs = ["internal_types.h"], - deps = ["//ink_stroke_modeler:types"], -) - -cc_library( - name = "type_matchers", - testonly = 1, - srcs = ["type_matchers.cc"], - hdrs = ["type_matchers.h"], - deps = [ - ":internal_types", - "//:gtest_for_library_testonly", - "//ink_stroke_modeler:types", - ], -) - -cc_library( - name = "utils", - hdrs = ["utils.h"], - deps = ["//ink_stroke_modeler:types"], -) - -cc_test( - name = "utils_test", - srcs = ["utils_test.cc"], - deps = [ - ":type_matchers", - ":utils", - "@com_google_googletest//:gtest_main", - ], -) - -cc_library( - name = "wobble_smoother", - srcs = ["wobble_smoother.cc"], - hdrs = ["wobble_smoother.h"], - deps = [ - ":utils", - "//ink_stroke_modeler:params", - "//ink_stroke_modeler:types", - ], -) - -cc_test( - name = "wobble_smoother_test", - srcs = ["wobble_smoother_test.cc"], - deps = [ - ":type_matchers", - ":wobble_smoother", - "//ink_stroke_modeler:params", - "//ink_stroke_modeler:types", - "@com_google_googletest//:gtest_main", - ], -) - -cc_library( - name = "position_modeler", - hdrs = ["position_modeler.h"], - deps = [ - ":internal_types", - ":utils", - "//ink_stroke_modeler:params", - "//ink_stroke_modeler:types", - ], -) - -cc_test( - name = "position_modeler_test", - srcs = ["position_modeler_test.cc"], - deps = [ - ":internal_types", - ":position_modeler", - ":type_matchers", - "//ink_stroke_modeler:params", - "//ink_stroke_modeler:types", - "@com_google_googletest//:gtest_main", - ], -) - -cc_library( - name = "stylus_state_modeler", - srcs = ["stylus_state_modeler.cc"], - hdrs = ["stylus_state_modeler.h"], - deps = [ - ":internal_types", - ":utils", - "//ink_stroke_modeler:params", - "//ink_stroke_modeler:types", - ], -) - -cc_test( - name = "stylus_state_modeler_test", - srcs = ["stylus_state_modeler_test.cc"], - deps = [ - ":internal_types", - ":stylus_state_modeler", - ":type_matchers", - "//ink_stroke_modeler:params", - "//ink_stroke_modeler:types", - "@com_google_googletest//:gtest_main", - ], -) diff --git a/ink_stroke_modeler/internal/BUILD.bazel b/ink_stroke_modeler/internal/BUILD.bazel new file mode 100644 index 0000000..bf76f70 --- /dev/null +++ b/ink_stroke_modeler/internal/BUILD.bazel @@ -0,0 +1,125 @@ +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +package( + default_visibility = ["//ink_stroke_modeler:__subpackages__"], +) + +licenses(["notice"]) + +cc_library( + name = "internal_types", + hdrs = ["internal_types.h"], + deps = ["//ink_stroke_modeler:types"], +) + +cc_library( + name = "type_matchers", + testonly = 1, + srcs = ["type_matchers.cc"], + hdrs = ["type_matchers.h"], + deps = [ + ":internal_types", + "//:gtest_for_library_testonly", + "//ink_stroke_modeler:types", + ], +) + +cc_library( + name = "utils", + hdrs = ["utils.h"], + deps = ["//ink_stroke_modeler:types"], +) + +cc_test( + name = "utils_test", + srcs = ["utils_test.cc"], + deps = [ + ":type_matchers", + ":utils", + "@com_google_googletest//:gtest_main", + ], +) + +cc_library( + name = "wobble_smoother", + srcs = ["wobble_smoother.cc"], + hdrs = ["wobble_smoother.h"], + deps = [ + ":utils", + "//ink_stroke_modeler:params", + "//ink_stroke_modeler:types", + ], +) + +cc_test( + name = "wobble_smoother_test", + srcs = ["wobble_smoother_test.cc"], + deps = [ + ":type_matchers", + ":wobble_smoother", + "//ink_stroke_modeler:params", + "//ink_stroke_modeler:types", + "@com_google_googletest//:gtest_main", + ], +) + +cc_library( + name = "position_modeler", + hdrs = ["position_modeler.h"], + deps = [ + ":internal_types", + ":utils", + "//ink_stroke_modeler:params", + "//ink_stroke_modeler:types", + ], +) + +cc_test( + name = "position_modeler_test", + srcs = ["position_modeler_test.cc"], + deps = [ + ":internal_types", + ":position_modeler", + ":type_matchers", + "//ink_stroke_modeler:params", + "//ink_stroke_modeler:types", + "@com_google_googletest//:gtest_main", + ], +) + +cc_library( + name = "stylus_state_modeler", + srcs = ["stylus_state_modeler.cc"], + hdrs = ["stylus_state_modeler.h"], + deps = [ + ":internal_types", + ":utils", + "//ink_stroke_modeler:params", + "//ink_stroke_modeler:types", + ], +) + +cc_test( + name = "stylus_state_modeler_test", + srcs = ["stylus_state_modeler_test.cc"], + deps = [ + ":internal_types", + ":stylus_state_modeler", + ":type_matchers", + "//ink_stroke_modeler:params", + "//ink_stroke_modeler:types", + "@com_google_googletest//:gtest_main", + ], +) diff --git a/ink_stroke_modeler/internal/prediction/BUILD b/ink_stroke_modeler/internal/prediction/BUILD deleted file mode 100644 index 2d94289..0000000 --- a/ink_stroke_modeler/internal/prediction/BUILD +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 2022 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -package( - default_visibility = ["//ink_stroke_modeler:__subpackages__"], -) - -licenses(["notice"]) - -cc_library( - name = "input_predictor", - hdrs = ["input_predictor.h"], - deps = [ - "//ink_stroke_modeler:params", - "//ink_stroke_modeler:types", - "//ink_stroke_modeler/internal:internal_types", - ], -) - -cc_library( - name = "kalman_predictor", - srcs = ["kalman_predictor.cc"], - hdrs = ["kalman_predictor.h"], - deps = [ - ":input_predictor", - "//ink_stroke_modeler:params", - "//ink_stroke_modeler:types", - "//ink_stroke_modeler/internal:internal_types", - "//ink_stroke_modeler/internal:utils", - "//ink_stroke_modeler/internal/prediction/kalman_filter", - ], -) - -cc_test( - name = "kalman_predictor_test", - srcs = ["kalman_predictor_test.cc"], - deps = [ - ":input_predictor", - ":kalman_predictor", - "//ink_stroke_modeler:params", - "//ink_stroke_modeler:types", - "//ink_stroke_modeler/internal:type_matchers", - "@com_google_absl//absl/types:optional", - "@com_google_googletest//:gtest_main", - ], -) - -cc_library( - name = "stroke_end_predictor", - srcs = ["stroke_end_predictor.cc"], - hdrs = ["stroke_end_predictor.h"], - deps = [ - ":input_predictor", - "//ink_stroke_modeler:params", - "//ink_stroke_modeler:types", - "//ink_stroke_modeler/internal:internal_types", - "//ink_stroke_modeler/internal:position_modeler", - "@com_google_absl//absl/types:optional", - ], -) - -cc_test( - name = "stroke_end_predictor_test", - srcs = ["stroke_end_predictor_test.cc"], - deps = [ - ":input_predictor", - ":stroke_end_predictor", - "//ink_stroke_modeler:params", - "//ink_stroke_modeler/internal:type_matchers", - "@com_google_googletest//:gtest_main", - ], -) diff --git a/ink_stroke_modeler/internal/prediction/BUILD.bazel b/ink_stroke_modeler/internal/prediction/BUILD.bazel new file mode 100644 index 0000000..2d94289 --- /dev/null +++ b/ink_stroke_modeler/internal/prediction/BUILD.bazel @@ -0,0 +1,83 @@ +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +package( + default_visibility = ["//ink_stroke_modeler:__subpackages__"], +) + +licenses(["notice"]) + +cc_library( + name = "input_predictor", + hdrs = ["input_predictor.h"], + deps = [ + "//ink_stroke_modeler:params", + "//ink_stroke_modeler:types", + "//ink_stroke_modeler/internal:internal_types", + ], +) + +cc_library( + name = "kalman_predictor", + srcs = ["kalman_predictor.cc"], + hdrs = ["kalman_predictor.h"], + deps = [ + ":input_predictor", + "//ink_stroke_modeler:params", + "//ink_stroke_modeler:types", + "//ink_stroke_modeler/internal:internal_types", + "//ink_stroke_modeler/internal:utils", + "//ink_stroke_modeler/internal/prediction/kalman_filter", + ], +) + +cc_test( + name = "kalman_predictor_test", + srcs = ["kalman_predictor_test.cc"], + deps = [ + ":input_predictor", + ":kalman_predictor", + "//ink_stroke_modeler:params", + "//ink_stroke_modeler:types", + "//ink_stroke_modeler/internal:type_matchers", + "@com_google_absl//absl/types:optional", + "@com_google_googletest//:gtest_main", + ], +) + +cc_library( + name = "stroke_end_predictor", + srcs = ["stroke_end_predictor.cc"], + hdrs = ["stroke_end_predictor.h"], + deps = [ + ":input_predictor", + "//ink_stroke_modeler:params", + "//ink_stroke_modeler:types", + "//ink_stroke_modeler/internal:internal_types", + "//ink_stroke_modeler/internal:position_modeler", + "@com_google_absl//absl/types:optional", + ], +) + +cc_test( + name = "stroke_end_predictor_test", + srcs = ["stroke_end_predictor_test.cc"], + deps = [ + ":input_predictor", + ":stroke_end_predictor", + "//ink_stroke_modeler:params", + "//ink_stroke_modeler/internal:type_matchers", + "@com_google_googletest//:gtest_main", + ], +) diff --git a/ink_stroke_modeler/internal/prediction/kalman_filter/BUILD b/ink_stroke_modeler/internal/prediction/kalman_filter/BUILD deleted file mode 100644 index e487c16..0000000 --- a/ink_stroke_modeler/internal/prediction/kalman_filter/BUILD +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 2022 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -package( - default_visibility = ["//ink_stroke_modeler:__subpackages__"], -) - -licenses(["notice"]) - -cc_library( - name = "matrix", - hdrs = ["matrix.h"], -) - -cc_test( - name = "matrix_test", - srcs = ["matrix_test.cc"], - deps = [ - ":matrix", - "@com_google_googletest//:gtest_main", - ], -) - -cc_library( - name = "kalman_filter", - srcs = [ - "axis_predictor.cc", - "kalman_filter.cc", - ], - hdrs = [ - "axis_predictor.h", - "kalman_filter.h", - ], - deps = [ - ":matrix", - "@com_google_absl//absl/memory", - ], -) - -cc_test( - name = "axis_predictor_test", - srcs = ["axis_predictor_test.cc"], - deps = [ - ":kalman_filter", - "@com_google_googletest//:gtest_main", - ], -) diff --git a/ink_stroke_modeler/internal/prediction/kalman_filter/BUILD.bazel b/ink_stroke_modeler/internal/prediction/kalman_filter/BUILD.bazel new file mode 100644 index 0000000..e487c16 --- /dev/null +++ b/ink_stroke_modeler/internal/prediction/kalman_filter/BUILD.bazel @@ -0,0 +1,58 @@ +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +package( + default_visibility = ["//ink_stroke_modeler:__subpackages__"], +) + +licenses(["notice"]) + +cc_library( + name = "matrix", + hdrs = ["matrix.h"], +) + +cc_test( + name = "matrix_test", + srcs = ["matrix_test.cc"], + deps = [ + ":matrix", + "@com_google_googletest//:gtest_main", + ], +) + +cc_library( + name = "kalman_filter", + srcs = [ + "axis_predictor.cc", + "kalman_filter.cc", + ], + hdrs = [ + "axis_predictor.h", + "kalman_filter.h", + ], + deps = [ + ":matrix", + "@com_google_absl//absl/memory", + ], +) + +cc_test( + name = "axis_predictor_test", + srcs = ["axis_predictor_test.cc"], + deps = [ + ":kalman_filter", + "@com_google_googletest//:gtest_main", + ], +) -- cgit v1.2.3