Skip to content

Commit

Permalink
Release v6.3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@arobenko
arobenko committed Sep 28, 2024
2 parents 45ee0d3 + 7b0ac9f commit b2fa93c
Show file tree
Hide file tree
Showing 16 changed files with 194 additions and 139 deletions.
156 changes: 151 additions & 5 deletions .github/workflows/actions_build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: Github Actions Build
on: [push]

env:
COMMS_TAG: v5.2.5
CC_TOOLS_QT_TAG: v5.3.1
COMMS_TAG: v5.2.7
CC_TOOLS_QT_TAG: v5.3.3

jobs:
build_gcc_old_ubuntu_20_04:
Expand Down Expand Up @@ -92,7 +92,7 @@ jobs:
run: sudo apt-get update --fix-missing

- name: Install Packages
run: sudo apt install libqt5gui5 qtbase5-dev libxml2-dev doxygen gcc-${{matrix.cc_ver}} g++-${{matrix.cc_ver}}
run: sudo apt install libqt5gui5 qtbase5-dev libxml2-dev gcc-${{matrix.cc_ver}} g++-${{matrix.cc_ver}}

- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build
Expand All @@ -117,7 +117,7 @@ jobs:
run: |
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
-DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCOMMSDSL_TESTS_CXX_STANDARD=${{matrix.cpp}} \
-DCOMMSDSL_BUILD_UNIT_TESTS=ON -DCOMMSDSL_TEST_BUILD_DOC=ON \
-DCOMMSDSL_BUILD_UNIT_TESTS=ON \
-DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON \
-DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS=${{env.BUILD_TOOLS_QT_UNIT_TESTS}} \
-DCOMMSDSL_BUILD_WITH_SANITIZERS=ON
Expand Down Expand Up @@ -151,6 +151,78 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Prepare Install
run: sudo apt-get update --fix-missing

- name: Install Packages
run: |
sudo apt install libqt${{matrix.qt_ver}}gui${{matrix.qt_ver}} qtbase5-dev qt6-base-dev libxml2-dev gcc-${{matrix.cc_ver}} g++-${{matrix.cc_ver}} \
python3 libpython3-dev swig default-jdk default-jre emscripten nodejs
- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build

- name: Prepare externals
shell: bash
run: $GITHUB_WORKSPACE/script/prepare_externals.sh
env:
BUILD_DIR: ${{runner.workspace}}/build
CC: gcc-${{matrix.cc_ver}}
CXX: g++-${{matrix.cc_ver}}
EXTERNALS_DIR: ${{runner.workspace}}/externals
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
COMMON_BUILD_TYPE: ${{matrix.type}}
COMMON_CXX_STANDARD: ${{matrix.cpp}}
COMMS_TAG: ${{env.COMMS_TAG}}
CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_TAG}}
CC_TOOLS_QT_MAJOR_QT_VERSION: ${{matrix.qt_ver}}

- name: Configure CMake
shell: bash
working-directory: ${{runner.workspace}}/build
run: |
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
-DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCOMMSDSL_TESTS_CXX_STANDARD=${{matrix.cpp}} \
-DCMAKE_CXX_STANDARD=${{env.TOOLS_CXX_STANDARD}} -DCOMMSDSL_TESTS_QT_VERSION=${{matrix.qt_ver}} \
-DCOMMSDSL_BUILD_UNIT_TESTS=ON -DCMAKE_IGNORE_PATH=/usr/local/bin \
-DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON \
-DCOMMSDSL_BUILD_COMMSDSL2SWIG=ON -DCOMMSDSL_BUILD_COMMSDSL2EMSCRIPTEN=ON \
-DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS=${{env.BUILD_TOOLS_QT_UNIT_TESTS}} \
-DCOMMSDSL_BUILD_WITH_SANITIZERS=ON
env:
CC: gcc-${{matrix.cc_ver}}
CXX: g++-${{matrix.cc_ver}}
BUILD_TOOLS_QT_UNIT_TESTS: "${{ matrix.cpp >= 17 && 'ON' || 'OFF' }}"
TOOLS_CXX_STANDARD: "${{ matrix.cpp >= 17 && matrix.cpp || '17' }}"

- name: Build Target
working-directory: ${{runner.workspace}}/build
shell: bash
run: cmake --build . --config ${{matrix.type}} --target install
env:
VERBOSE: 1

- name: Testing
working-directory: ${{runner.workspace}}/build
shell: bash
run: ctest -V

build_gcc_ubuntu_24_04:
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
type: [Debug, Release, MinSizeRel]
cc_ver: [13, 14]
cpp: [11, 14, 17, 20, 23]
qt_ver: [5, 6]
exclude:
- cc_ver: 13
cpp: 23

steps:
- uses: actions/checkout@v4

- name: Prepare Install
run: sudo apt-get update --fix-missing

Expand Down Expand Up @@ -207,7 +279,6 @@ jobs:
shell: bash
run: ctest -V


build_clang_old_ubuntu_20_04:
runs-on: ubuntu-20.04
strategy:
Expand Down Expand Up @@ -425,6 +496,81 @@ jobs:
shell: bash
run: ctest -V

build_clang_ubuntu_24_04:
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
type: [Debug, Release, MinSizeRel]
cc_ver: [16, 17, 18]
cpp: [11, 14, 17, 20, 23]
qt_ver: [5, 6]
exclude:
- cc_ver: 16
cpp: 23
- cc_ver: 17
cpp: 23

steps:
- uses: actions/checkout@v4

- name: Prepare Install
run: sudo apt-get update --fix-missing

- name: Install Packages
run: |
sudo apt install libqt${{matrix.qt_ver}}gui${{matrix.qt_ver}} qtbase5-dev qt6-base-dev libxml2-dev clang-${{matrix.cc_ver}} \
python3 libpython3-dev swig default-jdk default-jre emscripten nodejs
- name: Create Build Environment
run: cmake -E make_directory ${{runner.workspace}}/build

- name: Prepare externals
shell: bash
run: $GITHUB_WORKSPACE/script/prepare_externals.sh
env:
BUILD_DIR: ${{runner.workspace}}/build
CC: clang-${{matrix.cc_ver}}
CXX: clang++-${{matrix.cc_ver}}
EXTERNALS_DIR: ${{runner.workspace}}/externals
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
COMMON_BUILD_TYPE: ${{matrix.type}}
COMMON_CXX_STANDARD: ${{matrix.cpp}}
COMMS_TAG: ${{env.COMMS_TAG}}
CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_TAG}}
CC_TOOLS_QT_MAJOR_QT_VERSION: ${{matrix.qt_ver}}

- name: Configure CMake
shell: bash
working-directory: ${{runner.workspace}}/build
run: |
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
-DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCOMMSDSL_TESTS_CXX_STANDARD=${{matrix.cpp}} \
-DCMAKE_CXX_STANDARD=${{env.TOOLS_CXX_STANDARD}} -DCOMMSDSL_TESTS_QT_VERSION=${{matrix.qt_ver}} \
-DCOMMSDSL_BUILD_UNIT_TESTS=ON -DCMAKE_IGNORE_PATH=/usr/local/bin \
-DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON \
-DCOMMSDSL_BUILD_COMMSDSL2SWIG=ON -DCOMMSDSL_BUILD_COMMSDSL2EMSCRIPTEN=ON \
-DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT_TESTS=${{env.BUILD_TOOLS_QT_UNIT_TESTS}} \
-DCOMMSDSL_BUILD_WITH_SANITIZERS=ON
env:
CC: clang-${{matrix.cc_ver}}
CXX: clang++-${{matrix.cc_ver}}
BUILD_TOOLS_QT_UNIT_TESTS: "${{ matrix.cpp >= 17 && 'ON' || 'OFF' }}"
TOOLS_CXX_STANDARD: "${{ matrix.cpp >= 17 && matrix.cpp || '17' }}"

- name: Build Target
working-directory: ${{runner.workspace}}/build
shell: bash
run: cmake --build . --config ${{matrix.type}} --target install
env:
VERBOSE: 1

- name: Testing
working-directory: ${{runner.workspace}}/build
shell: bash
run: ctest -V

build_msvc_2019:
runs-on: windows-2019
strategy:
Expand Down
116 changes: 1 addition & 115 deletions app/commsdsl2comms/src/CommsDoxygen.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,147 +92,33 @@ bool CommsDoxygen::commsWriteConfInternal() const
{
const std::string FileName = "doxygen.conf";
const std::string Templ =
"DOXYFILE_ENCODING = UTF-8\n"
"PROJECT_NAME = \"#^#PROJ_NAME#$#\"\n"
"PROJECT_BRIEF = \"Documentation for generated code of \\\"#^#PROJ_NAME#$#\\\" protocol.\"\n"
"OUTPUT_DIRECTORY = \n"
"CREATE_SUBDIRS = NO\n"
"ALLOW_UNICODE_NAMES = NO\n"
"OUTPUT_LANGUAGE = English\n"
"OUTPUT_TEXT_DIRECTION = None\n"
"BRIEF_MEMBER_DESC = YES\n"
"REPEAT_BRIEF = YES\n"
"ALWAYS_DETAILED_SEC = NO\n"
"INLINE_INHERITED_MEMB = YES\n"
"FULL_PATH_NAMES = YES\n"
"SHORT_NAMES = NO\n"
"INHERIT_DOCS = YES\n"
"SEPARATE_MEMBER_PAGES = NO\n"
"TAB_SIZE = 4\n"
"OPTIMIZE_OUTPUT_FOR_C = NO\n"
"OPTIMIZE_OUTPUT_JAVA = NO\n"
"OPTIMIZE_FOR_FORTRAN = NO\n"
"OPTIMIZE_OUTPUT_VHDL = NO\n"
"MARKDOWN_SUPPORT = YES\n"
"AUTOLINK_SUPPORT = YES\n"
"BUILTIN_STL_SUPPORT = YES\n"
"CPP_CLI_SUPPORT = NO\n"
"SIP_SUPPORT = NO\n"
"IDL_PROPERTY_SUPPORT = YES\n"
"DISTRIBUTE_GROUP_DOC = NO\n"
"GROUP_NESTED_COMPOUNDS = NO\n"
"SUBGROUPING = YES\n"
"INLINE_GROUPED_CLASSES = NO\n"
"INLINE_SIMPLE_STRUCTS = NO\n"
"TYPEDEF_HIDES_STRUCT = NO\n"
"LOOKUP_CACHE_SIZE = 0\n"
"NUM_PROC_THREADS = 0\n"
"EXTRACT_ALL = NO\n"
"EXTRACT_PRIVATE = NO\n"
"EXTRACT_PRIV_VIRTUAL = NO\n"
"EXTRACT_PACKAGE = NO\n"
"EXTRACT_STATIC = NO\n"
"EXTRACT_LOCAL_CLASSES = YES\n"
"EXTRACT_LOCAL_METHODS = NO\n"
"EXTRACT_ANON_NSPACES = NO\n"
"RESOLVE_UNNAMED_PARAMS = YES\n"
"HIDE_UNDOC_MEMBERS = YES\n"
"HIDE_UNDOC_CLASSES = YES\n"
"HIDE_FRIEND_COMPOUNDS = NO\n"
"HIDE_IN_BODY_DOCS = NO\n"
"INTERNAL_DOCS = NO\n"
"CASE_SENSE_NAMES = YES\n"
"HIDE_SCOPE_NAMES = NO\n"
"HIDE_COMPOUND_REFERENCE= NO\n"
"SHOW_INCLUDE_FILES = YES\n"
"SHOW_GROUPED_MEMB_INC = NO\n"
"FORCE_LOCAL_INCLUDES = YES\n"
"INLINE_INFO = NO\n"
"SORT_MEMBER_DOCS = YES\n"
"SORT_BRIEF_DOCS = YES\n"
"SORT_MEMBERS_CTORS_1ST = YES\n"
"SORT_GROUP_NAMES = NO\n"
"SORT_BY_SCOPE_NAME = YES\n"
"STRICT_PROTO_MATCHING = NO\n"
"GENERATE_TODOLIST = YES\n"
"GENERATE_TESTLIST = YES\n"
"GENERATE_BUGLIST = YES\n"
"GENERATE_DEPRECATEDLIST= YES\n"
"MAX_INITIALIZER_LINES = 30\n"
"SHOW_USED_FILES = YES\n"
"SHOW_FILES = YES\n"
"SHOW_NAMESPACES = YES\n"
"LAYOUT_FILE = doc/layout.xml\n"
"QUIET = YES\n"
"WARNINGS = YES\n"
"WARN_IF_UNDOCUMENTED = NO\n"
"WARN_IF_DOC_ERROR = YES\n"
"WARN_NO_PARAMDOC = YES\n"
"WARN_AS_ERROR = YES\n"
"WARN_FORMAT = \"$file:$line: $text\"\n"
"INPUT_ENCODING = UTF-8\n"
"INPUT = doc include\n"
"RECURSIVE = YES\n"
"EXCLUDE = \n"
"EXCLUDE_SYMLINKS = NO\n"
"EXCLUDE_SYMBOLS = *details\n"
"EXAMPLE_RECURSIVE = NO\n"
"FILTER_SOURCE_FILES = NO\n"
"SOURCE_BROWSER = NO\n"
"INLINE_SOURCES = NO\n"
"STRIP_CODE_COMMENTS = YES\n"
"REFERENCED_BY_RELATION = NO\n"
"REFERENCES_RELATION = NO\n"
"REFERENCES_LINK_SOURCE = YES\n"
"SOURCE_TOOLTIPS = YES\n"
"USE_HTAGS = NO\n"
"VERBATIM_HEADERS = YES\n"
"CLANG_ASSISTED_PARSING = NO\n"
"CLANG_ADD_INC_PATHS = YES\n"
"CLANG_OPTIONS =\n"
"ALPHABETICAL_INDEX = YES\n"
"GENERATE_HTML = YES\n"
"HTML_OUTPUT = html\n"
"HTML_FILE_EXTENSION = .html\n"
"HTML_COLORSTYLE_HUE = 220\n"
"HTML_COLORSTYLE_SAT = 100\n"
"HTML_COLORSTYLE_GAMMA = 80\n"
"HTML_TIMESTAMP = NO\n"
"HTML_DYNAMIC_SECTIONS = NO\n"
"HTML_INDEX_NUM_ENTRIES = 100\n"
"GENERATE_DOCSET = NO\n"
"GENERATE_HTMLHELP = NO\n"
"GENERATE_QHP = NO\n"
"GENERATE_ECLIPSEHELP = NO\n"
"DISABLE_INDEX = NO\n"
"GENERATE_TREEVIEW = NO\n"
"ENUM_VALUES_PER_LINE = 4\n"
"TREEVIEW_WIDTH = 250\n"
"EXT_LINKS_IN_WINDOW = NO\n"
"FORMULA_FONTSIZE = 10\n"
"FORMULA_TRANSPARENT = YES\n"
"USE_MATHJAX = NO\n"
"SEARCHENGINE = NO\n"
"SERVER_BASED_SEARCH = NO\n"
"EXTERNAL_SEARCH = NO\n"
"SEARCHDATA_FILE = searchdata.xml\n"
"GENERATE_LATEX = NO\n"
"GENERATE_RTF = NO\n"
"GENERATE_MAN = NO\n"
"GENERATE_XML = NO\n"
"GENERATE_DOCBOOK = NO\n"
"GENERATE_AUTOGEN_DEF = NO\n"
"GENERATE_PERLMOD = NO\n"
"ENABLE_PREPROCESSING = YES\n"
"MACRO_EXPANSION = YES\n"
"EXPAND_ONLY_PREDEF = YES\n"
"SEARCH_INCLUDES = YES\n"
"PREDEFINED = FOR_DOXYGEN_DOC_ONLY COMMS_MSVC_WARNING_PUSH= COMMS_MSVC_WARNING_POP= COMMS_MSVC_WARNING_DISABLE(x)=\n"
"SKIP_FUNCTION_MACROS = YES\n"
"ALLEXTERNALS = NO\n"
"EXTERNAL_GROUPS = YES\n"
"EXTERNAL_PAGES = YES\n"
"CLASS_DIAGRAMS = YES\n"
"HIDE_UNDOC_RELATIONS = YES\n"
"HAVE_DOT = NO\n"
"#^#APPEND#$#\n"
"\n";
Expand Down
2 changes: 1 addition & 1 deletion app/commsdsl2comms/src/CommsGenerator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ namespace util = commsdsl::gen::util;
namespace commsdsl2comms
{

const std::string MinCommsVersion("5.2.5");
const std::string MinCommsVersion("5.2.7");

const std::string& CommsGenerator::commsFileGeneratedComment()
{
Expand Down
4 changes: 2 additions & 2 deletions app/commsdsl2comms/test/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ function (test_func name)
endif ()

set (build_tgt ${APP_NAME}.${name}_build_tgt)
set (build_dir ${output_dir}/build)
set (install_dir ${build_dir}/install)
set (build_dir ${output_dir}_build)
set (install_dir ${output_dir}_install)

execute_process (
COMMAND ${CMAKE_COMMAND} -E make_directory "${build_dir}")
Expand Down
Loading

0 comments on commit b2fa93c

Please sign in to comment.