Skip to content

Commit ea14357

Browse files
redboltzredboltz
authored
Merge pull request #877 from ygj6/c_master
remove C++ library in c_master branch
2 parents 6e7deb8 + 9eba7c4 commit ea14357

File tree

842 files changed

+223
-115149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

842 files changed

+223
-115149
lines changed

‎.github/depends/boost.sh‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎.github/workflows/coverage.yml‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
types: [opened, synchronize]
66
push:
77
branches:
8-
- master
8+
- c_master
99
tags:
1010
- '*'
1111

@@ -21,15 +21,6 @@ jobs:
2121
run: |
2222
sudo apt-get update
2323
sudo apt-get install g++-multilib lcov
24-
- name: Cache boost
25-
id: cache-boost
26-
uses: actions/cache@v1
27-
with:
28-
path: usr
29-
key: ${{ runner.os }}-boost-20200107
30-
- name: Build boost
31-
if: steps.cache-boost.outputs.cache-hit != 'true'
32-
run: ./.github/depends/boost.sh -b both -t gcc
3324
- name: Compile tests
3425
run: |
3526
# install gtest
@@ -48,7 +39,7 @@ jobs:
4839
cd ..
4940
5041
mkdir build && cd build
51-
CMAKE_LIBRARY_PATH="${BASE}/build" GTEST_ROOT="${BASE}/usr" CMAKE_PREFIX_PATH="${BASE}/usr/gcc/lib64/cmake" cmake -DMSGPACK_CXX17=ON -DMSGPACK_32BIT=OFF -DMSGPACK_BOOST=ON -DBUILD_SHARED_LIBS=ON -DMSGPACK_CHAR_SIGN=signed -DMSGPACK_USE_X3_PARSE=ON -DMSGPACK_ENABLE_CXX=ON -DMSGPACK_BUILD_EXAMPLES=ON -DMSGPACK_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Debug -DMSGPACK_GEN_COVERAGE=ON ..
42+
CMAKE_LIBRARY_PATH="${BASE}/build" GTEST_ROOT="${BASE}/usr" CMAKE_PREFIX_PATH="${BASE}/usr/gcc/lib64/cmake" cmake -DMSGPACK_32BIT=OFF -DBUILD_SHARED_LIBS=ON -DMSGPACK_CHAR_SIGN=signed -DMSGPACK_BUILD_EXAMPLES=ON -DMSGPACK_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Debug -DMSGPACK_GEN_COVERAGE=ON ..
5243
make -j4
5344
make test
5445
- name: Upload coverage to Codecov

‎.github/workflows/gha.yml‎

Lines changed: 33 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,19 @@ on:
55
types: [opened, synchronize]
66
push:
77
branches:
8-
- master
8+
- c_master
99
tags:
1010
- '*'
1111

1212
jobs:
1313
macos:
1414
runs-on: macos-latest
1515
strategy:
16+
fail-fast: false
1617
matrix:
1718
pattern: [0, 1, 2, 3]
1819
steps:
1920
- uses: actions/checkout@v1
20-
- name: Cache boost
21-
id: cache-boost
22-
uses: actions/cache@v1
23-
with:
24-
path: usr
25-
key: ${{ runner.os }}-boost-20200107
26-
- name: Build boost
27-
if: steps.cache-boost.outputs.cache-hit != 'true'
28-
run: ./.github/depends/boost.sh -b 64 -t clang
2921
- name: build and test
3022
env:
3123
CC: clang
@@ -35,38 +27,23 @@ jobs:
3527
BASE=`pwd`;
3628
3729
# matrix config
30+
ACTION="ci/build_cmake.sh"
31+
export ARCH="64"
3832
if [ ${{ matrix.pattern }} == 0 ]; then
39-
ACTION="ci/build_cmake.sh"
40-
export CXX17="ON"
41-
export ARCH="64"
42-
export BOOST="ON"
43-
SHARED="ON"
33+
export SHARED="ON"
4434
export CHAR_SIGN="unsigned"
45-
export API_VERSION="1"
4635
fi
4736
if [ ${{ matrix.pattern }} == 1 ]; then
48-
ACTION="ci/build_cmake.sh"
49-
export CXX17="ON"
50-
export ARCH="64"
51-
export BOOST="ON"
5237
export SHARED="ON"
5338
export CHAR_SIGN="signed"
54-
export API_VERSION="3"
5539
fi
5640
if [ ${{ matrix.pattern }} == 2 ]; then
57-
ACTION="ci/build_cmake.sh"
58-
export CXX17="ON"
59-
export ARCH="64"
60-
export SHARED="ON"
41+
export SHARED="OFF"
6142
export CHAR_SIGN="signed"
62-
export API_VERSION="2"
6343
fi
6444
if [ ${{ matrix.pattern }} == 3 ]; then
65-
ACTION="ci/build_cmake.sh"
66-
export ARCH="64"
67-
export SHARED="ON"
45+
export SHARED="OFF"
6846
export CHAR_SIGN="unsigned"
69-
export API_VERSION="2"
7047
fi
7148
7249
# install gtest
@@ -84,29 +61,20 @@ jobs:
8461
cd ..
8562
8663
# build and test
87-
CMAKE_CXX_COMPILER="${CXX}" CMAKE_C_COMPILER="${CC}" CMAKE_LIBRARY_PATH="${BASE}/usr/lib:${BASE}/build" GTEST_ROOT="${BASE}/usr" CMAKE_PREFIX_PATH="${BASE}/usr/clang/lib${ARCH}/cmake" CFLAGS="-Werror -g" CXXFLAGS="-Werror -g" ${ACTION}
88-
cat Files.cmake| grep ".*\.[h|hpp]" | perl -pe 's/ //g' | sort > tmp1 && find include -name "*.h" -o -name "*.hpp" | sort > tmp2 && diff tmp1 tmp2
64+
CMAKE_CXX_COMPILER="${CXX}" CMAKE_C_COMPILER="${CC}" GTEST_ROOT="${BASE}/usr" CFLAGS="-Werror -g" CXXFLAGS="-Werror -g" ${ACTION}
8965
9066
linux:
9167
runs-on: ubuntu-18.04
9268
strategy:
69+
fail-fast: false
9370
matrix:
94-
pattern: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
71+
pattern: [0, 1, 2, 3, 4, 5, 6, 7, 8]
9572
steps:
9673
- uses: actions/checkout@v1
97-
- name: install depends
74+
- name: install build depends
9875
run: |
9976
sudo apt-get update
10077
sudo apt-get install g++-multilib clang-8 valgrind
101-
- name: Cache boost
102-
id: cache-boost
103-
uses: actions/cache@v1
104-
with:
105-
path: usr
106-
key: ${{ runner.os }}-boost-20200107
107-
- name: Build boost
108-
if: steps.cache-boost.outputs.cache-hit != 'true'
109-
run: ./.github/depends/boost.sh -b both -t gcc
11078
- name: build and test
11179
shell: bash
11280
run: |
@@ -118,10 +86,8 @@ jobs:
11886
export CXX=clang++
11987
ACTION="ci/build_cmake.sh"
12088
export ARCH="64"
121-
export BOOST="ON"
12289
export SHARED="ON"
12390
export CHAR_SIGN="unsigned"
124-
export API_VERSION="2"
12591
fi
12692
if [ ${{ matrix.pattern }} == 1 ]; then
12793
export CC=clang
@@ -130,51 +96,38 @@ jobs:
13096
export ARCH="32"
13197
export SHARED="ON"
13298
export CHAR_SIGN="signed"
133-
export API_VERSION="2"
13499
fi
135100
if [ ${{ matrix.pattern }} == 2 ]; then
136101
export CC=clang
137102
export CXX=clang++
138103
ACTION="ci/build_cmake.sh"
139-
export CXX17="ON"
140104
export ARCH="64"
141-
export BOOST="ON"
142105
export SHARED="ON"
143106
export CHAR_SIGN="signed"
144-
export API_VERSION="3"
145-
export X3_PARSE="ON"
146107
fi
147108
if [ ${{ matrix.pattern }} == 3 ]; then
148109
export CC=clang
149110
export CXX=clang++
150111
ACTION="ci/build_cmake.sh"
151-
export CXX17="ON"
152112
export ARCH="32"
153113
export SHARED="OFF"
154114
export CHAR_SIGN="unsigned"
155-
export API_VERSION="2"
156115
fi
157116
if [ ${{ matrix.pattern }} == 4 ]; then
158117
export CC=gcc
159118
export CXX=g++
160119
ACTION="ci/build_cmake.sh"
161-
export CXX17="ON"
162120
export ARCH="64"
163121
export SHARED="ON"
164122
export CHAR_SIGN="signed"
165-
export API_VERSION="2"
166123
fi
167124
if [ ${{ matrix.pattern }} == 5 ]; then
168125
export CC=gcc
169126
export CXX=g++
170127
ACTION="ci/build_cmake.sh"
171-
export CXX17="ON"
172128
export ARCH="32"
173-
export BOOST="ON"
174129
export SHARED="ON"
175130
export CHAR_SIGN="unsigned"
176-
export API_VERSION="3"
177-
export X3_PARSE="ON"
178131
fi
179132
if [ ${{ matrix.pattern }} == 6 ]; then
180133
export CC=gcc
@@ -183,47 +136,16 @@ jobs:
183136
export ARCH="64"
184137
export SHARED="ON"
185138
export CHAR_SIGN="unsigned"
186-
export API_VERSION="2"
187139
fi
188140
if [ ${{ matrix.pattern }} == 7 ]; then
189141
export CC=gcc
190142
export CXX=g++
191143
ACTION="ci/build_cmake.sh"
192144
export ARCH="32"
193-
export BOOST="ON"
194145
export SHARED="OFF"
195146
export CHAR_SIGN="signed"
196-
export API_VERSION="1"
197147
fi
198148
if [ ${{ matrix.pattern }} == 8 ]; then
199-
export CC=gcc
200-
export CXX=g++
201-
ACTION="ci/build_cmake.sh"
202-
export ARCH="32"
203-
export BOOST="ON"
204-
export SHARED="OFF"
205-
export CHAR_SIGN="signed"
206-
export API_VERSION="2"
207-
fi
208-
if [ ${{ matrix.pattern }} == 9 ]; then
209-
export CC=clang
210-
export CXX=clang++
211-
ACTION="ci/build_regression.sh"
212-
export ARCH="64"
213-
export SAN="UBSAN"
214-
export MSGPACK_FUZZ_REGRESSION="ON"
215-
export CTEST_OUTPUT_ON_FAILURE=1
216-
fi
217-
if [ ${{ matrix.pattern }} == 10 ]; then
218-
export CC=clang
219-
export CXX=clang++
220-
ACTION="ci/build_regression.sh"
221-
export ARCH="64"
222-
export SAN="ASAN"
223-
export MSGPACK_FUZZ_REGRESSION="ON"
224-
export CTEST_OUTPUT_ON_FAILURE=1
225-
fi
226-
if [ ${{ matrix.pattern }} == 11 ]; then
227149
export CC=gcc
228150
export CXX=g++
229151
ACTION="ci/build_cmake_embedded.sh"
@@ -250,55 +172,54 @@ jobs:
250172
fi
251173
252174
# build and test
253-
CMAKE_CXX_COMPILER="${CXX}" CMAKE_C_COMPILER="${CC}" CMAKE_LIBRARY_PATH="${BASE}/usr/lib:${BASE}/build" GTEST_ROOT="${BASE}/usr" CMAKE_PREFIX_PATH="${BASE}/usr/gcc/lib${ARCH}/cmake" CFLAGS="-Werror -g" CXXFLAGS="-Werror -g" MSGPACK_SAN="${SAN}" ${ACTION}
254-
cat Files.cmake| grep ".*\.[h|hpp]" | perl -pe 's/ //g' | sort > tmp1 && find include -name "*.h" -o -name "*.hpp" | sort > tmp2 && diff tmp1 tmp2
175+
CMAKE_CXX_COMPILER="${CXX}" CMAKE_C_COMPILER="${CC}" GTEST_ROOT="${BASE}/usr" CFLAGS="-Werror -g" CXXFLAGS="-Werror -g" MSGPACK_SAN="${SAN}" ${ACTION}
176+
255177
windows:
256-
runs-on: windows-2016
178+
runs-on: windows-2019
257179
strategy:
180+
fail-fast: false
258181
matrix:
259182
pattern: [0, 1, 2, 3]
260183
steps:
261-
- uses: actions/checkout@v1
184+
- uses: actions/checkout@v2.0.0
262185
- name: Cache vcpkg
263186
id: cache-vcpkg
264-
uses: actions/cache@v1.0.3
187+
uses: actions/cache@v1.1.2
265188
with:
266-
path: C:/vcpkg/installed/x64-windows
267-
key: ${{ runner.os }}-vcpkg
189+
path: C:/vcpkg/installed
190+
key: windows-2019-vcpkg-v2
268191
- name: Build dependencies
269192
if: steps.cache-vcpkg.outputs.cache-hit != 'true'
270193
shell: powershell
271194
run: |
272-
vcpkg install gtest:x64-windows
273-
vcpkg install zlib:x64-windows
195+
vcpkg install gtest:x64-windows gtest:x86-windows
196+
vcpkg install zlib:x64-windows zlib:x86-windows
274197
- name: Build and test
275198
shell: powershell
276199
run: |
277200
if (${{ matrix.pattern }} -eq 0) {
278-
$CPP11="-DMSGPACK_CXX11=OFF"
279-
$BOOST="-DMSGPACK_BOOST=OFF"
201+
$ARCH="x64"
202+
$SHARED="ON"
280203
}
281-
if (${{ matrix.pattern }} -eq 1) {
282-
$CPP11="-DMSGPACK_CXX11=OFF"
283-
$BOOST="-DMSGPACK_BOOST=ON"
204+
elseif (${{ matrix.pattern }} -eq 1) {
205+
$ARCH="x64"
206+
$SHARED="OFF"
284207
}
285-
if (${{ matrix.pattern }} -eq 2) {
286-
$CPP11="-DMSGPACK_CXX11=ON"
287-
$BOOST="-DMSGPACK_BOOST=OFF"
208+
elseif (${{ matrix.pattern }} -eq 2) {
209+
$ARCH="Win32"
210+
$SHARED="ON"
288211
}
289-
if (${{ matrix.pattern }} -eq 3) {
290-
$CPP11="-DMSGPACK_CXX11=ON"
291-
$BOOST="-DMSGPACK_BOOST=ON"
212+
else {
213+
$ARCH="Win32"
214+
$SHARED="OFF"
292215
}
293216
294217
$CUR=(Get-Location).Path
295218
md build
296219
cd build
297-
cmake -A x64 -DBOOST_ROOT="$env:BOOST_ROOT_1_72_0" -DCMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake" $CPP11 $BOOST "-DCMAKE_CXX_FLAGS=/D_VARIADIC_MAX=10 /EHsc /D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" ..
298-
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
220+
cmake -A $ARCH -DBUILD_SHARED_LIBS=$SHARED -DCMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake" "-DCMAKE_CXX_FLAGS=/D_VARIADIC_MAX=10 /EHsc /D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" ..
299221
cmake --build . --config Release
300222
$pathbak="$env:PATH"
301223
$env:PATH="C:\vcpkg\installed\x64-windows\bin;$CUR\build\Release;$pathbak"
302224
ctest -V
303-
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
304225
$env:PATH=$pathbak

‎.gitmodules‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)