Skip to content

Commit 2f5b137

Browse files
ygj6ygj6
committed
remove C part in source code
1 parent 328be0b commit 2f5b137

Some content is hidden

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

44 files changed

+548
-1546
lines changed

‎.github/workflows/coverage.yml‎

Lines changed: 3 additions & 3 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+
- cpp_master
99
tags:
1010
- '*'
1111

@@ -26,7 +26,7 @@ jobs:
2626
uses: actions/cache@v1
2727
with:
2828
path: usr
29-
key: ${{ runner.os }}-boost-20200107
29+
key: ${{ runner.os }}-boost-20200401
3030
- name: Build boost
3131
if: steps.cache-boost.outputs.cache-hit != 'true'
3232
run: ./.github/depends/boost.sh -b both -t gcc
@@ -48,7 +48,7 @@ jobs:
4848
cd ..
4949
5050
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 ..
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_CHAR_SIGN=signed -DMSGPACK_USE_X3_PARSE=ON -DMSGPACK_BUILD_EXAMPLES=ON -DMSGPACK_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Debug -DMSGPACK_GEN_COVERAGE=ON ..
5252
make -j4
5353
make test
5454
- name: Upload coverage to Codecov

‎.github/workflows/gha.yml‎

Lines changed: 13 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ on:
55
types: [opened, synchronize]
66
push:
77
branches:
8-
- master
8+
- cpp_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:
@@ -28,7 +29,6 @@ jobs:
2829
run: ./.github/depends/boost.sh -b 64 -t clang
2930
- name: build and test
3031
env:
31-
CC: clang
3232
CXX: clang++
3333
shell: bash
3434
run: |
@@ -39,32 +39,26 @@ jobs:
3939
ACTION="ci/build_cmake.sh"
4040
export CXX17="ON"
4141
export ARCH="64"
42-
export BOOST="ON"
43-
SHARED="ON"
4442
export CHAR_SIGN="unsigned"
4543
export API_VERSION="1"
4644
fi
4745
if [ ${{ matrix.pattern }} == 1 ]; then
4846
ACTION="ci/build_cmake.sh"
4947
export CXX17="ON"
5048
export ARCH="64"
51-
export BOOST="ON"
52-
export SHARED="ON"
5349
export CHAR_SIGN="signed"
5450
export API_VERSION="3"
5551
fi
5652
if [ ${{ matrix.pattern }} == 2 ]; then
5753
ACTION="ci/build_cmake.sh"
5854
export CXX17="ON"
5955
export ARCH="64"
60-
export SHARED="ON"
6156
export CHAR_SIGN="signed"
6257
export API_VERSION="2"
6358
fi
6459
if [ ${{ matrix.pattern }} == 3 ]; then
6560
ACTION="ci/build_cmake.sh"
6661
export ARCH="64"
67-
export SHARED="ON"
6862
export CHAR_SIGN="unsigned"
6963
export API_VERSION="2"
7064
fi
@@ -84,17 +78,18 @@ jobs:
8478
cd ..
8579
8680
# 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}
81+
CMAKE_CXX_COMPILER="${CXX}" CMAKE_LIBRARY_PATH="${BASE}/usr/lib:${BASE}/build" GTEST_ROOT="${BASE}/usr" CMAKE_PREFIX_PATH="${BASE}/usr/clang/lib${ARCH}/cmake" CXXFLAGS="-Werror -g" ${ACTION}
8882
cat Files.cmake| grep ".*\.[h|hpp]" | perl -pe 's/ //g' | sort > tmp1 && find include -name "*.h" -o -name "*.hpp" | sort > tmp2 && diff tmp1 tmp2
8983
9084
linux:
9185
runs-on: ubuntu-18.04
9286
strategy:
87+
fail-fast: false
9388
matrix:
94-
pattern: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
89+
pattern: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
9590
steps:
9691
- uses: actions/checkout@v1
97-
- name: install depends
92+
- name: install build depends
9893
run: |
9994
sudo apt-get update
10095
sudo apt-get install g++-multilib clang-8 valgrind
@@ -114,99 +109,75 @@ jobs:
114109
115110
# matrix config
116111
if [ ${{ matrix.pattern }} == 0 ]; then
117-
export CC=clang
118112
export CXX=clang++
119113
ACTION="ci/build_cmake.sh"
120114
export ARCH="64"
121-
export BOOST="ON"
122-
export SHARED="ON"
123115
export CHAR_SIGN="unsigned"
124116
export API_VERSION="2"
125117
fi
126118
if [ ${{ matrix.pattern }} == 1 ]; then
127-
export CC=clang
128119
export CXX=clang++
129120
ACTION="ci/build_cmake.sh"
130121
export ARCH="32"
131-
export SHARED="ON"
132122
export CHAR_SIGN="signed"
133123
export API_VERSION="2"
134124
fi
135125
if [ ${{ matrix.pattern }} == 2 ]; then
136-
export CC=clang
137126
export CXX=clang++
138127
ACTION="ci/build_cmake.sh"
139128
export CXX17="ON"
140129
export ARCH="64"
141-
export BOOST="ON"
142-
export SHARED="ON"
143130
export CHAR_SIGN="signed"
144131
export API_VERSION="3"
145132
export X3_PARSE="ON"
146133
fi
147134
if [ ${{ matrix.pattern }} == 3 ]; then
148-
export CC=clang
149135
export CXX=clang++
150136
ACTION="ci/build_cmake.sh"
151137
export CXX17="ON"
152138
export ARCH="32"
153-
export SHARED="OFF"
154139
export CHAR_SIGN="unsigned"
155140
export API_VERSION="2"
156141
fi
157142
if [ ${{ matrix.pattern }} == 4 ]; then
158-
export CC=gcc
159143
export CXX=g++
160144
ACTION="ci/build_cmake.sh"
161145
export CXX17="ON"
162146
export ARCH="64"
163-
export SHARED="ON"
164147
export CHAR_SIGN="signed"
165148
export API_VERSION="2"
166149
fi
167150
if [ ${{ matrix.pattern }} == 5 ]; then
168-
export CC=gcc
169151
export CXX=g++
170152
ACTION="ci/build_cmake.sh"
171153
export CXX17="ON"
172154
export ARCH="32"
173-
export BOOST="ON"
174-
export SHARED="ON"
175155
export CHAR_SIGN="unsigned"
176156
export API_VERSION="3"
177157
export X3_PARSE="ON"
178158
fi
179159
if [ ${{ matrix.pattern }} == 6 ]; then
180-
export CC=gcc
181160
export CXX=g++
182161
ACTION="ci/build_cmake.sh"
183162
export ARCH="64"
184-
export SHARED="ON"
185163
export CHAR_SIGN="unsigned"
186164
export API_VERSION="2"
187165
fi
188166
if [ ${{ matrix.pattern }} == 7 ]; then
189-
export CC=gcc
190167
export CXX=g++
191168
ACTION="ci/build_cmake.sh"
192169
export ARCH="32"
193-
export BOOST="ON"
194-
export SHARED="OFF"
195170
export CHAR_SIGN="signed"
196171
export API_VERSION="1"
197172
fi
198173
if [ ${{ matrix.pattern }} == 8 ]; then
199-
export CC=gcc
200174
export CXX=g++
201175
ACTION="ci/build_cmake.sh"
202176
export ARCH="32"
203-
export BOOST="ON"
204-
export SHARED="OFF"
205177
export CHAR_SIGN="signed"
206178
export API_VERSION="2"
207179
fi
208180
if [ ${{ matrix.pattern }} == 9 ]; then
209-
export CC=clang
210181
export CXX=clang++
211182
ACTION="ci/build_regression.sh"
212183
export ARCH="64"
@@ -215,20 +186,13 @@ jobs:
215186
export CTEST_OUTPUT_ON_FAILURE=1
216187
fi
217188
if [ ${{ matrix.pattern }} == 10 ]; then
218-
export CC=clang
219189
export CXX=clang++
220190
ACTION="ci/build_regression.sh"
221191
export ARCH="64"
222192
export SAN="ASAN"
223193
export MSGPACK_FUZZ_REGRESSION="ON"
224194
export CTEST_OUTPUT_ON_FAILURE=1
225195
fi
226-
if [ ${{ matrix.pattern }} == 11 ]; then
227-
export CC=gcc
228-
export CXX=g++
229-
ACTION="ci/build_cmake_embedded.sh"
230-
export ARCH="64"
231-
fi
232196
233197
# install gtest
234198
wget https://github.com/google/googletest/archive/release-1.7.0.zip -O googletest-release-1.7.0.zip
@@ -250,13 +214,14 @@ jobs:
250214
fi
251215
252216
# 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}
217+
CMAKE_CXX_COMPILER="${CXX}" CMAKE_LIBRARY_PATH="${BASE}/usr/lib:${BASE}/build" GTEST_ROOT="${BASE}/usr" CMAKE_PREFIX_PATH="${BASE}/usr/gcc/lib${ARCH}/cmake" CXXFLAGS="-Werror -g" MSGPACK_SAN="${SAN}" ${ACTION}
254218
cat Files.cmake| grep ".*\.[h|hpp]" | perl -pe 's/ //g' | sort > tmp1 && find include -name "*.h" -o -name "*.hpp" | sort > tmp2 && diff tmp1 tmp2
255219
windows:
256220
runs-on: windows-2016
257221
strategy:
222+
fail-fast: false
258223
matrix:
259-
pattern: [0, 1, 2, 3]
224+
pattern: [0, 1, 2]
260225
steps:
261226
- uses: actions/checkout@v1
262227
- name: Cache vcpkg
@@ -275,26 +240,19 @@ jobs:
275240
shell: powershell
276241
run: |
277242
if (${{ matrix.pattern }} -eq 0) {
278-
$CPP11="-DMSGPACK_CXX11=OFF"
279-
$BOOST="-DMSGPACK_BOOST=OFF"
243+
$CPPVER="-DMSGPACK_CXX17=ON"
280244
}
281245
if (${{ matrix.pattern }} -eq 1) {
282-
$CPP11="-DMSGPACK_CXX11=OFF"
283-
$BOOST="-DMSGPACK_BOOST=ON"
246+
$CPPVER="-DMSGPACK_CXX11=ON"
284247
}
285248
if (${{ matrix.pattern }} -eq 2) {
286-
$CPP11="-DMSGPACK_CXX11=ON"
287-
$BOOST="-DMSGPACK_BOOST=OFF"
288-
}
289-
if (${{ matrix.pattern }} -eq 3) {
290-
$CPP11="-DMSGPACK_CXX11=ON"
291-
$BOOST="-DMSGPACK_BOOST=ON"
249+
$CPPVER="-DMSGPACK_CXX11=OFF"
292250
}
293251
294252
$CUR=(Get-Location).Path
295253
md build
296254
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" ..
255+
cmake -A x64 -DBOOST_ROOT="$env:BOOST_ROOT_1_72_0" -DCMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake" $CPPVER "-DCMAKE_CXX_FLAGS=/D_VARIADIC_MAX=10 /EHsc /D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" ..
298256
if ($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) }
299257
cmake --build . --config Release
300258
$pathbak="$env:PATH"

0 commit comments

Comments
 (0)