Skip to content

Commit 4dd1067

Browse files
arobenkoarobenko
committed
Release v2.7
2 parents 1c011f6 + 4435455 commit 4dd1067

File tree

4 files changed

+178
-39
lines changed

4 files changed

+178
-39
lines changed

‎.appveyor.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ configuration:
1818
- Release
1919

2020
environment:
21-
COMMS_BRANCH: v5.2.2
22-
COMMSDSL_BRANCH: v6.3
23-
CC_TOOLS_QT_BRANCH: v5.1
21+
COMMS_TAG: v5.2.3
22+
COMMSDSL_TAG: v6.3.2
23+
CC_TOOLS_QT_TAG: v5.2.1
2424
matrix:
2525
- CPP_STD: 11
2626
QT_MAJOR: 5
@@ -46,9 +46,9 @@ install:
4646
- set PATH=%PATH%;%QTDIR%\bin
4747
- set BUILD_DIR=%APPVEYOR_BUILD_FOLDER%\build.%PLATFORM%.%CONFIGURATION%.%TOOLCHAIN%
4848
- if exist %BUILD_DIR% rmdir /S /Q %BUILD_DIR%
49-
- set COMMS_TAG=%COMMS_BRANCH%
50-
- set COMMSDSL_TAG=%COMMSDSL_BRANCH%
51-
- set CC_TOOLS_QT_TAG=%CC_TOOLS_QT_BRANCH%
49+
- set COMMS_TAG=%COMMS_TAG%
50+
- set COMMSDSL_TAG=%COMMSDSL_TAG%
51+
- set CC_TOOLS_QT_TAG=%CC_TOOLS_QT_TAG%
5252
- set COMMON_INSTALL_DIR=%BUILD_DIR%\install
5353
- set COMMON_BUILD_TYPE=%CONFIGURATION%
5454
- set COMMON_CXX_STANDARD=%CPP_STD%

‎.github/workflows/actions_build.yml‎

Lines changed: 155 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: Github Actions Build
33
on: [push]
44

55
env:
6-
COMMS_BRANCH: v5.2.2
7-
COMMSDSL_BRANCH: v6.3
8-
CC_TOOLS_QT_BRANCH: v5.1
6+
COMMS_TAG: v5.2.3
7+
COMMSDSL_TAG: v6.3.2
8+
CC_TOOLS_QT_TAG: v5.2.1
99

1010
jobs:
1111
build_gcc_old_ubuntu_20_04:
@@ -18,7 +18,7 @@ jobs:
1818
cpp: [11]
1919

2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v4
2222

2323
- name: Add repositories
2424
run: |
@@ -47,8 +47,8 @@ jobs:
4747
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
4848
COMMON_BUILD_TYPE: ${{matrix.type}}
4949
COMMON_CXX_STANDARD: ${{matrix.cpp}}
50-
COMMS_TAG: ${{env.COMMS_BRANCH}}
51-
COMMSDSL_TAG: ${{env.COMMSDSL_BRANCH}}
50+
COMMS_TAG: ${{env.COMMS_TAG}}
51+
COMMSDSL_TAG: ${{env.COMMSDSL_TAG}}
5252
CC_TOOLS_QT_SKIP: 1
5353

5454
- name: Configure CMake
@@ -85,7 +85,7 @@ jobs:
8585
- cc_ver: 7
8686
cpp: 17
8787
steps:
88-
- uses: actions/checkout@v2
88+
- uses: actions/checkout@v4
8989

9090
- name: Add repositories
9191
run: |
@@ -114,9 +114,9 @@ jobs:
114114
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
115115
COMMON_BUILD_TYPE: ${{matrix.type}}
116116
COMMON_CXX_STANDARD: ${{matrix.cpp}}
117-
COMMS_TAG: ${{env.COMMS_BRANCH}}
118-
COMMSDSL_TAG: ${{env.COMMSDSL_BRANCH}}
119-
CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_BRANCH}}
117+
COMMS_TAG: ${{env.COMMS_TAG}}
118+
COMMSDSL_TAG: ${{env.COMMSDSL_TAG}}
119+
CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_TAG}}
120120

121121
- name: Configure CMake
122122
shell: bash
@@ -148,7 +148,7 @@ jobs:
148148
qt_ver: [5, 6]
149149

150150
steps:
151-
- uses: actions/checkout@v2
151+
- uses: actions/checkout@v4
152152

153153
- name: Prepare Install
154154
run: sudo apt-get update --fix-missing
@@ -172,9 +172,9 @@ jobs:
172172
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
173173
COMMON_BUILD_TYPE: ${{matrix.type}}
174174
COMMON_CXX_STANDARD: ${{matrix.cpp}}
175-
COMMS_TAG: ${{env.COMMS_BRANCH}}
176-
COMMSDSL_TAG: ${{env.COMMSDSL_BRANCH}}
177-
CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_BRANCH}}
175+
COMMS_TAG: ${{env.COMMS_TAG}}
176+
COMMSDSL_TAG: ${{env.COMMSDSL_TAG}}
177+
CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_TAG}}
178178
CC_TOOLS_QT_MAJOR_QT_VERSION: ${{matrix.qt_ver}}
179179

180180
- name: Configure CMake
@@ -183,6 +183,7 @@ jobs:
183183
run: |
184184
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
185185
-DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCMAKE_CXX_STANDARD=${{matrix.cpp}} \
186+
-DDEMO1_TOOLS_QT_VER=${{matrix.qt_ver}} \
186187
-DDEMO1_GEN_PROTOCOL=ON -DDEMO1_GEN_TEST=ON -DDEMO1_GEN_TOOLS=ON -DDEMO1_BUILD_TOOLS=${{env.BUILD_TOOLS}} \
187188
-DDEMO1_GEN_SWIG=ON -DDEMO1_GEN_EMSCRIPTEN=ON
188189
env:
@@ -211,7 +212,7 @@ jobs:
211212

212213

213214
steps:
214-
- uses: actions/checkout@v2
215+
- uses: actions/checkout@v4
215216

216217
- name: Add repositories
217218
run: |
@@ -241,9 +242,9 @@ jobs:
241242
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
242243
COMMON_BUILD_TYPE: ${{matrix.type}}
243244
COMMON_CXX_STANDARD: ${{matrix.cpp}}
244-
COMMS_TAG: ${{env.COMMS_BRANCH}}
245-
COMMSDSL_TAG: ${{env.COMMSDSL_BRANCH}}
246-
CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_BRANCH}}
245+
COMMS_TAG: ${{env.COMMS_TAG}}
246+
COMMSDSL_TAG: ${{env.COMMSDSL_TAG}}
247+
CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_TAG}}
247248

248249
- name: Configure CMake
249250
shell: bash
@@ -280,7 +281,7 @@ jobs:
280281
cpp: 20
281282

282283
steps:
283-
- uses: actions/checkout@v2
284+
- uses: actions/checkout@v4
284285

285286
- name: Prepare Install
286287
run: sudo apt-get update --fix-missing
@@ -302,9 +303,9 @@ jobs:
302303
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
303304
COMMON_BUILD_TYPE: ${{matrix.type}}
304305
COMMON_CXX_STANDARD: ${{matrix.cpp}}
305-
COMMS_TAG: ${{env.COMMS_BRANCH}}
306-
COMMSDSL_TAG: ${{env.COMMSDSL_BRANCH}}
307-
CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_BRANCH}}
306+
COMMS_TAG: ${{env.COMMS_TAG}}
307+
COMMSDSL_TAG: ${{env.COMMSDSL_TAG}}
308+
CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_TAG}}
308309
CC_TOOLS_QT_SKIP: "${{ matrix.cpp < 17 && '1' || '0' }}"
309310

310311
- name: Configure CMake
@@ -337,7 +338,7 @@ jobs:
337338
qt_ver: [5, 6]
338339

339340
steps:
340-
- uses: actions/checkout@v2
341+
- uses: actions/checkout@v4
341342

342343
- name: Prepare Install
343344
run: sudo apt-get update --fix-missing
@@ -361,9 +362,9 @@ jobs:
361362
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
362363
COMMON_BUILD_TYPE: ${{matrix.type}}
363364
COMMON_CXX_STANDARD: ${{matrix.cpp}}
364-
COMMS_TAG: ${{env.COMMS_BRANCH}}
365-
COMMSDSL_TAG: ${{env.COMMSDSL_BRANCH}}
366-
CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_BRANCH}}
365+
COMMS_TAG: ${{env.COMMS_TAG}}
366+
COMMSDSL_TAG: ${{env.COMMSDSL_TAG}}
367+
CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_TAG}}
367368
CC_TOOLS_QT_MAJOR_QT_VERSION: ${{matrix.qt_ver}}
368369
CC_TOOLS_QT_SKIP: "${{ (matrix.cpp < 17 || (matrix.cpp == 20 && matrix.cc_ver < 15)) && '1' || '0' }}"
369370

@@ -373,6 +374,7 @@ jobs:
373374
run: |
374375
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
375376
-DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCMAKE_CXX_STANDARD=${{matrix.cpp}} \
377+
-DDEMO1_TOOLS_QT_VER=${{matrix.qt_ver}} \
376378
-DDEMO1_GEN_PROTOCOL=ON -DDEMO1_GEN_TEST=ON -DDEMO1_GEN_TOOLS=ON -DDEMO1_BUILD_TOOLS=${{env.BUILD_TOOLS}} \
377379
-DDEMO1_GEN_SWIG=ON -DDEMO1_GEN_EMSCRIPTEN=ON
378380
env:
@@ -386,3 +388,130 @@ jobs:
386388
run: cmake --build . --config ${{matrix.type}} --target install
387389
env:
388390
VERBOSE: 1
391+
392+
build_msvc_2019:
393+
runs-on: windows-2019
394+
strategy:
395+
fail-fast: false
396+
matrix:
397+
type: [Debug, Release, MinSizeRel]
398+
arch: [Win32, x64]
399+
cpp: [11, 14, 17]
400+
qt_ver: [5, 6]
401+
exclude:
402+
- arch: Win32
403+
qt_ver: 6
404+
405+
steps:
406+
- uses: actions/checkout@v4
407+
408+
- name: Create Build Environment
409+
run: cmake -E make_directory ${{runner.workspace}}/build
410+
411+
- name: Install Qt
412+
if: ${{matrix.cpp >= 17 && matrix.arch == 'x64'}}
413+
shell: cmd
414+
run: |
415+
choco install curl
416+
curl -L https://github.com/martinrotter/qt-minimalistic-builds/releases/download/${{env.QT_VER}}/qt-${{env.QT_VER}}-dynamic-msvc2019-x86_64.7z -o ${{runner.workspace}}/qt.7z
417+
7z x ${{runner.workspace}}/qt.7z -o${{runner.workspace}}/qt
418+
echo QT_VER=${{env.QT_VER}} >>%GITHUB_ENV%
419+
echo QTDIR=${{runner.workspace}}/qt/qt-${{env.QT_VER}}-dynamic-msvc2019-x86_64 >>%GITHUB_ENV%
420+
env:
421+
QT_VER: ${{matrix.qt_ver == '5' && '5.15.3' || '6.2.2'}}
422+
423+
- name: Install Boost
424+
shell: cmd
425+
run: |
426+
choco install boost-msvc-14.2
427+
428+
- name: Prepare externals
429+
shell: cmd
430+
run: |
431+
%GITHUB_WORKSPACE%\script\prepare_externals.bat
432+
env:
433+
BUILD_DIR: ${{runner.workspace}}/build
434+
PLATFORM: ${{matrix.arch}}
435+
EXTERNALS_DIR: ${{runner.workspace}}/externals
436+
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
437+
COMMON_BUILD_TYPE: ${{matrix.type}}
438+
COMMON_CXX_STANDARD: ${{matrix.cpp}}
439+
COMMS_TAG: ${{env.COMMS_TAG}}
440+
COMMSDSL_TAG: ${{env.COMMSDSL_TAG}}
441+
COMMSDSL_PLATFORM: 'x64'
442+
CC_TOOLS_QT_TAG: ${{env.CC_TOOLS_QT_TAG}}
443+
CC_TOOLS_QT_MAJOR_QT_VERSION: ${{matrix.qt_ver}}
444+
CC_TOOLS_QT_SKIP: ${{matrix.arch == 'Win32' && '1' || '0'}}
445+
446+
- name: Configure CMake
447+
shell: cmd
448+
working-directory: ${{runner.workspace}}/build
449+
run: |
450+
cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install ^
451+
-DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{env.QTDIR}}" -DBoost_USE_STATIC_LIBS=ON ^
452+
-DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DDEMO1_TOOLS_QT_VER=${{matrix.qt_ver}} ^
453+
-DDEMO1_GEN_PROTOCOL=ON -DDEMO1_GEN_TEST=ON -DDEMO1_GEN_TOOLS=ON -DDEMO1_BUILD_TOOLS=${{env.BUILD_TOOLS}}
454+
env:
455+
BUILD_TOOLS: "${{ matrix.cpp >= 17 && matrix.arch == 'x64' && 'ON' || 'OFF' }}"
456+
457+
- name: Build Target
458+
working-directory: ${{runner.workspace}}/build
459+
shell: cmd
460+
run: cmake --build . --config ${{matrix.type}} --target install
461+
env:
462+
VERBOSE: 1
463+
464+
build_msvc_2022:
465+
runs-on: windows-2022
466+
strategy:
467+
fail-fast: false
468+
matrix:
469+
type: [Debug, Release, MinSizeRel]
470+
arch: [Win32, x64]
471+
cpp: [11, 14, 17, 20]
472+
473+
steps:
474+
- uses: actions/checkout@v4
475+
476+
- name: Create Build Environment
477+
run: cmake -E make_directory ${{runner.workspace}}/build
478+
479+
- name: Install Boost
480+
if: matrix.arch == 'x64'
481+
shell: cmd
482+
run: |
483+
choco install boost-msvc-14.3
484+
485+
- name: Prepare externals
486+
shell: cmd
487+
run: |
488+
%GITHUB_WORKSPACE%\script\prepare_externals.bat
489+
env:
490+
BUILD_DIR: ${{runner.workspace}}/build
491+
PLATFORM: ${{matrix.arch}}
492+
EXTERNALS_DIR: ${{runner.workspace}}/externals
493+
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
494+
COMMON_BUILD_TYPE: ${{matrix.type}}
495+
COMMON_CXX_STANDARD: ${{matrix.cpp}}
496+
COMMS_TAG: ${{env.COMMS_TAG}}
497+
COMMSDSL_TAG: ${{env.COMMSDSL_TAG}}
498+
COMMSDSL_PLATFORM: 'x64'
499+
CC_TOOLS_QT_SKIP: 1
500+
501+
- name: Configure CMake
502+
shell: cmd
503+
working-directory: ${{runner.workspace}}/build
504+
run: |
505+
cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install ^
506+
-DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install" -DBoost_USE_STATIC_LIBS=ON ^
507+
-DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DDEMO1_TOOLS_QT_VER=${{matrix.qt_ver}} ^
508+
-DDEMO1_GEN_PROTOCOL=ON -DDEMO1_GEN_TEST=ON -DDEMO1_BUILD_EXAMPLES=${{env.HAS_BOOST}}
509+
env:
510+
HAS_BOOST: "${{ matrix.arch == 'x64' && 'ON' || 'OFF' }}"
511+
512+
- name: Build Target
513+
working-directory: ${{runner.workspace}}/build
514+
shell: cmd
515+
run: cmake --build . --config ${{matrix.type}}
516+
env:
517+
VERBOSE: 1

‎CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required (VERSION 3.5)
1+
cmake_minimum_required (VERSION 3.10)
22
project ("cc.demo1.commsdsl")
33

44
option (DEMO1_WARN_AS_ERR "Treat compilation warnings as errors." ON)
@@ -32,8 +32,8 @@ option (DEMO1_BUILD_EXAMPLES "Build examples." ON)
3232
# COMMSDSL2SWIG_EXTRA_ARGS - Extra arguments to pass to "commsdsl2swig"
3333
# COMMSDSL2EMSCRIPTEN_EXTRA_ARGS - Extra arguments to pass to "commsdsl2emscripten"
3434

35-
set (DEMO1_VERSION "2.6")
36-
set (DEMO1_MIN_COMMSDSL_VERSION "6.3")
35+
set (DEMO1_VERSION "2.7")
36+
set (DEMO1_MIN_COMMSDSL_VERSION "6.3.2")
3737

3838
set (EXTERNALS_DIR "${PROJECT_SOURCE_DIR}/externals")
3939

0 commit comments

Comments
 (0)