Skip to content

Commit b628da7

Browse files
committed
Release v0.5
2 parents 2ef4a78 + a515055 commit b628da7

File tree

9 files changed

+402
-8
lines changed

9 files changed

+402
-8
lines changed

.appveyor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ configuration:
1919
- Release
2020

2121
environment:
22-
COMMS_BRANCH: master
23-
COMMSDSL_BRANCH: master
24-
CC_ASN1_COMMSDSL_BRANCH: master
22+
COMMS_BRANCH: v5.2
23+
COMMSDSL_BRANCH: v6.1
24+
CC_ASN1_COMMSDSL_BRANCH: v0.1
2525
matrix:
2626
- CPP_STD: 11
2727
- CPP_STD: 14

.github/workflows/actions_build.yml

Lines changed: 3 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_BRANCH: master
7-
COMMSDSL_BRANCH: master
8-
CC_ASN1_COMMSDSL_BRANCH: master
6+
COMMS_BRANCH: v5.2
7+
COMMSDSL_BRANCH: v6.1
8+
CC_ASN1_COMMSDSL_BRANCH: v0.1
99

1010
jobs:
1111
build_gcc_old_ubuntu_20_04:

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ option (CC_X509_BUILD_EMSCRIPTEN "Build and install project generated by the com
3131

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

34-
set (VERSION "0.4")
34+
set (CC_X509_VERSION "0.5")
35+
set (CC_X509_MIN_COMMSDSL_VERSION "6.1")
3536

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

app/cc_x509_input_test/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
find_program(COMMSDSL2TEST_EXE "commsdsl2test" PATH_SUFFIXES bin REQUIRED)
22

3+
execute_process(COMMAND "${COMMSDSL2TEST_EXE}" --version OUTPUT_VARIABLE commsdsl2test_version)
4+
if ("${commsdsl2test_version}" VERSION_LESS "${CC_X509_MIN_COMMSDSL_VERSION}")
5+
message (FATAL_ERROR "Version of commsdsl2test is too old, required minimum is v${CC_X509_MIN_COMMSDSL_VERSION}.")
6+
endif ()
7+
38
set (name "cc_x509_input_test")
49
set (output_dir ${CMAKE_CURRENT_BINARY_DIR}/output)
510
set (tmp_output_dir ${output_dir}.tmp)

cc_x509/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
find_program(COMMSDSL2COMMS_EXE "commsdsl2comms" PATH_SUFFIXES bin REQUIRED)
2+
execute_process(COMMAND "${COMMSDSL2COMMS_EXE}" --version OUTPUT_VARIABLE commsdsl2comms_version)
3+
if ("${commsdsl2comms_version}" VERSION_LESS "${CC_X509_MIN_COMMSDSL_VERSION}")
4+
message (FATAL_ERROR "Version of commsdsl2comms is too old, required minimum is v${CC_X509_MIN_COMMSDSL_VERSION}.")
5+
endif ()
26

37
set (name ${PROJECT_NAME})
48
set (output_dir ${CMAKE_CURRENT_BINARY_DIR}/output)
@@ -30,7 +34,7 @@ add_custom_target(${rm_tmp_tgt}
3034
add_custom_command(
3135
OUTPUT ${tmp_output_dir}
3236
DEPENDS ${CC_X509_SCHEMA_FILES} ${rm_tmp_tgt}
33-
COMMAND ${COMMSDSL2COMMS_EXE} -d -s -V ${VERSION} --warn-as-err -o ${tmp_output_dir} ${code_input_param} ${CC_X509_COMMSDSL2COMMS_EXTRA_ARGS} ${CC_X509_SCHEMA_FILES}
37+
COMMAND ${COMMSDSL2COMMS_EXE} -d -s -V ${CC_X509_VERSION} --warn-as-err -o ${tmp_output_dir} ${code_input_param} ${CC_X509_COMMSDSL2COMMS_EXTRA_ARGS} ${CC_X509_SCHEMA_FILES}
3438
)
3539

3640
set (readme_src_file "${CMAKE_CURRENT_SOURCE_DIR}/readme.generated")

0 commit comments

Comments
 (0)