Skip to content

Commit 71e890f

Browse files
arobenkoarobenko
committed
Release v0.9
2 parents 6bd5926 + 4499645 commit 71e890f

File tree

4 files changed

+134
-40
lines changed

4 files changed

+134
-40
lines changed

‎.appveyor.yml

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

1919
environment:
20-
COMMS_BRANCH: v5.2.2
21-
COMMSDSL_BRANCH: v6.3
22-
CC_ASN1_COMMSDSL_BRANCH: v0.2
20+
COMMS_TAG: v5.2.3
21+
COMMSDSL_TAG: v6.3.2
22+
CC_ASN1_COMMSDSL_TAG: v0.2
2323
matrix:
2424
- CPP_STD: 11
2525
- CPP_STD: 14
@@ -37,9 +37,9 @@ install:
3737
- set PATH=%PATH%;%QTDIR%\bin
3838
- set BUILD_DIR=%APPVEYOR_BUILD_FOLDER%\build.%PLATFORM%.%CONFIGURATION%.%TOOLCHAIN%
3939
- if exist %BUILD_DIR% rmdir /S /Q %BUILD_DIR%
40-
- set COMMS_TAG=%COMMS_BRANCH%
41-
- set COMMSDSL_TAG=%COMMSDSL_BRANCH%
42-
- set CC_ASN1_COMMSDSL_TAG=%CC_ASN1_COMMSDSL_BRANCH%
40+
- set COMMS_TAG=%COMMS_TAG%
41+
- set COMMSDSL_TAG=%COMMSDSL_TAG%
42+
- set CC_ASN1_COMMSDSL_TAG=%CC_ASN1_COMMSDSL_TAG%
4343
- set COMMON_INSTALL_DIR=%BUILD_DIR%\install
4444
- set COMMON_BUILD_TYPE=%CONFIGURATION%
4545
- set COMMON_CXX_STANDARD=%CPP_STD%

‎.github/workflows/actions_build.yml

Lines changed: 117 additions & 27 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_ASN1_COMMSDSL_BRANCH: v0.2
6+
COMMS_TAG: v5.2.3
7+
COMMSDSL_TAG: v6.3.2
8+
CC_ASN1_COMMSDSL_TAG: v0.2
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,9 +47,9 @@ 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}}
52-
CC_ASN1_COMMSDSL_TAG: ${{env.CC_ASN1_COMMSDSL_BRANCH}}
50+
COMMS_TAG: ${{env.COMMS_TAG}}
51+
COMMSDSL_TAG: ${{env.COMMSDSL_TAG}}
52+
CC_ASN1_COMMSDSL_TAG: ${{env.CC_ASN1_COMMSDSL_TAG}}
5353

5454
- name: Configure CMake
5555
shell: bash
@@ -82,7 +82,7 @@ jobs:
8282
- cc_ver: 7
8383
cpp: 17
8484
steps:
85-
- uses: actions/checkout@v2
85+
- uses: actions/checkout@v4
8686

8787
- name: Add repositories
8888
run: |
@@ -111,9 +111,9 @@ jobs:
111111
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
112112
COMMON_BUILD_TYPE: ${{matrix.type}}
113113
COMMON_CXX_STANDARD: ${{matrix.cpp}}
114-
COMMS_TAG: ${{env.COMMS_BRANCH}}
115-
COMMSDSL_TAG: ${{env.COMMSDSL_BRANCH}}
116-
CC_ASN1_COMMSDSL_TAG: ${{env.CC_ASN1_COMMSDSL_BRANCH}}
114+
COMMS_TAG: ${{env.COMMS_TAG}}
115+
COMMSDSL_TAG: ${{env.COMMSDSL_TAG}}
116+
CC_ASN1_COMMSDSL_TAG: ${{env.CC_ASN1_COMMSDSL_TAG}}
117117

118118
- name: Configure CMake
119119
shell: bash
@@ -140,7 +140,7 @@ jobs:
140140
cpp: [11, 14, 17, 20]
141141

142142
steps:
143-
- uses: actions/checkout@v2
143+
- uses: actions/checkout@v4
144144

145145
- name: Prepare Install
146146
run: sudo apt-get update --fix-missing
@@ -162,9 +162,9 @@ jobs:
162162
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
163163
COMMON_BUILD_TYPE: ${{matrix.type}}
164164
COMMON_CXX_STANDARD: ${{matrix.cpp}}
165-
COMMS_TAG: ${{env.COMMS_BRANCH}}
166-
COMMSDSL_TAG: ${{env.COMMSDSL_BRANCH}}
167-
CC_ASN1_COMMSDSL_TAG: ${{env.CC_ASN1_COMMSDSL_BRANCH}}
165+
COMMS_TAG: ${{env.COMMS_TAG}}
166+
COMMSDSL_TAG: ${{env.COMMSDSL_TAG}}
167+
CC_ASN1_COMMSDSL_TAG: ${{env.CC_ASN1_COMMSDSL_TAG}}
168168

169169
- name: Configure CMake
170170
shell: bash
@@ -198,7 +198,7 @@ jobs:
198198

199199

200200
steps:
201-
- uses: actions/checkout@v2
201+
- uses: actions/checkout@v4
202202

203203
- name: Add repositories
204204
run: |
@@ -228,9 +228,9 @@ jobs:
228228
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
229229
COMMON_BUILD_TYPE: ${{matrix.type}}
230230
COMMON_CXX_STANDARD: ${{matrix.cpp}}
231-
COMMS_TAG: ${{env.COMMS_BRANCH}}
232-
COMMSDSL_TAG: ${{env.COMMSDSL_BRANCH}}
233-
CC_ASN1_COMMSDSL_TAG: ${{env.CC_ASN1_COMMSDSL_BRANCH}}
231+
COMMS_TAG: ${{env.COMMS_TAG}}
232+
COMMSDSL_TAG: ${{env.COMMSDSL_TAG}}
233+
CC_ASN1_COMMSDSL_TAG: ${{env.CC_ASN1_COMMSDSL_TAG}}
234234

235235
- name: Configure CMake
236236
shell: bash
@@ -262,7 +262,7 @@ jobs:
262262
cpp: 20
263263

264264
steps:
265-
- uses: actions/checkout@v2
265+
- uses: actions/checkout@v4
266266

267267
- name: Prepare Install
268268
run: sudo apt-get update --fix-missing
@@ -284,9 +284,9 @@ jobs:
284284
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
285285
COMMON_BUILD_TYPE: ${{matrix.type}}
286286
COMMON_CXX_STANDARD: ${{matrix.cpp}}
287-
COMMS_TAG: ${{env.COMMS_BRANCH}}
288-
COMMSDSL_TAG: ${{env.COMMSDSL_BRANCH}}
289-
CC_ASN1_COMMSDSL_TAG: ${{env.CC_ASN1_COMMSDSL_BRANCH}}
287+
COMMS_TAG: ${{env.COMMS_TAG}}
288+
COMMSDSL_TAG: ${{env.COMMSDSL_TAG}}
289+
CC_ASN1_COMMSDSL_TAG: ${{env.CC_ASN1_COMMSDSL_TAG}}
290290

291291
- name: Configure CMake
292292
shell: bash
@@ -313,7 +313,7 @@ jobs:
313313
cpp: [11, 14, 17, 20]
314314

315315
steps:
316-
- uses: actions/checkout@v2
316+
- uses: actions/checkout@v4
317317

318318
- name: Prepare Install
319319
run: sudo apt-get update --fix-missing
@@ -335,9 +335,9 @@ jobs:
335335
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
336336
COMMON_BUILD_TYPE: ${{matrix.type}}
337337
COMMON_CXX_STANDARD: ${{matrix.cpp}}
338-
COMMS_TAG: ${{env.COMMS_BRANCH}}
339-
COMMSDSL_TAG: ${{env.COMMSDSL_BRANCH}}
340-
CC_ASN1_COMMSDSL_TAG: ${{env.CC_ASN1_COMMSDSL_BRANCH}}
338+
COMMS_TAG: ${{env.COMMS_TAG}}
339+
COMMSDSL_TAG: ${{env.COMMSDSL_TAG}}
340+
CC_ASN1_COMMSDSL_TAG: ${{env.CC_ASN1_COMMSDSL_TAG}}
341341

342342
- name: Configure CMake
343343
shell: bash
@@ -356,4 +356,94 @@ jobs:
356356
run: cmake --build . --config ${{matrix.type}}
357357
env:
358358
VERBOSE: 1
359+
360+
build_msvc_2019:
361+
runs-on: windows-2019
362+
strategy:
363+
fail-fast: false
364+
matrix:
365+
type: [Debug, Release, MinSizeRel]
366+
arch: [Win32, x64]
367+
cpp: [11, 14, 17]
368+
369+
steps:
370+
- uses: actions/checkout@v4
371+
372+
- name: Create Build Environment
373+
run: cmake -E make_directory ${{runner.workspace}}/build
374+
375+
- name: Prepare externals
376+
shell: cmd
377+
run: |
378+
%GITHUB_WORKSPACE%\script\prepare_externals.bat
379+
env:
380+
BUILD_DIR: ${{runner.workspace}}/build
381+
PLATFORM: ${{matrix.arch}}
382+
EXTERNALS_DIR: ${{runner.workspace}}/externals
383+
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
384+
COMMON_BUILD_TYPE: ${{matrix.type}}
385+
COMMON_CXX_STANDARD: ${{matrix.cpp}}
386+
COMMS_TAG: ${{env.COMMS_TAG}}
387+
COMMSDSL_TAG: ${{env.COMMSDSL_TAG}}
388+
COMMSDSL_PLATFORM: 'x64'
389+
390+
- name: Configure CMake
391+
shell: cmd
392+
working-directory: ${{runner.workspace}}/build
393+
run: |
394+
cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install ^
395+
-DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install" ^
396+
-DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DCC_X509_BUILD_APPS=ON
397+
398+
- name: Build Target
399+
working-directory: ${{runner.workspace}}/build
400+
shell: cmd
401+
run: cmake --build . --config ${{matrix.type}}
402+
env:
403+
VERBOSE: 1
404+
405+
build_msvc_2022:
406+
runs-on: windows-2022
407+
strategy:
408+
fail-fast: false
409+
matrix:
410+
type: [Debug, Release, MinSizeRel]
411+
arch: [Win32, x64]
412+
cpp: [11, 14, 17, 20]
413+
414+
steps:
415+
- uses: actions/checkout@v4
416+
417+
- name: Create Build Environment
418+
run: cmake -E make_directory ${{runner.workspace}}/build
419+
420+
- name: Prepare externals
421+
shell: cmd
422+
run: |
423+
%GITHUB_WORKSPACE%\script\prepare_externals.bat
424+
env:
425+
BUILD_DIR: ${{runner.workspace}}/build
426+
PLATFORM: ${{matrix.arch}}
427+
EXTERNALS_DIR: ${{runner.workspace}}/externals
428+
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
429+
COMMON_BUILD_TYPE: ${{matrix.type}}
430+
COMMON_CXX_STANDARD: ${{matrix.cpp}}
431+
COMMS_TAG: ${{env.COMMS_TAG}}
432+
COMMSDSL_TAG: ${{env.COMMSDSL_TAG}}
433+
COMMSDSL_PLATFORM: 'x64'
434+
435+
- name: Configure CMake
436+
shell: cmd
437+
working-directory: ${{runner.workspace}}/build
438+
run: |
439+
cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install ^
440+
-DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install" ^
441+
-DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DCC_X509_BUILD_APPS=ON
442+
443+
- name: Build Target
444+
working-directory: ${{runner.workspace}}/build
445+
shell: cmd
446+
run: cmake --build . --config ${{matrix.type}}
447+
env:
448+
VERBOSE: 1
359449

‎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.1)
1+
cmake_minimum_required (VERSION 3.10)
22
project ("cc_x509")
33

44
option (CC_X509_WARN_AS_ERR "Treat warning as error" ON)
@@ -31,8 +31,8 @@ option (CC_X509_BUILD_EMSCRIPTEN "Build and install project generated by the com
3131

3232
################################################
3333

34-
set (CC_X509_VERSION "0.8")
35-
set (CC_X509_MIN_COMMSDSL_VERSION "6.3")
34+
set (CC_X509_VERSION "0.9")
35+
set (CC_X509_MIN_COMMSDSL_VERSION "6.3.2")
3636

3737
set(CMAKE_CXX_STANDARD 11 CACHE STRING "The C++ standard to use")
3838
set(CMAKE_BUILD_TYPE None CACHE STRING "The build type to use")

‎script/prepare_externals.bat

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ rem COMMS_REPO - (Optional) Repository of the COMMS library
88
rem COMMS_TAG - (Optional) Tag of the COMMS library
99
rem COMMSDSL_REPO - (Optional) Repository of the commsdsl code generators
1010
rem COMMSDSL_TAG - (Optional) Tag of the commdsl
11+
rem COMMSDSL_PLATFORM - (Optional) Tag of the commdsl
1112
rem CC_ASN1_COMMSDSL_REPO - (Optional) Repository of the cc.asn1.commsdsl
1213
rem CC_ASN1_COMMSDSL_TAG - (Optional) Tag of the cc.asn1.commsdsl
1314
rem COMMON_INSTALL_DIR - (Optional) Common directory to perform installations
@@ -18,7 +19,7 @@ rem -----------------------------------------------------
1819

1920
if [%BUILD_DIR%] == [] echo "BUILD_DIR hasn't been specified" & exit /b 1
2021

21-
if [%GENERATOR%] == [] set GENERATOR="NMake Makefiles"
22+
if NOT [%GENERATOR%] == [] set GENERATOR_PARAM=-G %GENERATOR%
2223

2324
if NOT [%PLATFORM%] == [] set PLATFORM_PARAM=-A %PLATFORM%
2425

@@ -32,6 +33,9 @@ if [%COMMSDSL_REPO%] == [] set COMMSDSL_REPO="https://github.com/commschamp/comm
3233

3334
if [%COMMSDSL_TAG%] == [] set COMMSDSL_TAG="master"
3435

36+
set COMMSDSL_PLATFORM_PARAM=%PLATFORM_PARAM%
37+
if NOT [%COMMSDSL_PLATFORM%] == [] set COMMSDSL_PLATFORM_PARAM=-A %COMMSDSL_PLATFORM%
38+
3539
if [%CC_ASN1_COMMSDSL_REPO%] == [] set CC_ASN1_COMMSDSL_REPO="https://github.com/commschamp/cc.asn1.commsdsl.git"
3640

3741
if [%CC_ASN1_COMMSDSL_TAG%] == [] set CC_ASN1_COMMSDSL_TAG="master"
@@ -73,7 +77,7 @@ if exist %COMMS_SRC_DIR%/.git (
7377
echo "Building COMMS library..."
7478
mkdir "%COMMS_BUILD_DIR%"
7579
cd %COMMS_BUILD_DIR%
76-
cmake -G %GENERATOR% %PLATFORM_PARAM% -S %COMMS_SRC_DIR% -B %COMMS_BUILD_DIR% -DCMAKE_INSTALL_PREFIX=%COMMS_INSTALL_DIR% ^
80+
cmake %GENERATOR_PARAM% %PLATFORM_PARAM% -S %COMMS_SRC_DIR% -B %COMMS_BUILD_DIR% -DCMAKE_INSTALL_PREFIX=%COMMS_INSTALL_DIR% ^
7781
-DCMAKE_BUILD_TYPE=%COMMON_BUILD_TYPE% -DCMAKE_CXX_STANDARD=%COMMON_CXX_STANDARD%
7882
if %errorlevel% neq 0 exit /b %errorlevel%
7983
cmake --build %COMMS_BUILD_DIR% --config %COMMON_BUILD_TYPE% --target install
@@ -97,7 +101,7 @@ if exist %COMMSDSL_SRC_DIR%/.git (
97101
echo "Building commsdsl ..."
98102
mkdir "%COMMSDSL_BUILD_DIR%"
99103
cd %COMMSDSL_BUILD_DIR%
100-
cmake -G %GENERATOR% %PLATFORM_PARAM% -S %COMMSDSL_SRC_DIR% -B %COMMSDSL_BUILD_DIR% ^
104+
cmake %GENERATOR_PARAM% %COMMSDSL_PLATFORM_PARAM% -S %COMMSDSL_SRC_DIR% -B %COMMSDSL_BUILD_DIR% ^
101105
-DCMAKE_INSTALL_PREFIX=%COMMSDSL_INSTALL_DIR% -DCMAKE_BUILD_TYPE=%COMMON_BUILD_TYPE% ^
102106
-DCOMMSDSL_INSTALL_LIBRARY=OFF -DCOMMSDSL_BUILD_COMMSDSL2TEST=ON -DCOMMSDSL_BUILD_COMMSDSL2TOOLS_QT=ON
103107
if %errorlevel% neq 0 exit /b %errorlevel%
@@ -122,7 +126,7 @@ cd "%CC_ASN1_COMMSDSL_SRC_DIR%"
122126
echo "Building cc.asn1.commsdsl ..."
123127
mkdir "%CC_ASN1_COMMSDSL_BUILD_DIR%"
124128
cd %CC_ASN1_COMMSDSL_BUILD_DIR%
125-
cmake -G %GENERATOR% %PLATFORM_PARAM% -S %CC_ASN1_COMMSDSL_SRC_DIR% -B %CC_ASN1_COMMSDSL_BUILD_DIR% ^
129+
cmake %GENERATOR_PARAM% %PLATFORM_PARAM% -S %CC_ASN1_COMMSDSL_SRC_DIR% -B %CC_ASN1_COMMSDSL_BUILD_DIR% ^
126130
-DCMAKE_INSTALL_PREFIX=%CC_ASN1_COMMSDSL_INSTALL_DIR% -DCMAKE_BUILD_TYPE=%COMMON_BUILD_TYPE% ^
127131
-DCMAKE_CXX_STANDARD=%COMMON_CXX_STANDARD%
128132
if %errorlevel% neq 0 exit /b %errorlevel%

0 commit comments

Comments
 (0)