Transfer Indicator

Merge lp:~renatofilho/indicator-transfer/dev-package into lp:~charlesk/indicator-transfer/add-plugins

  1. dev-package
  2. Merge into add-plugins
Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Charles Kerr
Approved revision: 48
Merged at revision: 46
Proposed branch: lp:~renatofilho/indicator-transfer/dev-package
Merge into: lp:~charlesk/indicator-transfer/add-plugins
Diff against target: 307 lines (+136/-22)
13 files modified
CMakeLists.txt (+17/-1)
cmake_uninstall.cmake.in (+21/-0)
data/CMakeLists.txt (+9/-0)
data/indicator-transfer.pc.in (+8/-0)
debian/control (+29/-2)
debian/indicator-transfer-download-manager.install (+1/-0)
debian/indicator-transfer.install (+5/-0)
debian/libindicator-transfer-dev.install (+3/-0)
debian/libindicator-transfer0.install (+1/-0)
include/transfer/CMakeLists.txt (+6/-2)
src/CMakeLists.txt (+11/-13)
src/dm-plugin/CMakeLists.txt (+21/-0)
tests/CMakeLists.txt (+4/-4)
To merge this branch: bzr merge lp:~renatofilho/indicator-transfer/dev-package
Reviewer Review Type Date Requested Status
Ken VanDine (community) Approve
Charles Kerr Approve
Review via email: mp+266439@code.launchpad.net

Commit message

Created "dev" package.

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Packaging change looks good to me, with just one minor typo I commented on inline.

review: Needs Fixing
Revision history for this message
Ken VanDine (ken-vandine) wrote :

The shared library should be split out into a separate lib package, and rename the -dev package to match.

review: Needs Fixing
lp:~renatofilho/indicator-transfer/dev-package updated
45. By Renato Araujo Oliveira Filho

Splited the package into libindicator-transfer0, libindicator-transfer-dev and indicator-transfer-download-manager.

46. By Renato Araujo Oliveira Filho

Fixed headers install dir.

47. By Renato Araujo Oliveira Filho

Fixed .pc file.

Revision history for this message
Charles Kerr (charlesk) wrote :

CMake changes look fine; deferring to ken for debian/*

review: Approve
Revision history for this message
Ken VanDine (ken-vandine) wrote :

A couple typos in debian/control:
 indicator-transfer-donwload-manager in a recommends and Donwload in a description

review: Needs Fixing
lp:~renatofilho/indicator-transfer/dev-package updated
48. By Renato Araujo Oliveira Filho

Fixed typos and package sections.

Revision history for this message
Ken VanDine (ken-vandine) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-07-27 22:29:29 +0000
3+++ CMakeLists.txt 2015-07-31 16:00:07 +0000
4@@ -14,7 +14,7 @@
5
6 ##
7 ## GNU standard installation directories
8-##
9+##
10
11 include (GNUInstallDirs)
12 if (EXISTS "/etc/debian_version") # Workaround for libexecdir on debian
13@@ -25,6 +25,15 @@
14 set (CMAKE_INSTALL_FULL_PKGLIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}")
15
16 ##
17+## Version
18+##
19+
20+set(INDICATOR_TRANSFER_VERSION_MAJOR 0)
21+set(INDICATOR_TRANSFER_VERSION_MINOR 0)
22+set(INDICATOR_TRANSFER_VERSION_PATCH 1)
23+set(INDICATOR_TRANSFER_VERSION "${INDICATOR_TRANSFER_VERSION_MAJOR}.${INDICATOR_TRANSFER_VERSION_MINOR}.${INDICATOR_TRANSFER_VERSION_PATCH}")
24+
25+##
26 ## Check for prerequisites
27 ##
28
29@@ -84,3 +93,10 @@
30 add_subdirectory(tests)
31 endif ()
32
33+# uninstall target
34+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
35+ "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
36+ IMMEDIATE @ONLY)
37+add_custom_target(uninstall "${CMAKE_COMMAND}"
38+ -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
39+
40
41=== added file 'cmake_uninstall.cmake.in'
42--- cmake_uninstall.cmake.in 1970-01-01 00:00:00 +0000
43+++ cmake_uninstall.cmake.in 2015-07-31 16:00:07 +0000
44@@ -0,0 +1,21 @@
45+IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
46+ MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
47+ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
48+
49+FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
50+STRING(REGEX REPLACE "\n" ";" files "${files}")
51+FOREACH(file ${files})
52+ MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
53+ IF(EXISTS "$ENV{DESTDIR}${file}")
54+ EXEC_PROGRAM(
55+ "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
56+ OUTPUT_VARIABLE rm_out
57+ RETURN_VALUE rm_retval
58+ )
59+ IF(NOT "${rm_retval}" STREQUAL 0)
60+ MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
61+ ENDIF(NOT "${rm_retval}" STREQUAL 0)
62+ ELSE(EXISTS "$ENV{DESTDIR}${file}")
63+ MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
64+ ENDIF(EXISTS "$ENV{DESTDIR}${file}")
65+ENDFOREACH(file)
66
67=== modified file 'data/CMakeLists.txt'
68--- data/CMakeLists.txt 2014-03-29 17:17:09 +0000
69+++ data/CMakeLists.txt 2015-07-31 16:00:07 +0000
70@@ -73,3 +73,12 @@
71
72 install (FILES "${UNITY_INDICATOR_FILE}"
73 DESTINATION "${UNITY_INDICATOR_DIR}")
74+
75+##
76+## Pkg dev file
77+set (INDICATOR_PKG_NAME "${CMAKE_PROJECT_NAME}.pc")
78+set (INDICATOR_PKG_FILE "${CMAKE_CURRENT_BINARY_DIR}/${INDICATOR_PKG_NAME}")
79+set (INDICATOR_PKG_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${INDICATOR_PKG_NAME}.in")
80+configure_file ("${INDICATOR_PKG_FILE_IN}" "${INDICATOR_PKG_FILE}" @ONLY)
81+install (FILES "${INDICATOR_PKG_FILE}"
82+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
83
84=== added file 'data/indicator-transfer.pc.in'
85--- data/indicator-transfer.pc.in 1970-01-01 00:00:00 +0000
86+++ data/indicator-transfer.pc.in 2015-07-31 16:00:07 +0000
87@@ -0,0 +1,8 @@
88+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
89+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/@CMAKE_PROJECT_NAME@
90+
91+Name: @CMAKE_PROJECT_NAME@
92+Description: Developer files for @CMAKE_PROJECT_NAME@
93+Version: @INDICATOR_TRANSFER_VERSION@
94+Libs: -L${libdir} -lindicator-transfer
95+Cflags: -I${includedir}
96
97=== modified file 'debian/control'
98--- debian/control 2015-07-29 21:41:32 +0000
99+++ debian/control 2015-07-31 16:00:07 +0000
100@@ -19,7 +19,7 @@
101 google-mock (>= 1.6.0+svn437),
102 valgrind [amd64 armhf i386 powerpc],
103 # for packaging
104- debhelper (>= 9),
105+ debhelper (>= 9),
106 dh-translations,
107 Standards-Version: 3.9.5
108 Homepage: https://launchpad.net/indicator-transfer
109@@ -32,10 +32,37 @@
110
111 Package: indicator-transfer
112 Architecture: any
113-Depends: ${shlibs:Depends},
114+Depends: ${shlibs:Depends},
115 ${misc:Depends},
116+ libindicator-transfer0 (= ${binary:Version}),
117 Recommends: indicator-applet | indicator-renderer,
118 content-hub,
119 ubuntu-download-manager,
120+ indicator-transfer-download-manager (>= ${binary:Version}),
121 Description: Shows Transfers
122 Show file/data transfers in the indicator bar
123+
124+Package: indicator-transfer-download-manager
125+Architecture: any
126+Depends: ${shlibs:Depends},
127+ ${misc:Depends},
128+ indicator-transfer (= ${binary:Version}),
129+Description: Download manager plugin for trasfer indicator
130+ Show file/data transfers in the indicator bar
131+
132+Package: libindicator-transfer0
133+Section: libs
134+Architecture: any
135+Depends: ${shlibs:Depends},
136+ ${misc:Depends},
137+Description: Shared library used by transfer-indicator and plugins
138+ Show file/data transfers in the indicator bar
139+
140+Package: libindicator-transfer-dev
141+Section: libdevel
142+Architecture: any
143+Depends: ${shlibs:Depends},
144+ ${misc:Depends},
145+ libindicator-transfer0 (= ${binary:Version}),
146+Description: Development files for indicator-transfer
147+ Show file/data transfers in the indicator bar
148
149=== added file 'debian/indicator-transfer-download-manager.install'
150--- debian/indicator-transfer-download-manager.install 1970-01-01 00:00:00 +0000
151+++ debian/indicator-transfer-download-manager.install 2015-07-31 16:00:07 +0000
152@@ -0,0 +1,1 @@
153+usr/lib/*/indicator-transfer/libdmtransfers.so
154
155=== added file 'debian/indicator-transfer.install'
156--- debian/indicator-transfer.install 1970-01-01 00:00:00 +0000
157+++ debian/indicator-transfer.install 2015-07-31 16:00:07 +0000
158@@ -0,0 +1,5 @@
159+usr/share/upstart/sessions/indicator-transfer.conf
160+etc/xdg/autostart/indicator-transfer.desktop
161+usr/share/upstart/xdg/autostart/indicator-transfer.desktop
162+usr/share/unity/indicators/com.canonical.indicator.transfer
163+usr/lib/*/indicator-transfer/indicator-transfer-service
164
165=== added file 'debian/libindicator-transfer-dev.install'
166--- debian/libindicator-transfer-dev.install 1970-01-01 00:00:00 +0000
167+++ debian/libindicator-transfer-dev.install 2015-07-31 16:00:07 +0000
168@@ -0,0 +1,3 @@
169+usr/include/indicator-transfer/*
170+usr/lib/*/libindicator-transfer.so
171+usr/lib/*/pkgconfig/indicator-transfer.pc
172
173=== added file 'debian/libindicator-transfer0.install'
174--- debian/libindicator-transfer0.install 1970-01-01 00:00:00 +0000
175+++ debian/libindicator-transfer0.install 2015-07-31 16:00:07 +0000
176@@ -0,0 +1,1 @@
177+usr/lib/*/libindicator-transfer.so.*
178
179=== modified file 'include/transfer/CMakeLists.txt'
180--- include/transfer/CMakeLists.txt 2014-03-29 17:17:09 +0000
181+++ include/transfer/CMakeLists.txt 2015-07-31 16:00:07 +0000
182@@ -1,2 +1,6 @@
183-
184-
185+set (SERVICE_LIB_PUBLIC_HEADERS
186+ model.h
187+ source.h
188+ transfer.h)
189+
190+install (FILES ${SERVICE_LIB_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${CMAKE_PROJECT_NAME}/transfer)
191
192=== modified file 'src/CMakeLists.txt'
193--- src/CMakeLists.txt 2015-07-30 14:15:39 +0000
194+++ src/CMakeLists.txt 2015-07-31 16:00:07 +0000
195@@ -1,4 +1,4 @@
196-set (SERVICE_LIB "indicatortransferservice")
197+set (SERVICE_LIB "indicator-transfer")
198 set (SERVICE_EXEC "indicator-transfer-service")
199
200 add_definitions (-DG_LOG_DOMAIN="${CMAKE_PROJECT_NAME}")
201@@ -6,7 +6,6 @@
202 # handwritten source code...
203 set (SERVICE_LIB_HANDWRITTEN_SOURCES
204 controller.cpp
205- dm-source.cpp
206 model.cpp
207 plugin-source.cpp
208 transfer.cpp
209@@ -15,7 +14,14 @@
210 source.cpp
211 multisource.cpp)
212
213-add_library(${SERVICE_LIB} STATIC ${SERVICE_LIB_HANDWRITTEN_SOURCES})
214+add_library(${SERVICE_LIB} SHARED ${SERVICE_LIB_HANDWRITTEN_SOURCES})
215+
216+set_target_properties(${SERVICE_LIB} PROPERTIES
217+ VERSION ${INDICATOR_TRANSFER_VERSION}
218+ SOVERSION ${INDICATOR_TRANSFER_VERSION_MAJOR}
219+)
220+install (TARGETS ${SERVICE_LIB} LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
221+
222
223 # add the bin dir to the include path so that
224 # the compiler can find the generated header files
225@@ -28,19 +34,11 @@
226 target_link_libraries (${SERVICE_EXEC} ${SERVICE_LIB} ${SERVICE_DEPS_LIBRARIES} ${GCOV_LIBS})
227 install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR})
228
229-# the DownloadManager source plugin...
230-set(DM_LIB "dmtransfers")
231-set(DM_SOURCES dm-source.cpp dm-plugin.cpp)
232-add_library(${DM_LIB} MODULE ${DM_SOURCES})
233-target_link_libraries (${DM_LIB} ${SERVICE_LIB} ${SERVICE_DEPS_LIBRARIES} ${GCOV_LIBS})
234-install(TARGETS ${DM_LIB} LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR})
235-
236 # add warnings/coverage info on handwritten files
237 # but not the generated ones...
238-set_property (SOURCE ${SERVICE_LIB_HANDWRITTEN_SOURCES} ${SERVICE_EXEC_HANDWRITTEN_SOURCES} ${DM_SOURCES}
239+set_property (SOURCE ${SERVICE_LIB_HANDWRITTEN_SOURCES} ${SERVICE_EXEC_HANDWRITTEN_SOURCES}
240 APPEND_STRING PROPERTY COMPILE_FLAGS " -std=c++11 -fPIC -g ${CXX_WARNING_ARGS} ${GCOV_FLAGS}")
241
242 set_property (SOURCE main.cpp APPEND PROPERTY COMPILE_DEFINITIONS PLUGINDIR="${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
243-#target_compile_definitions(${DM_LIB} PUBLIC -DPLUGINDIR=${CMAKE_INSTALL_FULL_PKGLIBEXECDIR})
244
245-install (TARGETS ${SERVICE_EXEC} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR})
246+add_subdirectory (dm-plugin)
247
248=== added directory 'src/dm-plugin'
249=== added file 'src/dm-plugin/CMakeLists.txt'
250--- src/dm-plugin/CMakeLists.txt 1970-01-01 00:00:00 +0000
251+++ src/dm-plugin/CMakeLists.txt 2015-07-31 16:00:07 +0000
252@@ -0,0 +1,21 @@
253+# the DownloadManager source plugin...
254+set(DM_LIB "dmtransfers")
255+
256+set(DM_SOURCES
257+ dm-source.cpp
258+ dm-plugin.cpp)
259+
260+include_directories (
261+ ${CAMAKE_SOURCE_DIR}/src)
262+
263+add_library(${DM_LIB} MODULE ${DM_SOURCES})
264+
265+target_link_libraries (${DM_LIB}
266+ indicator-transfer
267+ ${SERVICE_DEPS_LIBRARIES}
268+ ${GCOV_LIBS})
269+
270+install(TARGETS ${DM_LIB} LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR})
271+
272+set_property (SOURCE ${DM_SOURCES}
273+ APPEND_STRING PROPERTY COMPILE_FLAGS " -std=c++11 -fPIC -g ${CXX_WARNING_ARGS} ${GCOV_FLAGS}")
274
275=== renamed file 'src/dm-plugin.cpp' => 'src/dm-plugin/dm-plugin.cpp'
276=== renamed file 'src/dm-source.cpp' => 'src/dm-plugin/dm-source.cpp'
277=== modified file 'tests/CMakeLists.txt'
278--- tests/CMakeLists.txt 2015-07-29 16:07:49 +0000
279+++ tests/CMakeLists.txt 2015-07-31 16:00:07 +0000
280@@ -5,8 +5,8 @@
281 include_directories(${GTEST_INCLUDE_DIRS})
282
283 # build libgtest
284-#add_library (gtest STATIC
285-# ${GTEST_SOURCE_DIR}/gtest-all.cc
286+#add_library (gtest STATIC
287+# ${GTEST_SOURCE_DIR}/gtest-all.cc
288 # ${GTEST_SOURCE_DIR}/gtest_main.cc)
289 #set_target_properties (gtest PROPERTIES INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GTEST_INCLUDE_DIR})
290 #set_target_properties (gtest PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS} -w)
291@@ -27,7 +27,7 @@
292 set (TEST_NAME ${name})
293 add_executable (${TEST_NAME} ${TEST_NAME}.cpp)
294 add_valgrind_test(${TEST_NAME} VALGRIND ./${TEST_NAME})
295- target_link_libraries (${TEST_NAME} indicatortransferservice ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES})
296+ target_link_libraries (${TEST_NAME} indicator-transfer ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES})
297 endfunction()
298 add_valgrind_test_by_name(test-controller)
299 add_valgrind_test_by_name(test-multisource)
300@@ -38,7 +38,7 @@
301 set (TEST_NAME ${name})
302 add_executable (${TEST_NAME} ${TEST_NAME}.cpp)
303 add_test (${TEST_NAME} ${TEST_NAME})
304- target_link_libraries (${TEST_NAME} indicatortransferservice ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES})
305+ target_link_libraries (${TEST_NAME} indicator-transfer ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES})
306 endfunction()
307 add_test_by_name(test-view-gmenu)
308

Subscribers

People subscribed via source and target branches