Update build workflow

Test taskflow library

Fix .zip file lfs tracking

Add more inline comments

Update 3rd party libraries

Move sequence related out

Author: bgao-onet

.gitattributes

@@ -1,18 +1,14 @@
 # In general, use LF for text
 * text eol=lf
-
 # Windows CMD does not like LF in batch files
 *.bat text eol=crlf
 *.cmd text eol=crlf
-
 # Visual Studio solutions like to switch to CRLF at times
 *.sln text eol=crlf
-
 # Encoding
 *.h   encoding=utf-8
 *.cpp encoding=utf-8
 *.txt encoding=utf-8
-
 # Binary files
 *.dll binary
 *.exe binary
@@ -21,7 +17,7 @@
 *.pdf binary
 *.png binary
 *.so binary
-*.zip binary
-*.gz binary
-*.bz2 binary
-
+*.zip filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.tar.bz2 filter=lfs diff=lfs merge=lfs -text
+thirdparty/*.zip filter=lfs diff=lfs merge=lfs -text

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Ubuntu/Windows CI
+name: Ubuntu/Windows
 
 on:
   push:
@@ -20,6 +20,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+      with:
+        lfs: true
 
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
@@ -45,6 +47,8 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+      with:
+        lfs: true
 
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.

CMakeLists.txt

@@ -24,7 +24,6 @@ option(CPPBASE_BUILD_ZEROMQ    "Build zeromq"      ON)
 
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CXX_STD cxx_std_17)
-set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 
 # Custom CMake modules/scripts
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")

README.md

@@ -1,4 +1,4 @@
-![workflow](https://github.com/o-netusa/cppbase/actions/workflows/cmake.yml/badge.svg)
+![workflow](https://github.com/o-netusa/cppbase/actions/workflows/build.yml/badge.svg)
 
 # cppbase
 Cross-platform C++17 base library providing common features for C++ projects, such as logging, thread pool, TCP/UDP clien and server, etc. It uses CMake [DownloadProject](https://github.com/Crascit/DownloadProject) to build and integrate a set of thirdparty libraries (see thirdparty folder for details).

tests/common/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
 
 set(SOURCE
-  main.cpp
+  ../main.cpp
   BlockingQueueTests.cpp
   MemoryLeaksTests.cpp
   TimerTests.cpp

tests/logging/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
 
 set(SOURCE
-  main.cpp
+  ../main.cpp
   LoggingTests.cpp
 )
 

tests/logging/main.cpp

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
 
 set(SOURCE
-  main.cpp
+  ../main.cpp
   TcpTests.cpp
   UdpTests.cpp
 )
@@ -24,7 +24,7 @@ include(GoogleTest)
 gtest_discover_tests(network_test)
 
 set(ZMQTESTS_SOURCE
-  main.cpp
+  ../main.cpp
   ZMQTests.cpp
 )
 

tests/common/main.cpp renamed to tests/main.cpp

@@ -4,7 +4,7 @@ include(CapnProto)
 CAPNP_GENERATE_CPP(addressbookSources addressbookHeaders addressbook.capnp)
 
 set(SOURCE
-  main.cpp
+  ../main.cpp
   SerializationTests.cpp
   ${addressbookSources}
 )

tests/network/CMakeLists.txt

@@ -7,24 +7,6 @@ message(STATUS "===============================")
 message(STATUS "Thirdparty Libs (${CMAKE_BUILD_TYPE})")
 message(STATUS "===============================")
 
-set(BUILD_TESTING OFF CACHE BOOL "")
-
-# ============================================================
-#                        asio
-# ============================================================
-#
-if(CPPBASE_BUILD_ASIO)
-message("==> Configuring asio")
-download_project(
-  PROJ     asio
-  URL      ${CMAKE_CURRENT_SOURCE_DIR}/asio/asio-1.18.0.tar.gz
-  URL_HASH MD5=a6f23c10db1d2a22c813e21f978e5049
-  QUIET
-)
-add_library(asio INTERFACE)
-target_include_directories(asio INTERFACE ${asio_SOURCE_DIR}/include)
-endif()
-
 ##
 # For encoding/decoding and client/server communications, following options
 # have been considered, but no decision has been made yet:
@@ -34,21 +16,35 @@ endif()
 # nanopb: functionality is limited
 # protobuf: client/server communication is limited to http2
 # rpclib: inactive development
+#
+
+# ============================================================
+#                        abseil
+# ============================================================
+#
+# message("==> Configuring abseil")
+# download_project(
+#   PROJ     abseil
+#   URL      ${CMAKE_CURRENT_SOURCE_DIR}/abseil/20210324.2.tar.gz
+#   URL_HASH MD5=e0b585398b89ee92a10d8c68ef7eed48
+#   QUIET
+# )
+# add_subdirectory(${abseil_SOURCE_DIR} ${abseil_BINARY_DIR})
 
 # ============================================================
-#                        cxxopts
+#                        asio
 # ============================================================
 #
-if(CPPBASE_BUILD_CXXOPTS)
-message("==> Configuring cxxopts")
+if(CPPBASE_BUILD_ASIO)
+message("==> Configuring asio")
 download_project(
-  PROJ     cxxopts
-  URL      ${CMAKE_CURRENT_SOURCE_DIR}/cxxopts/cxxopts-2.2.1.tar.gz
-  URL_HASH MD5=6e70da4fc17a09f32612443f1866042e
+  PROJ     asio
+  URL      ${CMAKE_CURRENT_SOURCE_DIR}/asio/asio-1.18.0.tar.gz
+  URL_HASH MD5=a6f23c10db1d2a22c813e21f978e5049
   QUIET
 )
-add_library(cxxopts INTERFACE)
-target_include_directories(cxxopts INTERFACE ${cxxopts_SOURCE_DIR}/include)
+add_library(asio INTERFACE)
+target_include_directories(asio INTERFACE ${asio_SOURCE_DIR}/include)
 endif()
 
 # ============================================================
@@ -67,7 +63,7 @@ add_subdirectory(${eigen_SOURCE_DIR} ${eigen_BINARY_DIR})
 endif()
 
 # ============================================================
-#                        fmt
+#                        fmt (TODO: to be replaced by abseil String Formatting)
 # ============================================================
 #
 if(CPPBASE_BUILD_FMT)
@@ -95,7 +91,7 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCED)
 
 download_project(
   PROJ     googletest
-  URL      ${CMAKE_CURRENT_SOURCE_DIR}/googletest/googletest-release-1.11.0.tar.gz
+  URL      ${CMAKE_CURRENT_SOURCE_DIR}/googletest/release-1.11.0.tar.gz
   URL_HASH MD5=e8a8df240b6938bb6384155d4c37d937
   QUIET
 )

tests/network/main.cpp

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5
+size 886330