Update example and packaging tests to refer to new location

Matt Woodward · Matt Woodward · commit acf5714e425a · 2023-11-23T11:47:10.000+11:00
diff --git a/c/BUILD.bazel b/c/BUILD.bazel
@@ -87,17 +87,17 @@ swift_cc_test(
     ],
 )
 
-SBP_V4_C_SOURCES = glob(["test/auto*.c"])
+SBP_C_SOURCES = glob(["test/auto*.c"])
 
 swift_cc_test(
-    name = "sbp-v4-test",
+    name = "sbp-test",
     srcs = [
         "test/check_main.c",
         "test/check_edc.c",
         "test/check_sbp.c",
         "test/check_bitfield_macros.c",
         "test/check_suites.h",
-    ] + SBP_V4_C_SOURCES,
+    ] + SBP_C_SOURCES,
     includes = ["include/libsbp"],
     type = UNIT,
     deps = [
@@ -106,11 +106,11 @@ swift_cc_test(
     ],
 )
 
-SBP_CPP_V4_C_SOURCES = glob(["test/cpp/auto*.cc"])
+SBP_CPP_C_SOURCES = glob(["test/cpp/auto*.cc"])
 
 swift_cc_test(
-    name = "sbp-cpp-v4-test",
-    srcs = SBP_CPP_V4_C_SOURCES,
+    name = "sbp-cpp-test",
+    srcs = SBP_CPP_C_SOURCES,
     type = UNIT,
     deps = [
         ":sbp",
diff --git a/c/examples/CMakeLists.txt b/c/examples/CMakeLists.txt
@@ -3,5 +3,5 @@ option(BUILD_EXAMPLES "" OFF)
 if(BUILD_EXAMPLES)
   add_custom_target(examples)
   add_subdirectory(legacy)
-  add_subdirectory(v4)
+  add_subdirectory(libsbp)
 endif()
diff --git a/c/examples/legacy/CMakeLists.txt b/c/examples/legacy/CMakeLists.txt
@@ -1,4 +1,4 @@
 foreach(target example cpp_example tcp_example tcp_2sigma_example)
   add_subdirectory(${target})
-  add_dependencies(examples libsbp_${target})
-endforeach()
+  add_dependencies(examples libsbp_legacy_${target})
+endforeach()
diff --git a/c/examples/legacy/cpp_example/CMakeLists.txt b/c/examples/legacy/cpp_example/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.8.9)
-project(libsbp_cpp_example)
+project(libsbp_legacy_cpp_example)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
@@ -11,5 +11,5 @@ find_package(PkgConfig)
 link_directories("/usr/local/lib/")
 include_directories("/usr/local/include/")
 
-add_executable(libsbp_cpp_example cpp_example.cc)
-target_link_libraries(libsbp_cpp_example sbp)
+add_executable(libsbp_legacy_cpp_example cpp_example.cc)
+target_link_libraries(libsbp_legacy_cpp_example sbp)
diff --git a/c/examples/legacy/example/CMakeLists.txt b/c/examples/legacy/example/CMakeLists.txt
@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 2.8.9)
-project(libsbp_example)
+project(libsbp_legacy_example)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
 set(CMAKE_C_FLAGS "-Wall -Werror -Wno-error=deprecated-declarations -std=gnu99")
 
-add_executable(libsbp_example example.c)
+add_executable(libsbp_legacy_example example.c)
 
 find_package(PkgConfig)
 pkg_check_modules(LIBSERIALPORT libserialport)
@@ -15,4 +15,4 @@ include_directories(${LIBSERIALPORT_INCLUDE_DIRS})
 link_directories("/usr/local/lib/")
 include_directories("/usr/local/include/")
 
-target_link_libraries(libsbp_example serialport sbp)
+target_link_libraries(libsbp_legacy_example serialport sbp)
diff --git a/c/examples/legacy/example/example.c b/c/examples/legacy/example/example.c
@@ -7,6 +7,7 @@
 
 #include <libsbp/sbp.h>
 #include <libsbp/legacy/system.h>
+#include <libsbp/legacy/compat.h>
 
 char *serial_port_name = NULL;
 struct sp_port *piksi_port = NULL;
diff --git a/c/examples/legacy/tcp_2sigma_example/CMakeLists.txt b/c/examples/legacy/tcp_2sigma_example/CMakeLists.txt
@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 2.8.9)
-project(libsbp_tcp_2sigma_example)
+project(libsbp_legacy_tcp_2sigma_example)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
 set(CMAKE_CXX_FLAGS "-Wall -Wextra -Werror -Wno-error=deprecated-declarations -std=c++14")
 
-add_executable(libsbp_tcp_2sigma_example tcp_2sigma_example.cc)
+add_executable(libsbp_legacy_tcp_2sigma_example tcp_2sigma_example.cc)
 
 find_package(PkgConfig)
 find_package(Eigen3)
@@ -15,10 +15,10 @@ option(SHOW_PLOT "" OFF)
 link_directories("/usr/local/lib/")
 include_directories("/usr/local/include/")
 
-target_link_libraries(libsbp_tcp_2sigma_example sbp)
+target_link_libraries(libsbp_legacy_tcp_2sigma_example sbp)
 
 if (SHOW_PLOT)
   find_package(OpenCV)
   set(CMAKE_CXX_FLAGS "-DSHOW_PLOT ${CMAKE_CXX_FLAGS}")
-  target_link_libraries(libsbp_tcp_2sigma_example opencv_core opencv_imgproc opencv_highgui)
+  target_link_libraries(libsbp_legacy_tcp_2sigma_example opencv_core opencv_imgproc opencv_highgui)
 endif()
diff --git a/c/examples/legacy/tcp_2sigma_example/tcp_2sigma_example.cc b/c/examples/legacy/tcp_2sigma_example/tcp_2sigma_example.cc
@@ -41,6 +41,7 @@
 
 #include <libsbp/sbp.h>
 #include <libsbp/legacy/navigation.h>
+#include <libsbp/legacy/compat.h>
 
 // width and height of the plot window in pixels
 #define SIZE_PIXELS 300
diff --git a/c/examples/legacy/tcp_example/CMakeLists.txt b/c/examples/legacy/tcp_example/CMakeLists.txt
@@ -1,15 +1,15 @@
 cmake_minimum_required(VERSION 2.8.9)
-project(libsbp_tcp_example)
+project(libsbp_legacy_tcp_example)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
 set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-strict-prototypes -Werror -Wno-error=deprecated-declarations -std=gnu99 ${CMAKE_C_FLAGS}")
 
-add_executable(libsbp_tcp_example tcp_example.c)
+add_executable(libsbp_legacy_tcp_example tcp_example.c)
 
 find_package(PkgConfig)
 
 link_directories("/usr/local/lib/")
 include_directories("/usr/local/include/")
 
-target_link_libraries(libsbp_tcp_example sbp)
+target_link_libraries(libsbp_legacy_tcp_example sbp)
diff --git a/c/examples/legacy/tcp_example/tcp_example.c b/c/examples/legacy/tcp_example/tcp_example.c
@@ -7,6 +7,7 @@
 
 #include <libsbp/sbp.h>
 #include <libsbp/legacy/system.h>
+#include <libsbp/legacy/compat.h>
 
 char *tcp_ip_addr = NULL;
 char *tcp_ip_port = NULL;
diff --git a/c/examples/libsbp/CMakeLists.txt b/c/examples/libsbp/CMakeLists.txt
@@ -1,4 +1,4 @@
 foreach(target example cpp_example cpp_traits_example)
     add_subdirectory(${target})
-    add_dependencies(examples libsbp_v4_${target})
+    add_dependencies(examples libsbp_${target})
 endforeach()
diff --git a/c/examples/libsbp/cpp_example/CMakeLists.txt b/c/examples/libsbp/cpp_example/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.8.9)
-project(libsbp_v4_cpp_example)
+project(libsbp_cpp_example)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
@@ -11,5 +11,5 @@ find_package(PkgConfig)
 link_directories("/usr/local/lib/")
 include_directories("/usr/local/include/")
 
-add_executable(libsbp_v4_cpp_example cpp_example.cc)
-target_link_libraries(libsbp_v4_cpp_example sbp)
+add_executable(libsbp_cpp_example cpp_example.cc)
+target_link_libraries(libsbp_cpp_example sbp)
diff --git a/c/examples/libsbp/cpp_example/README.md b/c/examples/libsbp/cpp_example/README.md
diff --git a/c/examples/libsbp/cpp_example/cpp_example.cc b/c/examples/libsbp/cpp_example/cpp_example.cc
diff --git a/c/examples/libsbp/cpp_traits_example/CMakeLists.txt b/c/examples/libsbp/cpp_traits_example/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.8.9)
-project(libsbp_v4_cpp_traits_example)
+project(libsbp_cpp_traits_example)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
@@ -11,5 +11,5 @@ find_package(PkgConfig)
 link_directories("/usr/local/lib/")
 include_directories("/usr/local/include/")
 
-add_executable(libsbp_v4_cpp_traits_example cpp_example.cc)
-target_link_libraries(libsbp_v4_cpp_traits_example sbp)
+add_executable(libsbp_cpp_traits_example cpp_example.cc)
+target_link_libraries(libsbp_cpp_traits_example sbp)
diff --git a/c/examples/libsbp/cpp_traits_example/README.md b/c/examples/libsbp/cpp_traits_example/README.md
diff --git a/c/examples/libsbp/cpp_traits_example/cpp_example.cc b/c/examples/libsbp/cpp_traits_example/cpp_example.cc
@@ -1,35 +1,32 @@
+#include <cassert>
 #include <iostream>
 #include <tuple>
-#include <cassert>
 
-#include <libsbp/v4/navigation.h>
-#include <libsbp/v4/imu.h>
-#include <libsbp/v4/mag.h>
 #include <libsbp/cpp/message_traits.h>
+#include <libsbp/imu.h>
+#include <libsbp/mag.h>
+#include <libsbp/navigation.h>
 
 using process_msg_t = void (*)(sbp_msg_type_t msg_type, const sbp_msg_t &msg);
 
 /* A class used for holding a number of sbp msg structures and, when requested,
  * sending them to a user defined process function */
-template <typename... MessageTypes>
-class MessageHolder {
- public:
+template <typename... MessageTypes> class MessageHolder {
+public:
   MessageHolder(process_msg_t process_fn) : process_fn_(process_fn) {}
 
-  template <typename MessageType>
-  void stage_message(MessageType msg) {
+  template <typename MessageType> void stage_message(MessageType msg) {
     std::get<MessageType>(messages_) = msg;
   }
 
-  template <typename MessageType>
-  void process_message(void) {
+  template <typename MessageType> void process_message(void) {
     MessageType &msg = std::get<MessageType>(messages_);
     sbp_msg_type_t msg_type = sbp::MessageTraits<MessageType>::id;
     process_fn_(msg_type, sbp::MessageTraits<MessageType>::to_sbp_msg(msg));
   }
 
   process_msg_t process_fn_;
-  std::tuple<MessageTypes...> messages_; 
+  std::tuple<MessageTypes...> messages_;
 };
 
 void process_message(sbp_msg_type_t msg_type, const sbp_msg_t &msg) {
@@ -47,14 +44,15 @@ void process_message(sbp_msg_type_t msg_type, const sbp_msg_t &msg) {
 /* A super contrived example that shows how the sbp::MessageTraits class might
  * be useful, focusing on its use with templated utility classes.
  */
-int main()
-{
-  MessageHolder<sbp_msg_gps_time_t, sbp_msg_mag_raw_t, sbp_msg_imu_aux_t> messageHolder(process_message);
+int main() {
+  MessageHolder<sbp_msg_gps_time_t, sbp_msg_mag_raw_t, sbp_msg_imu_aux_t>
+      messageHolder(process_message);
 
   // Construct some structs with dummy data
-  sbp_msg_gps_time_t time{.wn=1, .tow=1, .ns_residual=1, .flags=1};
-  sbp_msg_mag_raw_t mag{.tow=2, .tow_f=2, .mag_x=2, .mag_y=2, .mag_z=2};
-  sbp_msg_imu_aux_t aux{.imu_type=3, .temp=3, .imu_conf=3};
+  sbp_msg_gps_time_t time{.wn = 1, .tow = 1, .ns_residual = 1, .flags = 1};
+  sbp_msg_mag_raw_t mag{
+      .tow = 2, .tow_f = 2, .mag_x = 2, .mag_y = 2, .mag_z = 2};
+  sbp_msg_imu_aux_t aux{.imu_type = 3, .temp = 3, .imu_conf = 3};
 
   messageHolder.stage_message<sbp_msg_gps_time_t>(time);
   messageHolder.stage_message<sbp_msg_mag_raw_t>(mag);
@@ -66,4 +64,3 @@ int main()
 
   return 0;
 }
-
diff --git a/c/examples/libsbp/example/CMakeLists.txt b/c/examples/libsbp/example/CMakeLists.txt
@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 2.8.9)
-project(libsbp_v4_example)
+project(libsbp_example)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
 set(CMAKE_C_FLAGS "-Wall -Werror -Wno-error=deprecated-declarations -std=gnu99")
 
-add_executable(libsbp_v4_example example.c)
+add_executable(libsbp_example example.c)
 
 find_package(PkgConfig)
 pkg_check_modules(LIBSERIALPORT libserialport)
@@ -15,4 +15,4 @@ include_directories(${LIBSERIALPORT_INCLUDE_DIRS})
 link_directories("/usr/local/lib/")
 include_directories("/usr/local/include/")
 
-target_link_libraries(libsbp_v4_example serialport sbp)
+target_link_libraries(libsbp_example serialport sbp)
diff --git a/c/examples/libsbp/example/README.md b/c/examples/libsbp/example/README.md
diff --git a/c/examples/libsbp/example/example.c b/c/examples/libsbp/example/example.c
diff --git a/c/test/CMakeLists.txt b/c/test/CMakeLists.txt
@@ -8,7 +8,7 @@ endif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
 
 FILE(GLOB generated_legacy_c_sources legacy/auto*.c)
 
-FILE(GLOB generated_v4_c_sources auto*.c)
+FILE(GLOB generated_c_sources auto*.c)
 
 set(TEST_INCLUDES ${PROJECT_SOURCE_DIR}/include/libsbp)
 
@@ -51,20 +51,20 @@ if (NOT CMAKE_C_COMPILER_ID STREQUAL "MSVC")
   )
 endif()
 
-swift_add_test(test-libsbp-v4
+swift_add_test(test-libsbp
   UNIT_TEST
   SRCS
     check_main.c
     check_edc.c
     check_sbp.c
     check_bitfield_macros.c
-    ${generated_v4_c_sources}
+    ${generated_c_sources}
   INCLUDE
     ${TEST_INCLUDES}
   LINK
     ${TEST_LIBS}
   )
-swift_set_compile_options(test-libsbp-v4
+swift_set_compile_options(test-libsbp
   REMOVE 
     -Wpointer-arith
     -Wformat
diff --git a/c/test/cpp/CMakeLists.txt b/c/test/cpp/CMakeLists.txt
@@ -1,6 +1,6 @@
 FILE(GLOB generated_cpp_sources auto*.cc)
 
-swift_add_test(test-libsbp-cpp-v4
+swift_add_test(test-libsbp-cpp
     UNIT_TEST
     SRCS
         ${generated_cpp_sources}
@@ -9,6 +9,6 @@ swift_add_test(test-libsbp-cpp-v4
     LINK
         sbp
         gtest_main)
-swift_set_language_standards(test-libsbp-cpp-v4)
-swift_set_compile_options(test-libsbp-cpp-v4)
+swift_set_language_standards(test-libsbp-cpp)
+swift_set_compile_options(test-libsbp-cpp)
 
diff --git a/c/test_package/CMakeLists.txt b/c/test_package/CMakeLists.txt
@@ -31,14 +31,14 @@ if (NOT WIN32)
   target_compile_definitions(legacy_cxx PRIVATE SBP_FILE="${SBP_FILE}")
 endif()
 
-add_executable(v4_c v4.c)
-target_compile_features(v4_c PRIVATE c_std_11)
-target_link_libraries(v4_c PRIVATE ${SBP_LIBRARY})
-target_include_directories(v4_c PRIVATE ${SBP_INCLUDE_DIRS})
-target_compile_definitions(v4_c PRIVATE SBP_FILE="${SBP_FILE}")
-
-add_executable(v4_cxx v4.cc)
-target_compile_features(v4_cxx PRIVATE cxx_std_14)
-target_link_libraries(v4_cxx PRIVATE ${SBP_LIBRARY})
-target_include_directories(v4_cxx PRIVATE ${SBP_INCLUDE_DIRS})
-target_compile_definitions(v4_cxx PRIVATE SBP_FILE="${SBP_FILE}")
+add_executable(libsbp_c api.c)
+target_compile_features(libsbp_c PRIVATE c_std_11)
+target_link_libraries(libsbp_c PRIVATE ${SBP_LIBRARY})
+target_include_directories(libsbp_c PRIVATE ${SBP_INCLUDE_DIRS})
+target_compile_definitions(libsbp_c PRIVATE SBP_FILE="${SBP_FILE}")
+
+add_executable(libsbp_cxx api.cc)
+target_compile_features(libsbp_cxx PRIVATE cxx_std_14)
+target_link_libraries(libsbp_cxx PRIVATE ${SBP_LIBRARY})
+target_include_directories(libsbp_cxx PRIVATE ${SBP_INCLUDE_DIRS})
+target_compile_definitions(libsbp_cxx PRIVATE SBP_FILE="${SBP_FILE}")
diff --git a/c/test_package/api.c b/c/test_package/api.c
@@ -1,7 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <libsbp/sbp.h>
-#include <libsbp/v4/api.h>
 
 struct Context {
   FILE *input_file;
@@ -88,4 +87,4 @@ int main() {
   fclose(context.output_file);
 
   return exit_code;
-}
+}
diff --git a/c/test_package/api.cc b/c/test_package/api.cc
