Skip to content

Commit ccf3684

Browse files
arobenkoarobenko
committed
Release v0.13
2 parents a297680 + 8b47caf commit ccf3684

File tree

2 files changed

+35
-107
lines changed

2 files changed

+35
-107
lines changed

‎.travis.yml‎

Lines changed: 32 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
dist: trusty
1+
dist: bionic
22
language: cpp
33
sudo: true
44
notifications:
@@ -14,259 +14,187 @@ matrix:
1414
- os: linux
1515
addons:
1616
apt:
17-
sources:
18-
- ubuntu-toolchain-r-test
1917
packages:
2018
- g++-4.8
21-
- g++-5
22-
env: _CC=gcc-4.8 _CXX=g++-4.8 _DSL_CC=gcc-5 _DSL_CXX=g++-5"
23-
- os: linux
24-
addons:
25-
apt:
26-
sources:
27-
- ubuntu-toolchain-r-test
28-
packages:
29-
- g++-4.9
30-
- g++-5
31-
env: _CC=gcc-4.9 _CXX=g++-4.9 _DSL_CC=gcc-5 _DSL_CXX=g++-5
19+
- g++-5
20+
env: _CC=gcc-4.8 _CXX=g++-4.8 _DSL_CC=gcc-5 _DSL_CXX=g++-5
3221
- os: linux
3322
addons:
3423
apt:
35-
sources:
36-
- ubuntu-toolchain-r-test
3724
packages:
3825
- g++-5
39-
env: _CC=gcc-5 _CXX=g++-5 _DSL_CC=gcc-5 _DSL_CXX=g++-5
26+
env: _CC=gcc-5 _CXX=g++-5 _DSL_CC=${_CC} _DSL_CXX=${_CXX}
4027
- os: linux
4128
addons:
4229
apt:
43-
sources:
44-
- ubuntu-toolchain-r-test
4530
packages:
4631
- g++-5
47-
env: _CC=gcc-5 _CXX=g++-5 _DSL_CC=gcc-5 _DSL_CXX=g++-5 _BUILD="-DCMAKE_CXX_STANDARD=14"
32+
env: _CC=gcc-5 _CXX=g++-5 _DSL_CC=${_CC} _DSL_CXX=${_CXX} _BUILD="-DCMAKE_CXX_STANDARD=14"
4833
- os: linux
4934
addons:
5035
apt:
51-
sources:
52-
- ubuntu-toolchain-r-test
5336
packages:
5437
- g++-6
55-
env: _CC=gcc-6 _CXX=g++-6 _DSL_CC=gcc-6 _DSL_CXX=g++-6
38+
env: _CC=gcc-6 _CXX=g++-6 _DSL_CC=${_CC} _DSL_CXX=${_CXX}
5639
- os: linux
5740
addons:
5841
apt:
59-
sources:
60-
- ubuntu-toolchain-r-test
6142
packages:
6243
- g++-6
63-
env: _CC=gcc-6 _CXX=g++-6 _DSL_CC=gcc-6 _DSL_CXX=g++-6 _BUILD="-DCMAKE_CXX_STANDARD=14"
44+
env: _CC=gcc-6 _CXX=g++-6 _DSL_CC=${_CC} _DSL_CXX=${_CXX} _BUILD="-DCMAKE_CXX_STANDARD=14"
6445
- os: linux
6546
addons:
6647
apt:
67-
sources:
68-
- ubuntu-toolchain-r-test
6948
packages:
7049
- g++-7
71-
env: _CC=gcc-7 _CXX=g++-7 _DSL_CC=gcc-7 _DSL_CXX=g++-7
50+
env: _CC=gcc-7 _CXX=g++-7 _DSL_CC=${_CC} _DSL_CXX=${_CXX}
7251
- os: linux
7352
addons:
7453
apt:
75-
sources:
76-
- ubuntu-toolchain-r-test
7754
packages:
7855
- g++-7
79-
env: _CC=gcc-7 _CXX=g++-7 _DSL_CC=gcc-7 _DSL_CXX=g++-7 _BUILD="-DCMAKE_CXX_STANDARD=14"
56+
env: _CC=gcc-7 _CXX=g++-7 _DSL_CC=${_CC} _DSL_CXX=${_CXX} _BUILD="-DCMAKE_CXX_STANDARD=14"
8057
- os: linux
8158
addons:
8259
apt:
83-
sources:
84-
- ubuntu-toolchain-r-test
8560
packages:
8661
- g++-8
87-
env: _CC=gcc-8 _CXX=g++-8 _DSL_CC=gcc-8 _DSL_CXX=g++-8
62+
env: _CC=gcc-8 _CXX=g++-8 _DSL_CC=${_CC} _DSL_CXX=${_CXX}
8863
- os: linux
8964
addons:
9065
apt:
91-
sources:
92-
- ubuntu-toolchain-r-test
9366
packages:
9467
- g++-8
95-
env: _CC=gcc-8 _CXX=g++-8 _DSL_CC=gcc-8 _DSL_CXX=g++-8 _BUILD="-DCMAKE_CXX_STANDARD=14"
68+
env: _CC=gcc-8 _CXX=g++-8 _DSL_CC=${_CC} _DSL_CXX=${_CXX} _BUILD="-DCMAKE_CXX_STANDARD=14"
9669
- os: linux
97-
addons:
98-
apt:
99-
sources:
100-
- ubuntu-toolchain-r-test
101-
- llvm-toolchain-precise-3.8
102-
packages:
103-
- clang-3.8
104-
- g++-5
105-
env: _CC=clang-3.8 _CXX=clang++-3.8 _DSL_CC=gcc-5 _DSL_CXX=g++-5
70+
env: _CC=gcc-9 _CXX=g++-9 _DSL_CC=${_CC} _DSL_CXX=${_CXX} _USE_GCC9=1
10671
- os: linux
107-
addons:
108-
apt:
109-
sources:
110-
- ubuntu-toolchain-r-test
111-
- llvm-toolchain-precise-3.8
112-
packages:
113-
- clang-3.8
114-
- g++-5
115-
env: _CC=clang-3.8 _CXX=clang++-3.8 _DSL_CC=gcc-5 _DSL_CXX=g++-5 _BUILD="-DCMAKE_CXX_STANDARD=14"
72+
env: _CC=gcc-9 _CXX=g++-9 _DSL_CC=${_CC} _DSL_CXX=${_CXX} _USE_GCC9=1 _BUILD="-DCMAKE_CXX_STANDARD=14"
11673
- os: linux
11774
addons:
11875
apt:
11976
sources:
12077
- llvm-toolchain-trusty-3.9
121-
- ubuntu-toolchain-r-test
12278
packages:
12379
- clang-3.9
124-
- g++-5
125-
env: _CC=clang-3.9 _CXX=clang++-3.9 _DSL_CC=clang-3.9 _DSL_CXX=clang++-3.9
80+
env: _CC=clang-3.9 _CXX=clang++-3.9 _DSL_CC=${_CC} _DSL_CXX=${_CXX}
12681
- os: linux
12782
addons:
12883
apt:
12984
sources:
13085
- llvm-toolchain-trusty-3.9
131-
- ubuntu-toolchain-r-test
13286
packages:
13387
- clang-3.9
134-
- g++-5
135-
env: _CC=clang-3.9 _CXX=clang++-3.9 _DSL_CC=clang-3.9 _DSL_CXX=clang++-3.9 _BUILD="-DCMAKE_CXX_STANDARD=14"
88+
env: _CC=clang-3.9 _CXX=clang++-3.9 _DSL_CC=${_CC} _DSL_CXX=${_CXX} _BUILD="-DCMAKE_CXX_STANDARD=14"
13689
- os: linux
13790
addons:
13891
apt:
13992
sources:
14093
- llvm-toolchain-trusty-4.0
141-
- ubuntu-toolchain-r-test
14294
packages:
14395
- clang-4.0
144-
- g++-5
145-
env: _CC=clang-4.0 _CXX=clang++-4.0 _DSL_CC=clang-4.0 _DSL_CXX=clang++-4.0
96+
env: _CC=clang-4.0 _CXX=clang++-4.0 _DSL_CC=${_CC} _DSL_CXX=${_CXX}
14697
- os: linux
14798
addons:
14899
apt:
149100
sources:
150101
- llvm-toolchain-trusty-4.0
151-
- ubuntu-toolchain-r-test
152102
packages:
153103
- clang-4.0
154-
- g++-5
155-
env: _CC=clang-4.0 _CXX=clang++-4.0 _DSL_CC=clang-4.0 _DSL_CXX=clang++-4.0 _BUILD="-DCMAKE_CXX_STANDARD=14"
104+
env: _CC=clang-4.0 _CXX=clang++-4.0 _DSL_CC=${_CC} _DSL_CXX=${_CXX} _BUILD="-DCMAKE_CXX_STANDARD=14"
156105
- os: linux
157106
addons:
158107
apt:
159108
sources:
160109
- llvm-toolchain-trusty-5.0
161-
- ubuntu-toolchain-r-test
162110
packages:
163111
- clang-5.0
164-
- g++-5
165-
env: _CC=clang-5.0 _CXX=clang++-5.0 _DSL_CC=clang-5.0 _DSL_CXX=clang++-5.0
112+
env: _CC=clang-5.0 _CXX=clang++-5.0 _DSL_CC=${_CC} _DSL_CXX=${_CXX}
166113
- os: linux
167114
addons:
168115
apt:
169116
sources:
170117
- llvm-toolchain-trusty-5.0
171-
- ubuntu-toolchain-r-test
172118
packages:
173119
- clang-5.0
174-
- g++-5
175-
env: _CC=clang-5.0 _CXX=clang++-5.0 _DSL_CC=clang-5.0 _DSL_CXX=clang++-5.0 _BUILD="-DCMAKE_CXX_STANDARD=14"
120+
env: _CC=clang-5.0 _CXX=clang++-5.0 _DSL_CC=${_CC} _DSL_CXX=${_CXX} _BUILD="-DCMAKE_CXX_STANDARD=14"
176121
- os: linux
177122
addons:
178123
apt:
179124
sources:
180125
- llvm-toolchain-trusty-6.0
181-
- ubuntu-toolchain-r-test
182126
packages:
183127
- clang-6.0
184-
- g++-5
185-
env: _CC=clang-6.0 _CXX=clang++-6.0 _DSL_CC=clang-6.0 _DSL_CXX=clang++-6.0
128+
env: _CC=clang-6.0 _CXX=clang++-6.0 _DSL_CC=${_CC} _DSL_CXX=${_CXX}
186129
- os: linux
187130
addons:
188131
apt:
189132
sources:
190133
- llvm-toolchain-trusty-6.0
191-
- ubuntu-toolchain-r-test
192134
packages:
193135
- clang-6.0
194-
- g++-5
195-
env: _CC=clang-6.0 _CXX=clang++-6.0 _DSL_CC=clang-6.0 _DSL_CXX=clang++-6.0 _BUILD="-DCMAKE_CXX_STANDARD=14"
136+
env: _CC=clang-6.0 _CXX=clang++-6.0 _DSL_CC=${_CC} _DSL_CXX=${_CXX} _BUILD="-DCMAKE_CXX_STANDARD=14"
196137
- os: linux
197138
addons:
198139
apt:
199140
sources:
200141
- llvm-toolchain-trusty-7
201-
- ubuntu-toolchain-r-test
202142
packages:
203143
- clang-7
204-
- g++-5
205-
env: _CC=clang-7 _CXX=clang++-7 _DSL_CC=clang-7 _DSL_CXX=clang++-7
144+
env: _CC=clang-7 _CXX=clang++-7 _DSL_CC=${_CC} _DSL_CXX=${_CXX}
206145
- os: linux
207146
addons:
208147
apt:
209148
sources:
210149
- llvm-toolchain-trusty-7
211-
- ubuntu-toolchain-r-test
212150
packages:
213151
- clang-7
214-
- g++-5
215-
env: _CC=clang-7 _CXX=clang++-7 _DSL_CC=clang-7 _DSL_CXX=clang++-7 _BUILD="-DCMAKE_CXX_STANDARD=14"
152+
env: _CC=clang-7 _CXX=clang++-7 _DSL_CC=${_CC} _DSL_CXX=${_CXX} _BUILD="-DCMAKE_CXX_STANDARD=14"
216153
- os: linux
217154
addons:
218155
apt:
219156
sources:
220157
- llvm-toolchain-trusty-8
221-
- ubuntu-toolchain-r-test
222158
packages:
223159
- clang-8
224-
- g++-5
225-
env: _CC=clang-8 _CXX=clang++-8 _DSL_CC=clang-8 _DSL_CXX=clang++-8
160+
env: _CC=clang-8 _CXX=clang++-8 _DSL_CC=${_CC} _DSL_CXX=${_CXX}
226161
- os: linux
227162
addons:
228163
apt:
229164
sources:
230165
- llvm-toolchain-trusty-8
231-
- ubuntu-toolchain-r-test
232166
packages:
233167
- clang-8
234-
- g++-5
235-
env: _CC=clang-8 _CXX=clang++-8 _DSL_CC=clang-8 _DSL_CXX=clang++-8 _BUILD="-DCMAKE_CXX_STANDARD=14"
168+
env: _CC=clang-8 _CXX=clang++-8 _DSL_CC=${_CC} _DSL_CXX=${_CXX} _BUILD="-DCMAKE_CXX_STANDARD=14"
236169

237170
before_install:
238-
- sudo add-apt-repository ppa:beineri/opt-qt562-trusty -y
239-
- sudo add-apt-repository ppa:george-edison55/cmake-3.x -y
240-
- sudo apt-get update -q
241-
- sudo apt-get install libc++-dev cmake cmake-data qt56base qt56serialport libboost-program-options-dev libboost-filesystem-dev libboost-system-dev -y
242-
- if [[ ${_CC} == clang* ]]; then sudo apt-get remove gcc-4.8 g++-4.8 -y; fi
243-
244-
before_script:
245-
- source /opt/qt56/bin/qt56-env.sh
171+
- if [ -n "${_USE_GCC9}" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; sudo apt-get update; sudo apt-get install g++-9; fi
172+
- sudo apt-get install libqt5serialport5-dev -y
173+
- sudo apt-get install libboost-program-options-dev libboost-filesystem-dev libboost-system-dev -y
246174

247175
script:
248176
- echo "------------------ Generating Source ------------------"
249177
- mkdir build
250178
- cd build
251179
- CC=${_DSL_CC} CXX=${_DSL_CXX} cmake ..
252-
- VERBOSE=1 make
180+
- make
253181
- echo "------------------ Debug build ------------------"
254182
- mkdir build.debug
255183
- cd build.debug
256184
- CC=${_CC} CXX=${_CXX} cmake ../output -DOPT_BUILD_TEST=ON -DOPT_BUILD_PLUGIN=ON -DCMAKE_INSTALL_PREFIX=install ${_BUILD}
257-
- VERBOSE=1 make
185+
- make install
258186
- cd ..
259187
- echo "------------------ Release build ------------------"
260188
- mkdir build.release
261189
- cd build.release
262190
- CC=${_CC} CXX=${_CXX} cmake ../output ${_BUILD} -DOPT_BUILD_TEST=ON -DOPT_BUILD_PLUGIN=ON -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release
263-
- VERBOSE=1 make
191+
- make install
264192
- cd ..
265193
- echo "------------------ MinSize Release build ------------------"
266194
- mkdir build.min_size
267195
- cd build.min_size
268196
- CC=${_CC} CXX=${_CXX} cmake ../output ${_BUILD} -DOPT_BUILD_TEST=ON -DOPT_BUILD_PLUGIN=ON -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=MinSizeRel
269-
- VERBOSE=1 make
197+
- make install
270198
- cd ..
271199

272200

‎CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ option (DEMO1_NO_WARN_AS_ERR "Don't treat compilation warnings as errors." OFF)
1717
# is not provided and examples are not disabled.
1818

1919
if ("${COMMSDSL_TAG}" STREQUAL "")
20-
set(COMMSDSL_TAG "v3.0")
20+
set(COMMSDSL_TAG "v3.1")
2121
endif ()
2222

2323
if ("${COMMS_TAG}" STREQUAL "")
24-
set(COMMS_TAG "v2.2")
24+
set(COMMS_TAG "v2.2.1")
2525
endif ()
2626

27-
set (VERSION "0.12")
27+
set (VERSION "0.13")
2828

2929
set (COMMSDSL_TGT "commsdsl_tgt")
3030
if ("${COMMSDSL2COMMS}" STREQUAL "")

0 commit comments

Comments
 (0)