1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2016-08-17 16:44:29 +0000
3
+++ CMakeLists.txt	2016-11-18 23:50:42 +0000
4
@@ -1,5 +1,5 @@
7
1
project(messaging-framework C CXX)
1
cmake_minimum_required(VERSION 3.0.2)
8
2
cmake_minimum_required(VERSION 2.8.10)
2
project(messaging-framework VERSION "0.1" LANGUAGES C CXX)
9
3
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
3
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
10
4
4
11
5
# Select a pedantic set of compiler flags and enable C++11 support.
5
# Select a pedantic set of compiler flags and enable C++11 support.
12
@@ -31,10 +31,18 @@
13
31
set(CMAKE_INCLUDE_CURRENT_DIR ON)
31
set(CMAKE_INCLUDE_CURRENT_DIR ON)
14
32
set(CMAKE_AUTOMOC ON)
32
set(CMAKE_AUTOMOC ON)
15
33
33
20
34
set(SO_VERSION_MAJOR "1")
34
set(API_VERSION "1")
21
35
set(SO_VERSION_MINOR "1")
35
22
36
set(SO_VERSION_PATCH "0")
36
execute_process(
23
37
set(SO_VERSION "${SO_VERSION_MAJOR}.${SO_VERSION_MINOR}.${SO_VERSION_PATCH}")
37
  COMMAND /bin/sh ${CMAKE_CURRENT_SOURCE_DIR}/tools/get_soversion.sh
24
38
  OUTPUT_VARIABLE SO_VERSION
25
39
  OUTPUT_STRIP_TRAILING_WHITESPACE
26
40
  RESULT_VARIABLE result)
27
41
if(NOT result EQUAL 0)
28
42
  message(FATAL_ERROR "Error running get-soversion.sh script")
29
43
endif()
30
44
31
45
set(LIB_VERSION "${SO_VERSION}.${PROJECT_VERSION}")
32
38
46
33
39
option(CLICK_MODE "Installs to a contained location" on)
47
option(CLICK_MODE "Installs to a contained location" on)
34
40
48
35
@@ -82,6 +90,7 @@
36
82
)
90
)
37
83
91
38
84
add_subdirectory(data)
92
add_subdirectory(data)
39
93
add_subdirectory(tools)
40
85
add_subdirectory(doc)
94
add_subdirectory(doc)
41
86
add_subdirectory(include)
95
add_subdirectory(include)
42
87
add_subdirectory(src)
96
add_subdirectory(src)
43
88
97
44
=== added file 'HACKING.md'
45
--- HACKING.md	1970-01-01 00:00:00 +0000
46
+++ HACKING.md	2016-11-18 23:50:42 +0000
47
@@ -0,0 +1,77 @@
48
1
# Messaging Framework
49
2
50
3
### Checking dependencies
51
4
52
5
Check all the dependencies needed for the project to be built:
53
6
```sh
54
7
$ dpkg-checkbuilddeps
55
8
```
56
9
(this will return the list of dependencies). Install the returned dependencies:
57
10
```sh
58
11
$ apt-get install <list_of_dependencies>
59
12
```
60
13
61
14
### Building the code
62
15
63
16
You can check the needed packages by using:
64
17
```sh	
65
18
$ dpkg-checkdependencies
66
19
```
67
20
68
21
and install the list of needed dependencies returned. Once done, execute:
69
22
```sh
70
23
$ mkdir build && cd build
71
24
$ cmake -DCMAKE_INSTALL_PREFIX=/usr ../..
72
25
$ make -j<n>
73
26
```
74
27
where <n> is the number of cores available to use for building.
75
28
You can use ccache also if expected to build several times (apt-get install ccache)
76
29
77
30
78
31
### Running the tests
79
32
80
33
Once built, into build folder, execute:
81
34
```sh
82
35
$ ctest -j<n>
83
36
```
84
37
where <n> is the number of cores available to use for executing the tests in parallel
85
38
86
39
87
40
### Building the package
88
41
89
42
NOTE: Before building the package it is needed run a hook which updates debian folder. You have to execute
90
43
that hook from project folder:
91
44
```sh
92
45
$ ./debian/bileto_pre_release_hook
93
46
```
94
47
95
48
If all goes well, no response should be returned.
96
49
97
50
You can build the deb package in current arch by executing:
98
51
```sh
99
52
$ dh_clean
100
53
$ dpkg-buildpackage -b
101
54
```
102
55
103
56
in case you want to skip signage and dependencies to build a test package, you can use some additional params:
104
57
```sh
105
58
$ dpkg-buildpackage -nc -us -uc -d -b
106
59
```
107
60
108
61
besides, if you are in a lxd container and want to build a package for that container architecture:
109
62
```sh
110
63
$ dpkg-buildpackage -nc -us -uc -d -b --target-arch <arch> -a <arch> -j<n>
111
64
```
112
65
113
66
where <arch> is the architecture of the environment and <n> the number of cores to use
114
67
115
68
Depending on the release the soname of the resultant library will be on or another. You can query file:
116
69
```sh
117
70
tools/get_soversion.sh
118
71
```
119
72
120
73
the soversion that will be used for the library. The resultant .deb package will be like:
121
74
```sh
122
75
libmessaging-framework<apiversion>-<soversion>_XXX_<arch>.deb
123
76
```
124
77
125
0
78
126
=== removed file 'README.md'
127
--- README.md	2016-03-30 19:19:19 +0000
128
+++ README.md	1970-01-01 00:00:00 +0000
129
@@ -1,15 +0,0 @@
130
1
messaging-framework
131
2
===================
132
3
133
4
Check all the dependencies needed for the project to be built:
134
5
`dpkg-checkbuilddeps`
135
6
(this will return the list of dependencies)
136
7
137
8
`apt-get install <list_of_dependencies>`
138
9
139
10
140
11
Build the project
141
12
-----------------
142
13
`build.sh [clean]`
143
14
144
15
145
16
0
146
=== modified file 'data/CMakeLists.txt'
147
--- data/CMakeLists.txt	2016-03-30 19:19:19 +0000
148
+++ data/CMakeLists.txt	2016-11-18 23:50:42 +0000
149
@@ -15,7 +15,7 @@
150
15
15
151
16
16
152
17
###########################################
17
###########################################
154
18
# Messaging-fw data and configuration files
18
# messaging-framework data and configuration files
155
19
###########################################
19
###########################################
156
20
20
157
21
# Compose the pkg-config file needed to find the library using that tool
21
# Compose the pkg-config file needed to find the library using that tool
158
@@ -24,9 +24,9 @@
159
24
set(INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include") # /usr/include
24
set(INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include") # /usr/include
160
25
25
161
26
configure_file(
26
configure_file(
164
27
    ${CMAKE_CURRENT_SOURCE_DIR}/messaging-fw.pc.in
27
    ${CMAKE_CURRENT_SOURCE_DIR}/messaging-framework.pc.in
165
28
    ${CMAKE_CURRENT_BINARY_DIR}/messaging-fw.pc
28
    ${CMAKE_CURRENT_BINARY_DIR}/messaging-framework${API_VERSION}.pc
166
29
    @ONLY)
29
    @ONLY)
167
30
30
169
31
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/messaging-fw.pc
31
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/messaging-framework${API_VERSION}.pc
170
32
    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
32
    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
171
33
33
172
=== added file 'data/messaging-framework.pc.in'
173
--- data/messaging-framework.pc.in	1970-01-01 00:00:00 +0000
174
+++ data/messaging-framework.pc.in	2016-11-18 23:50:42 +0000
175
@@ -0,0 +1,10 @@
176
1
prefix=@PREFIX@
177
2
exec_prefix=@PREFIX@
178
3
libdir=@LIBDIR@
179
4
includedir=@INCLUDEDIR@
180
5
181
6
Name: messaging-framework
182
7
Version: @SO_VERSION@
183
8
Description: Ubuntu Messaging Framework
184
9
Cflags: -I${includedir}/messaging-framework@API_VERSION@
185
10
Libs: -L${libdir} -lmessaging-framework@API_VERSION@
186
0
11
187
=== removed file 'data/messaging-fw.pc.in'
188
--- data/messaging-fw.pc.in	2016-03-30 19:19:19 +0000
189
+++ data/messaging-fw.pc.in	1970-01-01 00:00:00 +0000
190
@@ -1,10 +0,0 @@
191
1
prefix=@PREFIX@
192
2
exec_prefix=@PREFIX@
193
3
libdir=@LIBDIR@
194
4
includedir=@INCLUDEDIR@
195
5
196
6
Name: Messaging-fw
197
7
Version: @SO_VERSION@
198
8
Description: Ubuntu Messaging Framework
199
9
Cflags: -I${includedir}/messaging-fw
200
10
Libs: -L${libdir} -lmessaging-fw
201
11
0
202
=== added file 'debian/bileto_pre_release_hook'
203
--- debian/bileto_pre_release_hook	1970-01-01 00:00:00 +0000
204
+++ debian/bileto_pre_release_hook	2016-11-18 23:50:42 +0000
205
@@ -0,0 +1,22 @@
206
1
#!/bin/sh
207
2
208
3
set -eu
209
4
210
5
soversion=$(sh ./tools/get_soversion.sh)
211
6
212
7
substitute() {
213
8
    cat > "$2" <<EOF
214
9
# This file is autogenerated. DO NOT EDIT!
215
10
#
216
11
# Modifications should be made to $1 instead.
217
12
# This file is regenerated automatically in the clean target.
218
13
#
219
14
EOF
220
15
    sed -e "s/@SO_VERSION@/${soversion}/g" < "$1" >> "$2"
221
16
}
222
17
223
18
substitute ./debian/control.in ./debian/control
224
19
substitute ./debian/libmessaging-framework1.install.in ./debian/libmessaging-framework1-${soversion}.install
225
20
substitute ./debian/libmessaging-framework1.shlibs.in ./debian/libmessaging-framework1-${soversion}.shlibs
226
21
227
22
exit 0
228
0
23
229
=== added file 'debian/control'
230
--- debian/control	1970-01-01 00:00:00 +0000
231
+++ debian/control	2016-11-18 23:50:42 +0000
232
@@ -0,0 +1,54 @@
233
1
# This file is autogenerated. DO NOT EDIT!
234
2
#
235
3
# Modifications should be made to ./debian/control.in instead.
236
4
# This file is regenerated automatically in the clean target.
237
5
#
238
6
Source: messaging-framework
239
7
Section: libs
240
8
Priority: optional
241
9
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
242
10
Build-Depends: astyle,
243
11
               clang-format-3.5:native,
244
12
               clang:native,
245
13
               cmake,
246
14
               debhelper (>= 9),
247
15
               dos2unix,
248
16
               doxygen,
249
17
               gcovr,
250
18
               google-mock,
251
19
               graphviz,
252
20
               lcov,
253
21
               libboost-filesystem-dev (>= 1.55) | libboost-filesystem1.58-dev,
254
22
               libboost-program-options-dev (>= 1.55) | libboost-program-options1.58-dev, 
255
23
               libboost-system-dev (>= 1.55) | libboost-system1.58-dev,
256
24
               libdbus-cpp-dev,
257
25
               libgoogle-glog-dev,
258
26
               libphonenumber-dev,
259
27
               libprocess-cpp-dev,
260
28
               libsystemd-dev,
261
29
               libtelepathy-qt5-dev,
262
30
               pkg-config,
263
31
               qtbase5-dev,
264
32
               qtpim5-dev,
265
33
               telepathy-mission-control-5
266
34
Standards-Version: 3.9.7
267
35
Homepage: https://launchpad.net/messaging-framework
268
36
Vcs-Bzr: https://code.launchpad.net/~phablet-team/messaging-framework/trunk
269
37
270
38
Package: libmessaging-framework-dev
271
39
Section: libdevel
272
40
Architecture: any
273
41
Multi-Arch: same
274
42
Depends: libmessaging-framework1-2 (= ${binary:Version}), ${misc:Depends}
275
43
Description: Ubuntu Messaging Framework header files
276
44
 All the development headers and libraries for the Messaging Framework
277
45
278
46
Package: libmessaging-framework1-2
279
47
Section: libs
280
48
Architecture: any
281
49
Multi-Arch: same
282
50
Depends: ${misc:Depends}, ${shlibs:Depends}
283
51
Description: Ubuntu Messaging Framework to build IM plugins
284
52
 This layer communicates third party plugins with systems like
285
53
 telepathy allowing changing the system by other without having
286
54
 to modify the plugins
287
0
55
288
=== removed file 'debian/control'
289
--- debian/control	2016-11-03 16:27:45 +0000
290
+++ debian/control	1970-01-01 00:00:00 +0000
291
@@ -1,50 +0,0 @@
292
1
Source: messaging-framework
293
2
Section: libs
294
3
Priority: optional
295
4
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
296
5
Build-Depends: astyle,
297
6
               clang-format-3.5:native,
298
7
               clang:native,
299
8
               cmake,
300
9
               debhelper (>= 9),
301
10
               dos2unix,
302
11
               doxygen,
303
12
               gcovr,
304
13
               google-mock,
305
14
               graphviz,
306
15
               lcov,
307
16
               libboost-dev,
308
17
               libboost-filesystem-dev,
309
18
               libboost-program-options-dev,
310
19
               libboost-system-dev,
311
20
               libdbus-cpp-dev,
312
21
               libgoogle-glog-dev,
313
22
               libphonenumber-dev,
314
23
               libprocess-cpp-dev,
315
24
               libsystemd-dev,
316
25
               libtelepathy-qt5-dev,
317
26
               pkg-config,
318
27
               qtbase5-dev,
319
28
               qtpim5-dev,
320
29
               telepathy-mission-control-5
321
30
Standards-Version: 3.9.7
322
31
Homepage: https://launchpad.net/messaging-framework
323
32
Vcs-Bzr: https://code.launchpad.net/~phablet-team/messaging-framework/trunk
324
33
325
34
Package: libmessaging-fw-dev
326
35
Section: libdevel
327
36
Architecture: any
328
37
Multi-Arch: same
329
38
Depends: libmessaging-fw1 (= ${binary:Version}), ${misc:Depends}
330
39
Description: Ubuntu Messaging Framework header files
331
40
 All the development headers and libraries for the Messaging Framework
332
41
333
42
Package: libmessaging-fw1
334
43
Section: libs
335
44
Architecture: any
336
45
Multi-Arch: same
337
46
Depends: ${misc:Depends}, ${shlibs:Depends}
338
47
Description: Ubuntu Messaging Framework to build IM plugins
339
48
 This layer communicates third party plugins with systems like
340
49
 telepathy allowing changing the system by other without having
341
50
 to modify the plugins
342
51
0
343
=== added file 'debian/control.in'
344
--- debian/control.in	1970-01-01 00:00:00 +0000
345
+++ debian/control.in	2016-11-18 23:50:42 +0000
346
@@ -0,0 +1,49 @@
347
1
Source: messaging-framework
348
2
Section: libs
349
3
Priority: optional
350
4
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
351
5
Build-Depends: astyle,
352
6
               clang-format-3.5:native,
353
7
               clang:native,
354
8
               cmake,
355
9
               debhelper (>= 9),
356
10
               dos2unix,
357
11
               doxygen,
358
12
               gcovr,
359
13
               google-mock,
360
14
               graphviz,
361
15
               lcov,
362
16
               libboost-filesystem-dev (>= 1.55) | libboost-filesystem1.58-dev,
363
17
               libboost-program-options-dev (>= 1.55) | libboost-program-options1.58-dev, 
364
18
               libboost-system-dev (>= 1.55) | libboost-system1.58-dev,
365
19
               libdbus-cpp-dev,
366
20
               libgoogle-glog-dev,
367
21
               libphonenumber-dev,
368
22
               libprocess-cpp-dev,
369
23
               libsystemd-dev,
370
24
               libtelepathy-qt5-dev,
371
25
               pkg-config,
372
26
               qtbase5-dev,
373
27
               qtpim5-dev,
374
28
               telepathy-mission-control-5
375
29
Standards-Version: 3.9.7
376
30
Homepage: https://launchpad.net/messaging-framework
377
31
Vcs-Bzr: https://code.launchpad.net/~phablet-team/messaging-framework/trunk
378
32
379
33
Package: libmessaging-framework-dev
380
34
Section: libdevel
381
35
Architecture: any
382
36
Multi-Arch: same
383
37
Depends: libmessaging-framework1-@SO_VERSION@ (= ${binary:Version}), ${misc:Depends}
384
38
Description: Ubuntu Messaging Framework header files
385
39
 All the development headers and libraries for the Messaging Framework
386
40
387
41
Package: libmessaging-framework1-@SO_VERSION@
388
42
Section: libs
389
43
Architecture: any
390
44
Multi-Arch: same
391
45
Depends: ${misc:Depends}, ${shlibs:Depends}
392
46
Description: Ubuntu Messaging Framework to build IM plugins
393
47
 This layer communicates third party plugins with systems like
394
48
 telepathy allowing changing the system by other without having
395
49
 to modify the plugins
396
0
50
397
=== added file 'debian/libmessaging-framework-dev.install'
398
--- debian/libmessaging-framework-dev.install	1970-01-01 00:00:00 +0000
399
+++ debian/libmessaging-framework-dev.install	2016-11-18 23:50:42 +0000
400
@@ -0,0 +1,3 @@
401
1
usr/include/messaging-framework*
402
2
usr/lib/*/libmessaging-framework*.so
403
3
usr/lib/*/pkgconfig/messaging-framework*.pc
404
0
4
405
=== added file 'debian/libmessaging-framework1.install.in'
406
--- debian/libmessaging-framework1.install.in	1970-01-01 00:00:00 +0000
407
+++ debian/libmessaging-framework1.install.in	2016-11-18 23:50:42 +0000
408
@@ -0,0 +1,2 @@
409
1
usr/lib/*/libmessaging-framework*.so.*
410
2
usr/lib/*/messaging-framework-runner
411
0
3
412
=== added file 'debian/libmessaging-framework1.shlibs.in'
413
--- debian/libmessaging-framework1.shlibs.in	1970-01-01 00:00:00 +0000
414
+++ debian/libmessaging-framework1.shlibs.in	2016-11-18 23:50:42 +0000
415
@@ -0,0 +1,1 @@
416
1
libmessaging-framework1 @SO_VERSION@ libmessaging-framework1-@SO_VERSION@ (>= 0.1)
417
0
2
418
=== removed file 'debian/libmessaging-fw-dev.install'
419
--- debian/libmessaging-fw-dev.install	2016-11-03 16:27:45 +0000
420
+++ debian/libmessaging-fw-dev.install	1970-01-01 00:00:00 +0000
421
@@ -1,3 +0,0 @@
422
1
usr/include/messaging-fw/*
423
2
usr/lib/*/libmessaging-fw*.so
424
3
usr/lib/*/pkgconfig/messaging-fw.pc
425
4
0
426
=== removed file 'debian/libmessaging-fw1.install'
427
--- debian/libmessaging-fw1.install	2016-11-03 16:27:45 +0000
428
+++ debian/libmessaging-fw1.install	1970-01-01 00:00:00 +0000
429
@@ -1,2 +0,0 @@
430
1
usr/lib/*/libmessaging-fw*.so.*
431
2
usr/lib/*/messaging-fw-runner
432
3
0
433
=== modified file 'debian/rules'
434
--- debian/rules	2016-07-04 15:53:42 +0000
435
+++ debian/rules	2016-11-18 23:50:42 +0000
436
@@ -6,7 +6,8 @@
437
6
include /usr/share/dpkg/default.mk
6
include /usr/share/dpkg/default.mk
438
7
7
439
8
%:
8
%:
441
9
	dh $@ --fail-missing
9
	dh $@ --parallel --fail-missing
442
10
10
445
11
override_dh_shlibdeps:
11
override_dh_auto_clean:
446
12
	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
12
	/bin/sh $(CURDIR)/debian/bileto_pre_release_hook
447
13
	dh_auto_clean
448
13
14
449
=== modified file 'include/CMakeLists.txt'
450
--- include/CMakeLists.txt	2016-03-30 19:19:19 +0000
451
+++ include/CMakeLists.txt	2016-11-18 23:50:42 +0000
452
@@ -4,5 +4,5 @@
453
4
4
454
5
install(
5
install(
455
6
    DIRECTORY messaging
6
    DIRECTORY messaging
457
7
    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/messaging-fw
7
    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/messaging-framework${API_VERSION}
458
8
)
8
)
459
9
9
460
=== modified file 'src/CMakeLists.txt'
461
--- src/CMakeLists.txt	2016-11-03 16:27:45 +0000
462
+++ src/CMakeLists.txt	2016-11-18 23:50:42 +0000
463
@@ -57,24 +57,25 @@
464
57
    messaging/runner.cpp
57
    messaging/runner.cpp
465
58
)
58
)
466
59
59
468
60
# The general messaging-fw shared library.
60
# The general messaging-framework shared library.
469
61
add_library(
61
add_library(
471
62
    messaging-fw SHARED
62
    messaging-framework SHARED
472
63
63
473
64
    ${MESSAGING_FW_MOCS}
64
    ${MESSAGING_FW_MOCS}
474
65
    ${MESSAGING_FW_SRCS}
65
    ${MESSAGING_FW_SRCS}
475
66
)
66
)
476
67
67
477
68
set_target_properties(
68
set_target_properties(
479
69
    messaging-fw
69
    messaging-framework
480
70
70
481
71
    PROPERTIES
71
    PROPERTIES
484
72
    VERSION ${SO_VERSION_MAJOR}.${SO_VERSION_MINOR}.${SO_VERSION_PATCH}
72
    OUTPUT_NAME "messaging-framework${API_VERSION}"
485
73
    SOVERSION ${SO_VERSION_MAJOR}
73
    VERSION ${LIB_VERSION}
486
74
    SOVERSION ${SO_VERSION}
487
74
)
75
)
488
75
76
489
76
target_link_libraries(
77
target_link_libraries(
491
77
    messaging-fw
78
    messaging-framework
492
78
79
493
79
    ${Boost_LIBRARIES}
80
    ${Boost_LIBRARIES}
494
80
    ${CMAKE_THREAD_LIBS_INIT}
81
    ${CMAKE_THREAD_LIBS_INIT}
495
@@ -93,15 +94,15 @@
496
93
    dl)
94
    dl)
497
94
95
498
95
install(
96
install(
500
96
    TARGETS messaging-fw
97
    TARGETS messaging-framework
501
97
    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
98
    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
502
98
99
504
99
# messaging-fw-runner is the standalone executable for executing
100
# messaging-framework-runner is the standalone executable for executing
505
100
# a given messaging::Connector.
101
# a given messaging::Connector.
507
101
add_executable(messaging-fw-runner messaging/runner_main.cpp)
102
add_executable(messaging-framework-runner messaging/runner_main.cpp)
508
102
# We keep the Runner::main symbol evolvable by putting it into the main so.
103
# We keep the Runner::main symbol evolvable by putting it into the main so.
510
103
target_link_libraries(messaging-fw-runner messaging-fw ${TP_QT5_LDFLAGS})
104
target_link_libraries(messaging-framework-runner messaging-framework ${TP_QT5_LDFLAGS})
511
104
# We install the runner to the libdir as it is not meant to be run by a user.
105
# We install the runner to the libdir as it is not meant to be run by a user.
512
105
install(
106
install(
514
106
    TARGETS messaging-fw-runner
107
    TARGETS messaging-framework-runner
515
107
    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR})
108
    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR})
516
108
109
517
=== modified file 'tests/CMakeLists.txt'
518
--- tests/CMakeLists.txt	2016-06-07 18:15:24 +0000
519
+++ tests/CMakeLists.txt	2016-11-18 23:50:42 +0000
520
@@ -44,6 +44,6 @@
521
44
file(GLOB_RECURSE TEST_H_FILES *.h)
44
file(GLOB_RECURSE TEST_H_FILES *.h)
522
45
add_custom_target(test_dot_h_files ALL SOURCES ${TEST_H_FILES})
45
add_custom_target(test_dot_h_files ALL SOURCES ${TEST_H_FILES})
523
46
46
525
47
target_link_libraries(testing-mocks messaging-fw gmock gmock_main)
47
target_link_libraries(testing-mocks messaging-framework gmock gmock_main)
526
48
48
527
49
add_subdirectory(unit)
49
add_subdirectory(unit)
528
50
50
529
=== modified file 'tests/unit/messaging/CMakeLists.txt'
530
--- tests/unit/messaging/CMakeLists.txt	2016-08-16 16:31:31 +0000
531
+++ tests/unit/messaging/CMakeLists.txt	2016-11-18 23:50:42 +0000
532
@@ -46,7 +46,7 @@
533
46
46
534
47
    testing-framework
47
    testing-framework
535
48
    testing-mocks
48
    testing-mocks
537
49
    messaging-fw 
49
    messaging-framework
538
50
50
539
51
    gmock 
51
    gmock 
540
52
    gmock_main 
52
    gmock_main 
541
53
53
542
=== added directory 'tools'
543
=== added file 'tools/CMakeLists.txt'
544
--- tools/CMakeLists.txt	1970-01-01 00:00:00 +0000
545
+++ tools/CMakeLists.txt	2016-11-18 23:50:42 +0000
546
@@ -0,0 +1,4 @@
547
1
# make the .sh files visible on qtcreator
548
2
file(GLOB_RECURSE SH_FILES *.sh)
549
3
add_custom_target(dot_sh_files ALL SOURCES ${SH_FILES})
550
4
551
0
5
552
=== added file 'tools/get_soversion.sh'
553
--- tools/get_soversion.sh	1970-01-01 00:00:00 +0000
554
+++ tools/get_soversion.sh	2016-11-18 23:50:42 +0000
555
@@ -0,0 +1,44 @@
556
1
#!/bin/sh
557
2
# Copyright (C) 2016 Canonical Ltd
558
3
#
559
4
# This program is free software: you can redistribute it and/or modify
560
5
# it under the terms of the GNU Lesser General Public License version 3 as
561
6
# published by the Free Software Foundation.
562
7
#
563
8
# This program is distributed in the hope that it will be useful,
564
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
565
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
566
11
# GNU Lesser General Public License for more details.
567
12
#
568
13
# You should have received a copy of the GNU Lesser General Public License
569
14
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
570
15
#
571
16
# Authors: James Henstridge <james.henstridge@canonical.com>
572
17
573
18
set -eu
574
19
575
20
[ -n "${SERIES:-}" ] || SERIES=$(lsb_release -c -s)
576
21
577
22
case "$SERIES" in
578
23
    trusty)
579
24
        # TODO: the CI systems are running Trusty, so don't bomb out
580
25
        # when they try to build the source package.
581
26
        echo 0
582
27
        ;;
583
28
    vivid)
584
29
        # Old C++11 ABI, Boost 1.55
585
30
        echo 0 
586
31
        ;;
587
32
    xenial)
588
33
        # New C++11 ABI, Boost 1.58
589
34
        echo 1
590
35
        ;;
591
36
    yakkety|zesty)
592
37
        # New C++11 ABI, Boost 1.61
593
38
        echo 2
594
39
        ;;
595
40
    *)
596
41
        echo "Unknown distro series $SERIES" >&2
597
42
        exit 1
598
43
        ;;
599
44
esac
Status:	Merged
Approved by:	Roberto Mier Escandon on 2016-11-19
Approved revision:	84
Merged at revision:	72
Proposed branch:	lp:~phablet-team/messaging-framework/dynamic-soname
Merge into:	lp:messaging-framework
Prerequisite:	lp:~ken-vandine/messaging-framework/packaging_cleanup
Diff against target:	599 lines (+250/-107) 21 files modified CMakeLists.txt (+15/-6) HACKING.md (+77/-0) README.md (+0/-15) data/CMakeLists.txt (+4/-4) data/messaging-framework.pc.in (+10/-0) data/messaging-fw.pc.in (+0/-10) debian/bileto_pre_release_hook (+22/-0) debian/control (+0/-50) debian/control.in (+49/-0) debian/libmessaging-framework-dev.install (+3/-0) debian/libmessaging-framework1.install.in (+2/-0) debian/libmessaging-framework1.shlibs.in (+1/-0) debian/libmessaging-fw-dev.install (+0/-3) debian/libmessaging-fw1.install (+0/-2) debian/rules (+4/-3) include/CMakeLists.txt (+1/-1) src/CMakeLists.txt (+12/-11) tests/CMakeLists.txt (+1/-1) tests/unit/messaging/CMakeLists.txt (+1/-1) tools/CMakeLists.txt (+4/-0) tools/get_soversion.sh (+44/-0)
To merge this branch:	bzr merge lp:~phablet-team/messaging-framework/dynamic-soname
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration		Approve on 2016-11-19
Gustavo Pichorim Boiko (community)		2016-11-10	Approve on 2016-11-11
Review via email: mp+310557@code.launchpad.net