Skip to content

Commit 47dd721

Browse files
arobenkoarobenko
committed
Release 1.0.1
2 parents a370eab + c25cffc commit 47dd721

File tree

5 files changed

+146
-12
lines changed

5 files changed

+146
-12
lines changed

‎.github/workflows/actions_build.yml

Lines changed: 121 additions & 3 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_TAG: v5.2.5
7-
COMMSDSL_TAG: v6.3.3
8-
CC_ASN1_COMMSDSL_TAG: v0.3
6+
COMMS_TAG: v5.2.7
7+
COMMSDSL_TAG: v6.3.4
8+
CC_ASN1_COMMSDSL_TAG: v0.3.1
99

1010
jobs:
1111
build_gcc_old_ubuntu_20_04:
@@ -183,6 +183,65 @@ jobs:
183183
run: cmake --build . --config ${{matrix.type}}
184184
env:
185185
VERBOSE: 1
186+
187+
build_gcc_ubuntu_24_04:
188+
runs-on: ubuntu-24.04
189+
strategy:
190+
fail-fast: false
191+
matrix:
192+
type: [Debug, Release, MinSizeRel]
193+
cc_ver: [13, 14]
194+
cpp: [11, 14, 17, 20, 23]
195+
exclude:
196+
- cc_ver: 13
197+
cpp: 23
198+
199+
steps:
200+
- uses: actions/checkout@v4
201+
202+
- name: Prepare Install
203+
run: sudo apt-get update --fix-missing
204+
205+
- name: Install Packages
206+
run: |
207+
sudo apt install libxml2-dev gcc-${{matrix.cc_ver}} g++-${{matrix.cc_ver}} python3 libpython3-dev \
208+
swig default-jdk default-jre emscripten doxygen
209+
210+
- name: Create Build Environment
211+
run: cmake -E make_directory ${{runner.workspace}}/build
212+
213+
- name: Prepare externals
214+
shell: bash
215+
run: $GITHUB_WORKSPACE/script/prepare_externals.sh
216+
env:
217+
BUILD_DIR: ${{runner.workspace}}/build
218+
CC: gcc-${{matrix.cc_ver}}
219+
CXX: g++-${{matrix.cc_ver}}
220+
EXTERNALS_DIR: ${{runner.workspace}}/externals
221+
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
222+
COMMON_BUILD_TYPE: ${{matrix.type}}
223+
COMMON_CXX_STANDARD: ${{matrix.cpp}}
224+
COMMS_TAG: ${{env.COMMS_TAG}}
225+
COMMSDSL_TAG: ${{env.COMMSDSL_TAG}}
226+
CC_ASN1_COMMSDSL_TAG: ${{env.CC_ASN1_COMMSDSL_TAG}}
227+
228+
- name: Configure CMake
229+
shell: bash
230+
working-directory: ${{runner.workspace}}/build
231+
run: |
232+
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
233+
-DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DCC_X509_BUILD_APPS=ON \
234+
-DCC_X509_GEN_SWIG=ON -DCC_X509_GEN_EMSCRIPTEN=ON -DCC_X509_BUILD_DOC=ON
235+
env:
236+
CC: gcc-${{matrix.cc_ver}}
237+
CXX: g++-${{matrix.cc_ver}}
238+
239+
- name: Build Target
240+
working-directory: ${{runner.workspace}}/build
241+
shell: bash
242+
run: cmake --build . --config ${{matrix.type}}
243+
env:
244+
VERBOSE: 1
186245

187246
build_clang_old_ubuntu_20_04:
188247
runs-on: ubuntu-20.04
@@ -357,6 +416,65 @@ jobs:
357416
env:
358417
VERBOSE: 1
359418

419+
build_clang_ubuntu_24_04:
420+
runs-on: ubuntu-24.04
421+
strategy:
422+
fail-fast: false
423+
matrix:
424+
type: [Debug, Release, MinSizeRel]
425+
cc_ver: [16, 17, 18]
426+
cpp: [11, 14, 17, 20, 23]
427+
exclude:
428+
- cc_ver: 16
429+
cpp: 23
430+
- cc_ver: 17
431+
cpp: 23
432+
433+
steps:
434+
- uses: actions/checkout@v4
435+
436+
- name: Prepare Install
437+
run: sudo apt-get update --fix-missing
438+
439+
- name: Install Packages
440+
run: sudo apt install libxml2-dev clang-${{matrix.cc_ver}} python3 libpython3-dev swig default-jdk default-jre emscripten
441+
442+
- name: Create Build Environment
443+
run: cmake -E make_directory ${{runner.workspace}}/build
444+
445+
- name: Prepare externals
446+
shell: bash
447+
run: $GITHUB_WORKSPACE/script/prepare_externals.sh
448+
env:
449+
BUILD_DIR: ${{runner.workspace}}/build
450+
CC: clang-${{matrix.cc_ver}}
451+
CXX: clang++-${{matrix.cc_ver}}
452+
EXTERNALS_DIR: ${{runner.workspace}}/externals
453+
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
454+
COMMON_BUILD_TYPE: ${{matrix.type}}
455+
COMMON_CXX_STANDARD: ${{matrix.cpp}}
456+
COMMS_TAG: ${{env.COMMS_TAG}}
457+
COMMSDSL_TAG: ${{env.COMMSDSL_TAG}}
458+
CC_ASN1_COMMSDSL_TAG: ${{env.CC_ASN1_COMMSDSL_TAG}}
459+
460+
- name: Configure CMake
461+
shell: bash
462+
working-directory: ${{runner.workspace}}/build
463+
run: |
464+
cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install \
465+
-DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCMAKE_CXX_STANDARD=${{matrix.cpp}} \
466+
-DCC_X509_BUILD_APPS=ON -DCC_X509_GEN_SWIG=ON -DCC_X509_GEN_EMSCRIPTEN=ON
467+
env:
468+
CC: clang-${{matrix.cc_ver}}
469+
CXX: clang++-${{matrix.cc_ver}}
470+
471+
- name: Build Target
472+
working-directory: ${{runner.workspace}}/build
473+
shell: bash
474+
run: cmake --build . --config ${{matrix.type}}
475+
env:
476+
VERBOSE: 1
477+
360478
build_msvc_2019:
361479
runs-on: windows-2019
362480
strategy:

‎CMakeLists.txt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,17 @@ option (CC_X509_BUILD_EMSCRIPTEN "Build and install project generated by the com
3232

3333
################################################
3434

35-
set (CC_X509_VERSION "1.0")
36-
set (CC_X509_MIN_COMMSDSL_VERSION "6.3.3")
35+
set (CC_X509_VERSION "1.0.1")
36+
set (CC_X509_MIN_COMMSDSL_VERSION "6.3.4")
37+
38+
if ("${CMAKE_CXX_STANDARD}" STREQUAL "")
39+
set(CMAKE_CXX_STANDARD 17)
40+
endif ()
41+
42+
if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
43+
set(CMAKE_BUILD_TYPE None)
44+
endif ()
3745

38-
set(CMAKE_CXX_STANDARD 11 CACHE STRING "The C++ standard to use")
39-
set(CMAKE_BUILD_TYPE None CACHE STRING "The build type to use")
4046
set(CC_X509_DEF_OUTPUT_DIR "${PROJECT_BINARY_DIR}/output" CACHE STRING "Protocol definition output directory")
4147

4248
################################################

‎cc_x509/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,4 @@ if (CC_X509_BUILD_DOC)
8989
DEPENDERS "install"
9090
)
9191

92-
endif ()
92+
endif ()

‎script/full_debug_build_clang.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
#!/bin/bash
22

3-
export CC=clang
4-
export CXX=clang++
3+
if [ -z "${CC}" ]; then
4+
export CC=clang
5+
fi
6+
7+
if [ -z "${CXX}" ]; then
8+
export CXX=clang++
9+
fi
510

611
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
712
${SCRIPT_DIR}/full_debug_build.sh "$@"

‎script/full_debug_build_gcc.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
#!/bin/bash
22

3-
export CC=gcc
4-
export CXX=g++
3+
if [ -z "${CC}" ]; then
4+
export CC=gcc
5+
fi
6+
7+
if [ -z "${CXX}" ]; then
8+
export CXX=g++
9+
fi
510

611
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
712
${SCRIPT_DIR}/full_debug_build.sh "$@"

0 commit comments

Comments
 (0)