remove macos from CI build, example apps now build

Author: cliffg-softwarelibre

.github/workflows/build_run_unit_test_cmake.yml

@@ -12,8 +12,8 @@ jobs:
   build_matrix:
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-15]
-          # os: [ubuntu-latest]
+        # os: [ubuntu-latest, windows-latest, macos-15]
+        os: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     defaults:
       run:

cmake/example_app_creation.cmake

@@ -9,6 +9,8 @@ foreach ( example_app_name IN LISTS example_app_names )
   add_executable ( ${example_app_name} ${example_app_name}.cpp )
   target_compile_features ( ${example_app_name} PRIVATE cxx_std_20 )
   target_link_libraries ( ${example_app_name} PRIVATE 
-      Threads::Threads chops_net_ip asio shared_buffer expected-lite Catch2::Catch2WithMain )
+      Threads::Threads 
+      chops_net_ip asio expected-lite shared_buffer
+      utility_rack wait_queue binary_serialize )
 endforeach()
 

example/CMakeLists.txt

@@ -7,28 +7,15 @@
 
 cmake_minimum_required ( VERSION 3.14 FATAL_ERROR )
 
-project ( chops-net-ip-example VERSION 1.0 LANGUAGES CXX )
+project ( chops-net-ip-example LANGUAGES CXX )
 
 set ( example_app_names local_echo_demo
                         chat_server_demo
                         simple_chat_demo
                         echo_binary_text_server_demo
                         echo_binary_text_client_demo
-                        udp_broadcast_demo
+#                        udp_broadcast_demo
                         udp_receiver_demo )
 
-set ( CMAKE_THREAD_PREFER_PTHREAD TRUE )
-set ( THREADS_PREFER_PTHREAD_FLAG TRUE )
-find_package ( Threads REQUIRED )
-
-# add executables
-foreach ( example_app_name IN LISTS example_app_names )
-  message ( "Creating example executable: ${example_app_name}" )
-  add_executable ( ${example_app_name} ${example_app_name}.cpp )
-  target_compile_features ( ${example_app_name} PRIVATE cxx_std_20 )
-  target_link_libraries ( ${example_app_name} 
-          PRIVATE Threads::Threads asio shared_buffer chops_net_ip )
-endforeach()
-
-# end of file
+include ( ../cmake/example_app_creation.cmake )
 

example/chat_server_demo.cpp

@@ -8,6 +8,8 @@
  * 
  *  Copyright (c) 2019 Thurman Gillespy
  *  2019-10-28
+ *
+ *  Updated 2025-04-23 by Cliff Green for library dependency changes
  * 
  *  Distributed under the Boost Software License, Version 1.0. 
  *  (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -35,7 +37,6 @@ chat_server_demo.cpp -lpthread -o chat_server
 #include "net_ip/net_entity.hpp"
 #include "net_ip_component/worker.hpp"
 #include "net_ip_component/send_to_all.hpp"
-#include "marshall/extract_append.hpp"
 #include "net_ip/io_type_decls.hpp"
 
 using io_context = asio::io_context;

example/echo_binary_text_client_demo.cpp

@@ -10,6 +10,8 @@
  * 
  *  Copyright (c) Thurman Gillespy
  *  2019-10-21
+ *
+ *  Updated 2025-04-23 by Cliff Green for library dependency changes
  * 
  *  Distributed under the Boost Software License, Version 1.0. 
  *  (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -38,7 +40,7 @@ echo_binary_text_client_demo.cpp -lpthread -o echo_client
 #include "net_ip/net_ip.hpp"
 #include "net_ip/net_entity.hpp"
 #include "net_ip_component/worker.hpp"
-#include "marshall/extract_append.hpp"
+#include "serialize/extract_append.hpp"
 #include "net_ip/io_type_decls.hpp"
 
 using io_context = asio::io_context;
@@ -127,7 +129,7 @@ int main(int argc, char* argv[]) {
             hdr_processed = true;
             // 1st 2 bytes is message size
             // endian correct data marshalling
-	    std::uint16_t size = chops::extract_val<std::uint16_t> 
+	    std::uint16_t size = chops::extract_val<std::endian::big, std::uint16_t> 
                                 (chops::cast_ptr_to<std::byte>(buf.data()));
 
             return size;
@@ -201,7 +203,7 @@ int main(int argc, char* argv[]) {
         // endian correct data marshalling
         std::byte tbuf[HDR_SIZE]; // temp buffer to hold the header
         // write those 2 bytes to the temp buffer
-        std::size_t result = chops::append_val<std::uint16_t>(tbuf, size_val);
+        std::size_t result = chops::append_val<std::endian::big, std::uint16_t>(tbuf, size_val);
         assert(result == HDR_SIZE);
         // now append our header and string data to the output buffer
         buf_out.append(tbuf, sizeof(tbuf)); // write the header

example/echo_binary_text_server_demo.cpp

@@ -10,6 +10,8 @@
  * 
  *  Copyright (c) Thurman Gillespy
  *  2019-10-21
+ *
+ *  Updated 2025-04-23 by Cliff Green for library dependency changes
  * 
  *  Distributed under the Boost Software License, Version 1.0. 
  *  (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -35,7 +37,7 @@ echo_binary_text_server_demo.cpp -lpthread -o echo_server
 #include "net_ip/net_ip.hpp"
 #include "net_ip/net_entity.hpp"
 #include "net_ip_component/worker.hpp"
-#include "marshall/extract_append.hpp"
+#include "serialize/extract_append.hpp"
 #include "net_ip/io_type_decls.hpp"
 
 using io_context = asio::io_context;
@@ -107,7 +109,7 @@ int main(int argc, char* argv[]) {
         // endian correct data marshalling
         std::byte tbuf[HDR_SIZE]; // temp buffer to hold the header
         // write those 2 bytes to the temp buffer
-        std::size_t result = chops::append_val<uint16_t>(tbuf, size_val);
+        std::size_t result = chops::append_val<std::endian::big, uint16_t>(tbuf, size_val);
         assert(result == HDR_SIZE);
         // now append our header and string data to the output buffer
         buf_out.append(tbuf, sizeof(tbuf)); // write the header
@@ -131,7 +133,7 @@ int main(int argc, char* argv[]) {
             hdr_processed = true;
             // 1st 2 bytes is message size
             // endian correct data marshalling
-            uint16_t size = chops::extract_val<uint16_t> 
+            uint16_t size = chops::extract_val<std::endian::big, uint16_t> 
                                 (static_cast<std::byte*> (buf.data()));
 
             return size; // return the size of the text data (obtained from header)

example/udp_broadcast_demo.cpp

@@ -36,6 +36,7 @@ udp_broadcast_demo.cpp -lpthread -o udp_broad
 #include "net_ip/net_entity.hpp"
 #include "net_ip_component/worker.hpp"
 #include "net_ip/io_type_decls.hpp"
+#include "asio/ip/network_v4.hpp"
 
 using io_output = chops::net::udp_io_output;
 
@@ -68,7 +69,7 @@ bool process_args(int argc, char* argv[], bool& print_errors, std::string& ip_ad
 
     int offset = 0;
 
-    using addr4 = asio::ip::address_v4;
+    using addr4 = asio::ip::network_v4;
 
     if (argc == 1 || argv[1] == HELP_PRM) {
         print_useage();