Skip to content

Commit

Permalink
Release v6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
arobenko committed Jan 11, 2025
2 parents a1bd532 + ab23ce4 commit 756a364
Show file tree
Hide file tree
Showing 401 changed files with 12,414 additions and 18,130 deletions.
37 changes: 21 additions & 16 deletions .github/workflows/actions_build.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
name: Github Actions Build

on: [push]
on:
push:
branches:
- '**'
tags-ignore:
- '**'

env:
COMMS_TAG: v5.2.7
COMMS_TAG: v5.3

jobs:

Expand All @@ -12,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
type: [Debug, Release, MinSizeRel]
type: [Debug, Release]
cc_ver: [9, 10, 11, 12]
cpp: [17, 20]
qt_ver: [5, 6]
Expand Down Expand Up @@ -65,7 +70,7 @@ jobs:
strategy:
fail-fast: false
matrix:
type: [Debug, Release, MinSizeRel]
type: [Debug, Release]
cc_ver: [13, 14]
cpp: [17, 20, 23]
qt_ver: [5, 6]
Expand All @@ -80,7 +85,9 @@ jobs:
run: sudo apt-get update --fix-missing

- name: Install Packages
run: sudo apt install qtbase5-dev qt6-base-dev libqt${{matrix.qt_ver}}serialport${{matrix.qt_ver}}-dev gcc-${{matrix.cc_ver}} g++-${{matrix.cc_ver}} doxygen dia
run: |
sudo apt install qtbase5-dev qt6-base-dev libqt${{matrix.qt_ver}}serialport${{matrix.qt_ver}}-dev \
gcc-${{matrix.cc_ver}} g++-${{matrix.cc_ver}} doxygen dia
- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build
Expand Down Expand Up @@ -117,16 +124,18 @@ jobs:
VERBOSE: 1

- name: Documentation
if: ${{matrix.type == 'Debug' && matrix.cc_ver == '14' && matrix.qt_ver == '5' && matrix.cpp == '17'}}
working-directory: ${{runner.workspace}}/build
shell: bash
run: make doc_cc_tools_qt

run: make doc_cc_tools_qt


build_clang_ubuntu_22_04:
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
type: [Debug, Release, MinSizeRel]
type: [Debug, Release]
cc_ver: [11, 12, 13, 14, 15]
cpp: [17, 20]
qt_ver: [5, 6]
Expand Down Expand Up @@ -188,7 +197,7 @@ jobs:
strategy:
fail-fast: false
matrix:
type: [Debug, Release, MinSizeRel]
type: [Debug, Release]
cc_ver: [16, 17, 18]
cpp: [17, 20, 23]
qt_ver: [5, 6]
Expand All @@ -205,7 +214,7 @@ jobs:
run: sudo apt-get update --fix-missing

- name: Install Packages
run: sudo apt install qtbase5-dev qt6-base-dev libqt${{matrix.qt_ver}}serialport${{matrix.qt_ver}}-dev clang-${{matrix.cc_ver}} doxygen dia
run: sudo apt install qtbase5-dev qt6-base-dev libqt${{matrix.qt_ver}}serialport${{matrix.qt_ver}}-dev clang-${{matrix.cc_ver}}

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build
Expand Down Expand Up @@ -240,18 +249,14 @@ jobs:
run: cmake --build . --config ${{matrix.type}} --target install
env:
VERBOSE: 1

- name: Documentation
working-directory: ${{runner.workspace}}/build
shell: bash
run: make doc_cc_tools_qt


build_msvc_2019:
runs-on: windows-2019
strategy:
fail-fast: false
matrix:
type: [Debug, Release, MinSizeRel]
type: [Debug, Release]
arch: [x64]
cpp: [17]
qt_ver: [5, 6]
Expand Down
32 changes: 0 additions & 32 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -114,38 +114,6 @@ cc_msvc_force_warn_opt("/W4")

#######################################################################

find_package (Doxygen)
if (DOXYGEN_FOUND)
set (doc_output_dir "${DOC_INSTALL_DIR}/cc_tools_qt")
set (output_file "${CMAKE_CURRENT_BINARY_DIR}/doxygen.conf")

set (out_dir_match_str "OUTPUT_DIRECTORY[^\n]*")
set (out_dir_replacement_str "OUTPUT_DIRECTORY = ${doc_output_dir}")

set (config_file "${CMAKE_CURRENT_SOURCE_DIR}/doxygen/doxygen.conf")
file (READ ${config_file} config_text)
string (REGEX REPLACE "${out_dir_match_str}" "${out_dir_replacement_str}" modified_config_text "${config_text}")

if (UNIX)
set (dia_path_match_str "DIA_PATH[^\n]*")
set (dia_path_replacement_str "DIA_PATH = ${PROJECT_SOURCE_DIR}/script")
string (REGEX REPLACE "${dia_path_match_str}" "${dia_path_replacement_str}" modified_config_text "${modified_config_text}")
endif ()

file (WRITE "${output_file}" "${modified_config_text}")

add_custom_target ("doc_cc_tools_qt"
COMMAND ${CMAKE_COMMAND} -E make_directory ${doc_output_dir}
COMMAND ${DOXYGEN_EXECUTABLE} ${output_file}
COMMAND ${CMAKE_COMMAND} -DDOC_OUTPUT_DIR="${doc_output_dir}" -P
${LibComms_DIR}/CC_DocCleanupScript.cmake
COMMAND ${CMAKE_COMMAND} -E copy_directory
${CMAKE_CURRENT_SOURCE_DIR}/doxygen/image ${doc_output_dir}/html/image
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
endif ()

#######################################################################

if (CC_TOOLS_QT_INSTALL_LIBRARY_HEADERS)
set (LIB_CC_TOOLS_QT_CMAKE_FILES
${PROJECT_SOURCE_DIR}/cmake/cc_tools_qtConfig.cmake
Expand Down
10 changes: 1 addition & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# CommsChampion Tools
This project contains a set of tool applications , which can be used to
This project contains tool application(s), which can be used to
develop, monitor and debug custom binary communication protocols, that were
developed using the [COMMS Library](https://github.com/commschamp/comms).
All the applications are plug-in based, i.e. plug-ins are used to define
Expand All @@ -14,14 +14,6 @@ for tutorial on how to use them.
- **cc_view** is the main generic GUI application for visualisation and analysis of the
communication protocols.

- **cc_dump** is a command line utility, that recognises all the received
custom binary protocol messages and dumps them all in CSV format to standard output.
It can also record the incoming message into the file, which can be opened
later for visual analysis using **cc_view** GUI application.
The tool has an ability to receive a file with definition of outgoing messages,
created using **cc_view** GUI application, and send them one by one
in parallel to dumping/recording the incoming messages.

The **CommsChampion Tools** contain the following
plugins that can be used with any application:

Expand Down
1 change: 0 additions & 1 deletion app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ add_definitions(
)

add_subdirectory (cc_view)
add_subdirectory (cc_dump)

if (WIN32)
add_custom_target ("deploy_qt"
Expand Down
8 changes: 0 additions & 8 deletions app/cc_dump/CMakeLists.txt

This file was deleted.

8 changes: 0 additions & 8 deletions app/cc_dump/script/cc_dump.sh

This file was deleted.

Loading

0 comments on commit 756a364

Please sign in to comment.