pw_hdlc_lite: Reorganize example files
Move the RPC + HDLC example to its own subdirectory.
Change-Id: I177a6bdf9f7e00366c3106b828e28d49cbfcd700
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/18321
Commit-Queue: Wyatt Hepler <hepler@google.com>
Reviewed-by: Keir Mierle <keir@google.com>
diff --git a/pw_hdlc_lite/BUILD b/pw_hdlc_lite/BUILD
index a4d0014..9b2eb26 100644
--- a/pw_hdlc_lite/BUILD
+++ b/pw_hdlc_lite/BUILD
@@ -27,13 +27,14 @@
"decoder.cc",
"encoder.cc",
"hdlc_channel.cc",
+ "rpc_packets.cc",
"pw_hdlc_lite_private/protocol.h",
],
hdrs = [
"public/pw_hdlc_lite/decoder.h",
"public/pw_hdlc_lite/encoder.h",
"public/pw_hdlc_lite/hdlc_channel.h",
- "public/pw_hdlc_lite/rpc_server_packets.h",
+ "public/pw_hdlc_lite/rpc_packets.h",
"public/pw_hdlc_lite/sys_io_stream.h",
],
includes = ["public"],
@@ -49,29 +50,6 @@
],
)
-pw_cc_library(
- name = "client_server_test",
- srcs = [
- "hdlc_server_example.cc",
- ],
- hdrs = [
- "public/pw_hdlc_lite/decoder.h",
- "public/pw_hdlc_lite/hdlc_channel.h",
- "public/pw_hdlc_lite/rpc_server_packets.h",
- ],
- includes = ["public"],
- deps = [
- "//pw_bytes",
- "//pw_checksum",
- "//pw_log",
- "//pw_result",
- "//pw_rpc",
- "//pw_span",
- "//pw_status",
- "//pw_stream",
- ],
-)
-
cc_test(
name = "encoder_test",
srcs = ["encoder_test.cc"],
diff --git a/pw_hdlc_lite/BUILD.gn b/pw_hdlc_lite/BUILD.gn
index 9e498c7..58b1d8f 100644
--- a/pw_hdlc_lite/BUILD.gn
+++ b/pw_hdlc_lite/BUILD.gn
@@ -50,7 +50,10 @@
pw_source_set("pw_rpc") {
public_configs = [ ":default_config" ]
- public = [ "public/pw_hdlc_lite/hdlc_channel.h" ]
+ public = [
+ "public/pw_hdlc_lite/hdlc_channel.h",
+ "public/pw_hdlc_lite/rpc_packets.h",
+ ]
sources = [ "hdlc_channel.cc" ]
public_deps = [
"$dir_pw_rpc:server",
@@ -63,20 +66,6 @@
]
}
-pw_executable("hdlc_server_example") {
- public_configs = [ ":default_config" ]
- sources = [
- "hdlc_server_example.cc",
- "public/pw_hdlc_lite/rpc_server_packets.h",
- ]
- public_deps = [ ":pw_hdlc_lite" ]
- deps = [
- ":pw_rpc",
- "$dir_pw_rpc:nanopb_server",
- "$dir_pw_rpc/nanopb:echo_service",
- ]
-}
-
pw_test_group("tests") {
tests = [
":encoder_test",
diff --git a/pw_hdlc_lite/public/pw_hdlc_lite/rpc_server_packets.h b/pw_hdlc_lite/public/pw_hdlc_lite/rpc_packets.h
similarity index 100%
rename from pw_hdlc_lite/public/pw_hdlc_lite/rpc_server_packets.h
rename to pw_hdlc_lite/public/pw_hdlc_lite/rpc_packets.h
diff --git a/pw_hdlc_lite/py/pw_hdlc_lite/client_console_example.py b/pw_hdlc_lite/py/pw_hdlc_lite/rpc_console.py
similarity index 100%
rename from pw_hdlc_lite/py/pw_hdlc_lite/client_console_example.py
rename to pw_hdlc_lite/py/pw_hdlc_lite/rpc_console.py
diff --git a/pw_hdlc_lite/rpc_example/BUILD b/pw_hdlc_lite/rpc_example/BUILD
new file mode 100644
index 0000000..57812ea
--- /dev/null
+++ b/pw_hdlc_lite/rpc_example/BUILD
@@ -0,0 +1,37 @@
+# Copyright 2020 The Pigweed Authors
+#
+# 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
+#
+# https://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.
+
+load(
+ "//pw_build:pigweed.bzl",
+ "pw_cc_library",
+)
+
+pw_cc_library(
+ name = "rpc_example",
+ srcs = [
+ "hdlc_rpc_server.cc",
+ ],
+ hdrs = [
+ "public/pw_hdlc_lite/decoder.h",
+ "public/pw_hdlc_lite/hdlc_channel.h",
+ "public/pw_hdlc_lite/rpc_server_packets.h",
+ ],
+ deps = [
+ "//pw_hdlc_lite",
+ "//pw_hdlc_lite:pw_rpc",
+ "//pw_rpc:server",
+ "//pw_log",
+ ],
+)
+
diff --git a/pw_hdlc_lite/rpc_example/BUILD.gn b/pw_hdlc_lite/rpc_example/BUILD.gn
new file mode 100644
index 0000000..1df3afe
--- /dev/null
+++ b/pw_hdlc_lite/rpc_example/BUILD.gn
@@ -0,0 +1,34 @@
+# Copyright 2020 The Pigweed Authors
+#
+# 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
+#
+# https://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.
+
+# gn-format disable
+import("//build_overrides/pigweed.gni")
+
+import("$dir_pw_build/target_types.gni")
+import("$dir_pw_third_party/nanopb/nanopb.gni")
+if (dir_pw_third_party_nanopb == "") {
+ group("rpc_example") {
+ }
+} else {
+ pw_executable("rpc_example") {
+ sources = [ "hdlc_rpc_server.cc" ]
+ deps = [
+ "$dir_pw_rpc:server",
+ "$dir_pw_rpc/nanopb:echo_service",
+ "..:pw_rpc",
+ dir_pw_hdlc_lite,
+ dir_pw_log,
+ ]
+ }
+}
diff --git a/pw_hdlc_lite/hdlc_server_example.cc b/pw_hdlc_lite/rpc_example/hdlc_rpc_server.cc
similarity index 100%
rename from pw_hdlc_lite/hdlc_server_example.cc
rename to pw_hdlc_lite/rpc_example/hdlc_rpc_server.cc
