Skip to content

Commit 2ef4a78

Browse files
arobenkoarobenko
committed
Release v0.4
2 parents f832f06 + d989476 commit 2ef4a78

File tree

6 files changed

+48
-78
lines changed

6 files changed

+48
-78
lines changed

‎.github/workflows/actions_build.yml

Lines changed: 30 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ env:
88
CC_ASN1_COMMSDSL_BRANCH: master
99

1010
jobs:
11-
build_gcc_limited_ubuntu_18_04:
12-
runs-on: ubuntu-18.04
11+
build_gcc_old_ubuntu_20_04:
12+
runs-on: ubuntu-20.04
1313
strategy:
1414
fail-fast: false
1515
matrix:
@@ -20,58 +20,10 @@ jobs:
2020
steps:
2121
- uses: actions/checkout@v2
2222

23-
- name: Prepare Install
24-
run: sudo apt-get update --fix-missing
25-
26-
- name: Install Packages
27-
run: sudo apt install libxml2-dev gcc-${{matrix.cc_ver}} g++-${{matrix.cc_ver}} gcc-8 g++-8
28-
29-
- name: Create Build Environment
30-
run: cmake -E make_directory ${{runner.workspace}}/build
31-
32-
- name: Prepare externals
33-
shell: bash
34-
run: $GITHUB_WORKSPACE/script/prepare_externals.sh
35-
env:
36-
BUILD_DIR: ${{runner.workspace}}/build
37-
CC: gcc-${{matrix.cc_ver}}
38-
CXX: g++-${{matrix.cc_ver}}
39-
CC_COMMSDSL: gcc-8
40-
CXX_COMMSDSL: g++-8
41-
EXTERNALS_DIR: ${{runner.workspace}}/externals
42-
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
43-
COMMON_BUILD_TYPE: ${{matrix.type}}
44-
COMMON_CXX_STANDARD: ${{matrix.cpp}}
45-
COMMS_TAG: ${{env.COMMS_BRANCH}}
46-
COMMSDSL_TAG: ${{env.COMMSDSL_BRANCH}}
47-
CC_ASN1_COMMSDSL_TAG: ${{env.CC_ASN1_COMMSDSL_BRANCH}}
48-
49-
- name: Configure CMake
50-
shell: bash
51-
working-directory: ${{runner.workspace}}/build
52-
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install -DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=gold -DCMAKE_PREFIX_PATH=${{runner.workspace}}/build/install -DCMAKE_CXX_STANDARD=${{matrix.cpp}} -DCC_X509_BUILD_APPS=ON
53-
env:
54-
CC: gcc-${{matrix.cc_ver}}
55-
CXX: g++-${{matrix.cc_ver}}
56-
57-
- name: Build Target
58-
working-directory: ${{runner.workspace}}/build
59-
shell: bash
60-
run: cmake --build . --config ${{matrix.type}}
61-
env:
62-
VERBOSE: 1
63-
64-
build_gcc_ubuntu_18_04:
65-
runs-on: ubuntu-18.04
66-
strategy:
67-
fail-fast: false
68-
matrix:
69-
type: [Debug, Release, MinSizeRel]
70-
cc_ver: [5, 6, 7]
71-
cpp: [11, 14]
72-
73-
steps:
74-
- uses: actions/checkout@v2
23+
- name: Add repositories
24+
run: |
25+
sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ bionic main'; \
26+
sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ bionic universe'
7527
7628
- name: Prepare Install
7729
run: sudo apt-get update --fix-missing
@@ -120,17 +72,28 @@ jobs:
12072
fail-fast: false
12173
matrix:
12274
type: [Debug, Release, MinSizeRel]
123-
cc_ver: [8]
75+
cc_ver: [5, 6, 7, 8]
12476
cpp: [11, 14, 17]
125-
77+
exclude:
78+
- cc_ver: 5
79+
cpp: 17
80+
- cc_ver: 6
81+
cpp: 17
82+
- cc_ver: 7
83+
cpp: 17
12684
steps:
12785
- uses: actions/checkout@v2
12886

87+
- name: Add repositories
88+
run: |
89+
sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ bionic main'; \
90+
sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ bionic universe'
91+
12992
- name: Prepare Install
13093
run: sudo apt-get update --fix-missing
13194

13295
- name: Install Packages
133-
run: sudo apt install libxml2-dev gcc-${{matrix.cc_ver}} g++-${{matrix.cc_ver}}
96+
run: sudo apt install libxml2-dev gcc-${{matrix.cc_ver}} g++-${{matrix.cc_ver}} gcc-8 g++-8
13497

13598
- name: Create Build Environment
13699
run: cmake -E make_directory ${{runner.workspace}}/build
@@ -142,6 +105,8 @@ jobs:
142105
BUILD_DIR: ${{runner.workspace}}/build
143106
CC: gcc-${{matrix.cc_ver}}
144107
CXX: g++-${{matrix.cc_ver}}
108+
CC_COMMSDSL: gcc-8
109+
CXX_COMMSDSL: g++-8
145110
EXTERNALS_DIR: ${{runner.workspace}}/externals
146111
COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
147112
COMMON_BUILD_TYPE: ${{matrix.type}}
@@ -218,9 +183,9 @@ jobs:
218183
run: cmake --build . --config ${{matrix.type}}
219184
env:
220185
VERBOSE: 1
221-
222-
build_clang_ubuntu_18_04:
223-
runs-on: ubuntu-18.04
186+
187+
build_clang_old_ubuntu_20_04:
188+
runs-on: ubuntu-20.04
224189
strategy:
225190
fail-fast: false
226191
matrix:
@@ -235,6 +200,11 @@ jobs:
235200
steps:
236201
- uses: actions/checkout@v2
237202

203+
- name: Add repositories
204+
run: |
205+
sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ bionic main'; \
206+
sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ bionic universe'
207+
238208
- name: Prepare Install
239209
run: sudo apt-get update --fix-missing
240210

‎CMakeLists.txt

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,11 @@ option (CC_X509_BUILD_EMSCRIPTEN "Build and install project generated by the com
3131

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

34-
if (NOT CC_X509_DEF_OUTPUT_DIR)
35-
set (CC_X509_DEF_OUTPUT_DIR "${PROJECT_BINARY_DIR}/output")
36-
endif ()
37-
38-
if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
39-
set (CMAKE_BUILD_TYPE "None")
40-
endif ()
34+
set (VERSION "0.4")
4135

42-
set (VERSION "0.3")
36+
set(CMAKE_CXX_STANDARD 11 CACHE STRING "The C++ standard to use")
37+
set(CMAKE_BUILD_TYPE None CACHE STRING "The build type to use")
38+
set(CC_X509_DEF_OUTPUT_DIR "${PROJECT_BINARY_DIR}/output" CACHE STRING "Protocol definition output directory")
4339

4440
################################################
4541

@@ -85,4 +81,4 @@ set (CC_X509_SCHEMA_FILES
8581
add_subdirectory (cc_x509)
8682
add_subdirectory (app)
8783
add_subdirectory (swig)
88-
add_subdirectory (emscripten)
84+
add_subdirectory (emscripten)

‎app/cc_x509_input_test/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,10 @@ add_custom_target(${build_tgt} ALL
4343
${CMAKE_COMMAND}
4444
${output_dir}
4545
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
46-
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
46+
-DCMAKE_GENERATOR=${CMAKE_GENERATOR} -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
47+
-DCMAKE_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
4748
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
48-
-DCMAKE_CXX_STANDARD=${COMMSDSL_TESTS_CXX_STANDARD}
49+
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
4950
-DCMAKE_INSTALL_PREFIX=${install_dir}
5051
-DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH}"
5152
COMMAND

‎cc_x509/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,13 @@ ExternalProject_Add(
7171
SOURCE_DIR ${output_dir}
7272
BINARY_DIR ${build_dir}
7373
INSTALL_DIR ${install_dir}
74-
CMAKE_GENERATOR ${CMAKE_GENERATOR}
7574
CMAKE_ARGS
7675
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
77-
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
76+
-DCMAKE_GENERATOR=${CMAKE_GENERATOR} -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
77+
-DCMAKE_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
7878
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
7979
-DCMAKE_INSTALL_PREFIX=${install_dir}
80+
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
8081
-DOPT_REQUIRE_COMMS_LIB=OFF
8182
)
8283

‎emscripten/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ add_custom_target("emscripten_output_tgt" ALL
2626
COMMAND ${CMAKE_COMMAND}
2727
-DGENERATED="${emscripten_tmp_dir}" -DOUTPUT="${CC_X509_EMSCRIPTEN_OUTPUT_DIR}"
2828
-P "${PROJECT_SOURCE_DIR}/cmake/CopyGenerated.cmake"
29-
DEPENDS ${emscripten_tmp_dir} ${readme_file} "${PROJECT_SOURCE_DIR}/cmake/CopyGenerated.cmake" ${CC_X509_SCHEMA_FILES})
29+
DEPENDS ${emscripten_tmp_dir} "${PROJECT_SOURCE_DIR}/cmake/CopyGenerated.cmake" ${CC_X509_SCHEMA_FILES})
3030

3131
if (CC_X509_BUILD_EMSCRIPTEN)
3232
execute_process(
@@ -51,11 +51,12 @@ if (CC_X509_BUILD_EMSCRIPTEN)
5151
SOURCE_DIR ${CC_X509_EMSCRIPTEN_OUTPUT_DIR}
5252
BINARY_DIR ${emscripten_build_dir}
5353
CMAKE_COMMAND ${EMCMAKE_EXECUTABLE} ${CMAKE_COMMAND}
54-
CMAKE_GENERATOR ${CMAKE_GENERATOR}
5554
LIST_SEPARATOR |
5655
CMAKE_ARGS
56+
-DCMAKE_GENERATOR=${CMAKE_GENERATOR} -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
5757
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
5858
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
59+
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
5960
-DOPT_MODULARIZE=ON
6061
-DOPT_EXTRA_INCLUDE_DIRS=${extra_includes_path_str}
6162
)

‎swig/CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ add_custom_target("swig_output_tgt" ALL
3333
COMMAND ${CMAKE_COMMAND}
3434
-DGENERATED="${swig_tmp_dir}" -DOUTPUT="${CC_X509_SWIG_OUTPUT_DIR}"
3535
-P "${PROJECT_SOURCE_DIR}/cmake/CopyGenerated.cmake"
36-
DEPENDS ${swig_tmp_dir} ${readme_file} "${PROJECT_SOURCE_DIR}/cmake/CopyGenerated.cmake" ${CC_X509_SCHEMA_FILES})
36+
DEPENDS ${swig_tmp_dir} "${PROJECT_SOURCE_DIR}/cmake/CopyGenerated.cmake" ${CC_X509_SCHEMA_FILES})
3737

3838
if (CC_X509_BUILD_SWIG)
3939

@@ -54,14 +54,15 @@ if (CC_X509_BUILD_SWIG)
5454
DEPENDS ${X509_BUILD_TGT} "swig_output_tgt"
5555
SOURCE_DIR ${CC_X509_SWIG_OUTPUT_DIR}
5656
BINARY_DIR ${swig_build_dir}
57-
CMAKE_GENERATOR ${CMAKE_GENERATOR}
5857
LIST_SEPARATOR |
5958
CMAKE_ARGS
6059
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
61-
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
60+
-DCMAKE_GENERATOR=${CMAKE_GENERATOR} -DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}
61+
-DCMAKE_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
6262
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}
6363
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
6464
-DCMAKE_PREFIX_PATH=${combined_prefix_path_str}
65+
-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
6566
-DOPT_SWIG_LANGUAGES=${combined_languages_str}
6667
INSTALL_COMMAND
6768
${CMAKE_COMMAND} -E echo "Skipping install"

0 commit comments

Comments
 (0)