1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2016-07-11 03:28:40 +0000
3
+++ CMakeLists.txt	2016-07-20 01:16:16 +0000
4
@@ -106,6 +106,7 @@
5
106
find_package(Qt5Core REQUIRED)
106
find_package(Qt5Core REQUIRED)
6
107
find_package(Qt5DBus REQUIRED)
107
find_package(Qt5DBus REQUIRED)
7
108
find_package(Qt5Network REQUIRED)
108
find_package(Qt5Network REQUIRED)
8
109
find_package(Qt5Test REQUIRED)
9
109
110
10
110
include(FindPkgConfig)
111
include(FindPkgConfig)
11
111
pkg_check_modules(APPARMOR_DEPS REQUIRED libapparmor)
112
pkg_check_modules(APPARMOR_DEPS REQUIRED libapparmor)
12
@@ -121,7 +122,7 @@
13
121
122
14
122
enable_coverage_report(
123
enable_coverage_report(
15
123
    TARGETS
124
    TARGETS
17
124
        qt-client-lib-public
125
        qt-client-lib-common
18
125
        storage-framework-qt-client
126
        storage-framework-qt-client
19
126
        storage-framework-qt-local-client
127
        storage-framework-qt-local-client
20
127
    FILTER
128
    FILTER
21
128
129
22
=== modified file 'debian/control'
23
--- debian/control	2016-07-12 02:22:05 +0000
24
+++ debian/control	2016-07-20 01:16:16 +0000
25
@@ -16,6 +16,7 @@
26
16
               libglib2.0-dev,
16
               libglib2.0-dev,
27
17
               libgtest-dev,
17
               libgtest-dev,
28
18
               libonline-accounts-qt-dev,
18
               libonline-accounts-qt-dev,
29
19
               libunity-api-dev,
30
19
               qtbase5-dev,
20
               qtbase5-dev,
31
20
               qtbase5-dev-tools,
21
               qtbase5-dev-tools,
32
21
Homepage: https://launchpad.net/storage-framework
22
Homepage: https://launchpad.net/storage-framework
33
22
23
34
=== modified file 'debian/source/format'
35
--- debian/source/format	2016-07-12 02:22:05 +0000
36
+++ debian/source/format	2016-07-20 01:16:16 +0000
37
@@ -1,1 +1,1 @@
39
1
3.0 (quilt)
1
1.0
40
2
2
41
=== modified file 'include/unity/storage/provider/UploadJob.h'
42
--- include/unity/storage/provider/UploadJob.h	2016-07-12 02:22:05 +0000
43
+++ include/unity/storage/provider/UploadJob.h	2016-07-20 01:16:16 +0000
44
@@ -30,7 +30,7 @@
45
30
namespace provider
30
namespace provider
46
31
{
31
{
47
32
32
49
33
class Item;
33
struct Item;
50
34
34
51
35
namespace internal
35
namespace internal
52
36
{
36
{
53
37
37
54
=== modified file 'include/unity/storage/provider/internal/Handler.h'
55
--- include/unity/storage/provider/internal/Handler.h	2016-07-12 02:22:05 +0000
56
+++ include/unity/storage/provider/internal/Handler.h	2016-07-20 01:16:16 +0000
57
@@ -34,7 +34,7 @@
58
34
namespace provider
34
namespace provider
59
35
{
35
{
60
36
36
62
37
class Context;
37
struct Context;
63
38
class ProviderBase;
38
class ProviderBase;
64
39
39
65
40
namespace internal
40
namespace internal
66
41
41
67
=== modified file 'include/unity/storage/qt/client/internal/boost_filesystem.h'
68
--- include/unity/storage/qt/client/internal/boost_filesystem.h	2016-07-12 02:22:05 +0000
69
+++ include/unity/storage/qt/client/internal/boost_filesystem.h	2016-07-20 01:16:16 +0000
70
@@ -20,7 +20,7 @@
71
20
20
72
21
#include <boost/version.hpp>
21
#include <boost/version.hpp>
73
22
22
75
23
#if BOOST_VERSION / 100000 == 1 && BOOST_VERSION / 100 & 1000 <= 55
23
#if BOOST_VERSION < 105500
76
24
    #define BOOST_NO_CXX11_SCOPED_ENUMS
24
    #define BOOST_NO_CXX11_SCOPED_ENUMS
77
25
    #include <boost/filesystem.hpp>
25
    #include <boost/filesystem.hpp>
78
26
    #undef BOOST_NO_CXX11_SCOPED_ENUMS
26
    #undef BOOST_NO_CXX11_SCOPED_ENUMS
79
27
27
80
=== modified file 'include/unity/storage/qt/client/internal/local_client/AccountImpl.h'
81
--- include/unity/storage/qt/client/internal/local_client/AccountImpl.h	2016-07-12 02:22:05 +0000
82
+++ include/unity/storage/qt/client/internal/local_client/AccountImpl.h	2016-07-20 01:16:16 +0000
83
@@ -51,7 +51,6 @@
84
51
    QString owner_id_;                        // Immutable
51
    QString owner_id_;                        // Immutable
85
52
    QString description_;                     // Immutable
52
    QString description_;                     // Immutable
86
53
    QVector<std::shared_ptr<Root>> roots_;    // Immutable
53
    QVector<std::shared_ptr<Root>> roots_;    // Immutable
87
54
    std::atomic_bool copy_in_progress_;
88
55
};
54
};
89
56
55
90
57
}  // namespace local_client
56
}  // namespace local_client
91
58
57
92
=== modified file 'include/unity/storage/qt/client/internal/local_client/ItemImpl.h'
93
--- include/unity/storage/qt/client/internal/local_client/ItemImpl.h	2016-07-12 02:22:05 +0000
94
+++ include/unity/storage/qt/client/internal/local_client/ItemImpl.h	2016-07-20 01:16:16 +0000
95
@@ -19,10 +19,9 @@
96
19
#pragma once
19
#pragma once
97
20
20
98
21
#include <unity/storage/common.h>
21
#include <unity/storage/common.h>
99
22
#include <unity/storage/qt/client/internal/boost_filesystem.h>
100
22
#include <unity/storage/qt/client/internal/ItemBase.h>
23
#include <unity/storage/qt/client/internal/ItemBase.h>
101
23
24
102
24
#include <boost/filesystem.hpp>
103
25
104
26
#include <mutex>
25
#include <mutex>
105
27
26
106
28
namespace unity
27
namespace unity
107
29
28
108
=== modified file 'include/unity/storage/qt/client/internal/remote_client/FileImpl.h'
109
--- include/unity/storage/qt/client/internal/remote_client/FileImpl.h	2016-07-12 02:22:05 +0000
110
+++ include/unity/storage/qt/client/internal/remote_client/FileImpl.h	2016-07-20 01:16:16 +0000
111
@@ -28,7 +28,7 @@
112
28
namespace internal
28
namespace internal
113
29
{
29
{
114
30
30
116
31
class ItemMetadata;
31
struct ItemMetadata;
117
32
32
118
33
}  // namespace internal
33
}  // namespace internal
119
34
34
120
35
35
121
=== modified file 'include/unity/storage/qt/client/internal/remote_client/Handler.h'
122
--- include/unity/storage/qt/client/internal/remote_client/Handler.h	2016-07-12 02:22:05 +0000
123
+++ include/unity/storage/qt/client/internal/remote_client/Handler.h	2016-07-20 01:16:16 +0000
124
@@ -44,8 +44,8 @@
125
44
public:
44
public:
126
45
    template<typename ... DBusArgs>
45
    template<typename ... DBusArgs>
127
46
    Handler(QObject* parent,
46
    Handler(QObject* parent,
130
47
            QDBusPendingReply<DBusArgs...> const& reply,
47
            QDBusPendingReply<DBusArgs...>& reply,
131
48
            std::function<void(decltype(reply) const&, QFutureInterface<T>&)> closure);
48
            std::function<void(decltype(reply)&, QFutureInterface<T>&)> closure);
132
49
49
133
50
    QFuture<T> future();
50
    QFuture<T> future();
134
51
51
135
@@ -53,12 +53,23 @@
136
53
    QFutureInterface<T> qf_;
53
    QFutureInterface<T> qf_;
137
54
};
54
};
138
55
55
139
56
// TODO: HACK: The reply argument really should be passed by const reference, which also
140
57
//             would make the explicit conversion of the call to QDBusPendingReply<QDBusArgs...>
141
58
//             unnecessary. But this doesn't work with gcc 4.9: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60420
142
59
//             Once we get rid of Vivid, this should be changed back to
143
60
//
144
61
//             Handler<T>::Handler(QObject* parent,
145
62
//                                 QDBusPendingReply<DBusArgs...> const& reply,
146
63
//                                 std::function<void(decltype(reply) const&, QFutureInterface<T>&)> closure)
147
64
148
56
template<typename T>
65
template<typename T>
149
57
template<typename ... DBusArgs>
66
template<typename ... DBusArgs>
151
58
Handler<T>::Handler(QObject* parent, QDBusPendingReply<DBusArgs...> const& reply, std::function<void(decltype(reply) const&, QFutureInterface<T>&)> closure)
67
Handler<T>::Handler(QObject* parent,
152
68
                    QDBusPendingReply<DBusArgs...>& reply,
153
69
                    std::function<void(decltype(reply)&, QFutureInterface<T>&)> closure)
154
59
    : HandlerBase(parent,
70
    : HandlerBase(parent,
155
60
                  reply,
71
                  reply,
157
61
                  [this, closure](QDBusPendingCallWatcher const& call)
72
                  [this, closure](QDBusPendingCallWatcher& call)
158
62
                      {
73
                      {
159
63
                          if (call.isError())
74
                          if (call.isError())
160
64
                          {
75
                          {
161
@@ -67,7 +78,9 @@
162
67
                              qf_.reportFinished();
78
                              qf_.reportFinished();
163
68
                              return;
79
                              return;
164
69
                          }
80
                          }
166
70
                          closure(call, qf_);
81
                          // TODO: See HACK above. Should just be closure(call, qf_);
167
82
                          QDBusPendingReply<DBusArgs...> r = call;
168
83
                          closure(r, qf_);
169
71
                      })
84
                      })
170
72
{
85
{
171
73
    qf_.reportStarted();
86
    qf_.reportStarted();
172
74
87
173
=== modified file 'include/unity/storage/qt/client/internal/remote_client/HandlerBase.h'
174
--- include/unity/storage/qt/client/internal/remote_client/HandlerBase.h	2016-07-12 02:22:05 +0000
175
+++ include/unity/storage/qt/client/internal/remote_client/HandlerBase.h	2016-07-20 01:16:16 +0000
176
@@ -47,9 +47,15 @@
177
47
    Q_OBJECT
47
    Q_OBJECT
178
48
48
179
49
public:
49
public:
180
50
    // TODO: HACK: gcc 4.9 bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60420
181
51
    //             Once we get rid of Vivid, this should be changed back to
182
52
    //
183
53
    //             HandlerBase(QObject* parent,
184
54
    //                         QDBusPendingCall const& call,
185
55
    //                         std::function<void(QDBusPendingCallWatcher const&)> const& closure);
186
50
    HandlerBase(QObject* parent,
56
    HandlerBase(QObject* parent,
189
51
                QDBusPendingCall const& call,
57
                QDBusPendingCall& call,
190
52
                std::function<void(QDBusPendingCallWatcher const&)> closure);
58
                std::function<void(QDBusPendingCallWatcher&)> const& closure);
191
53
59
192
54
public Q_SLOTS:
60
public Q_SLOTS:
193
55
    void finished(QDBusPendingCallWatcher* call);
61
    void finished(QDBusPendingCallWatcher* call);
194
@@ -58,7 +64,7 @@
195
58
    QDBusPendingCallWatcher watcher_;
64
    QDBusPendingCallWatcher watcher_;
196
59
65
197
60
private:
66
private:
199
61
    std::function<void(QDBusPendingCallWatcher const&)> closure_;
67
    std::function<void(QDBusPendingCallWatcher&)> closure_;
200
62
};
68
};
201
63
69
202
64
}  // namespace remote_client
70
}  // namespace remote_client
203
65
71
204
=== modified file 'include/unity/storage/qt/client/internal/remote_client/RootImpl.h'
205
--- include/unity/storage/qt/client/internal/remote_client/RootImpl.h	2016-07-12 02:22:05 +0000
206
+++ include/unity/storage/qt/client/internal/remote_client/RootImpl.h	2016-07-20 01:16:16 +0000
207
@@ -28,7 +28,7 @@
208
28
namespace internal
28
namespace internal
209
29
{
29
{
210
30
30
212
31
class ItemMetadata;
31
struct ItemMetadata;
213
32
32
214
33
}  // namespace internal
33
}  // namespace internal
215
34
34
216
35
35
217
=== modified file 'src/provider/CMakeLists.txt'
218
--- src/provider/CMakeLists.txt	2016-07-11 03:28:40 +0000
219
+++ src/provider/CMakeLists.txt	2016-07-20 01:16:16 +0000
220
@@ -11,6 +11,8 @@
221
11
set_source_files_properties(bus.xml PROPERTIES CLASSNAME BusInterface)
11
set_source_files_properties(bus.xml PROPERTIES CLASSNAME BusInterface)
222
12
qt5_add_dbus_interface(generated_files bus.xml businterface)
12
qt5_add_dbus_interface(generated_files bus.xml businterface)
223
13
13
224
14
set_source_files_properties(${generated_files} PROPERTIES GENERATED TRUE)
225
15
226
14
add_library(storage-framework-provider SHARED
16
add_library(storage-framework-provider SHARED
227
15
  DownloadJob.cpp
17
  DownloadJob.cpp
228
16
  ProviderBase.cpp
18
  ProviderBase.cpp
229
@@ -46,7 +48,6 @@
230
46
  SOVERSION ${SF_PROVIDER_SOVERSION}
48
  SOVERSION ${SF_PROVIDER_SOVERSION}
231
47
  VERSION ${SF_PROVIDER_LIBVERSION}
49
  VERSION ${SF_PROVIDER_LIBVERSION}
232
48
)
50
)
233
49
qt5_use_modules(storage-framework-provider Core DBus Network)
234
50
target_link_libraries(storage-framework-provider
51
target_link_libraries(storage-framework-provider
235
51
  Qt5::Core
52
  Qt5::Core
236
52
  Qt5::DBus
53
  Qt5::DBus
237
53
54
238
=== modified file 'src/provider/internal/dbusmarshal.cpp'
239
--- src/provider/internal/dbusmarshal.cpp	2016-07-12 02:22:05 +0000
240
+++ src/provider/internal/dbusmarshal.cpp	2016-07-20 01:16:16 +0000
241
@@ -51,7 +51,7 @@
242
51
    return argument;
51
    return argument;
243
52
}
52
}
244
53
53
246
54
QDBusArgument const& operator>>(QDBusArgument const& argument, Item& item)
54
QDBusArgument const& operator>>(QDBusArgument const&, Item&)
247
55
{
55
{
248
56
    throw std::runtime_error("Item decode not implemented");
56
    throw std::runtime_error("Item decode not implemented");
249
57
}
57
}
250
@@ -67,7 +67,7 @@
251
67
    return argument;
67
    return argument;
252
68
}
68
}
253
69
69
255
70
QDBusArgument const& operator>>(QDBusArgument const& argument, ItemList& items)
70
QDBusArgument const& operator>>(QDBusArgument const&, ItemList&)
256
71
{
71
{
257
72
    throw std::runtime_error("std::vector<Item> decode not implemented");
72
    throw std::runtime_error("std::vector<Item> decode not implemented");
258
73
}
73
}
259
74
74
260
=== modified file 'src/qt/client/CMakeLists.txt'
261
--- src/qt/client/CMakeLists.txt	2016-07-11 03:28:40 +0000
262
+++ src/qt/client/CMakeLists.txt	2016-07-20 01:16:16 +0000
263
@@ -1,4 +1,7 @@
265
1
add_library(qt-client-lib-public OBJECT
1
# Create an OBJECT library for the files that are used by both
266
2
# local and remote client libraries, so we don't compile them twice.
267
3
268
4
add_library(qt-client-lib-common OBJECT
269
2
    Account.cpp
5
    Account.cpp
270
3
    Downloader.cpp
6
    Downloader.cpp
271
4
    Exceptions.cpp
7
    Exceptions.cpp
272
@@ -19,61 +22,95 @@
273
19
    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/DownloaderBase.h
22
    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/DownloaderBase.h
274
20
    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/UploaderBase.h
23
    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/UploaderBase.h
275
21
)
24
)
284
22
target_include_directories(qt-client-lib-public PRIVATE
25
target_include_directories(qt-client-lib-common PRIVATE
285
23
  ${Qt5Core_INCLUDE_DIRS}
26
    ${Qt5Network_INCLUDE_DIRS}
286
24
  ${Qt5Network_INCLUDE_DIRS})
27
)
287
25
set_target_properties(qt-client-lib-public PROPERTIES
28
set_target_properties(qt-client-lib-common PROPERTIES
288
26
  AUTOMOC TRUE
29
    AUTOMOC TRUE
289
27
  POSITION_INDEPENDENT_CODE TRUE
30
    POSITION_INDEPENDENT_CODE TRUE
290
28
)
31
)
291
29
32
292
33
# We build both local and remote client libraries here instead
293
34
# of creating OBJECT libraries for them because cmake 3.0.2 (which
294
35
# is in the Vivid overlay) cannot handle .moc files in OBJECT libraries.
295
36
296
37
# Descend into the child directories first. The CMakeLists.txt files
297
38
# there set QT_CLIENT_LIB_LOCAL_SRC and QT_CLIENT_LIB_REMOTE_SRC.
298
30
add_subdirectory(internal)
39
add_subdirectory(internal)
299
31
40
300
32
# Build the local loopback client library
41
# Build the local loopback client library
301
33
add_library(storage-framework-qt-local-client SHARED
42
add_library(storage-framework-qt-local-client SHARED
305
34
  $<TARGET_OBJECTS:qt-client-lib-public>
43
    $<TARGET_OBJECTS:qt-client-lib-common>
306
35
  $<TARGET_OBJECTS:qt-client-lib-local>)
44
    ${QT_CLIENT_LIB_LOCAL_SRC}
307
36
qt5_use_modules(storage-framework-qt-local-client Concurrent Core Network)
45
)
308
46
target_include_directories(storage-framework-qt-local-client PRIVATE
309
47
    ${GLIB_DEPS_INCLUDE_DIRS}
310
48
    ${Qt5Core_INCLUDE_DIRS}
311
49
    ${Qt5Network_INCLUDE_DIRS}
312
50
    ${Qt5Concurrent_INCLUDE_DIRS}
313
51
)
314
37
set_target_properties(storage-framework-qt-local-client PROPERTIES
52
set_target_properties(storage-framework-qt-local-client PROPERTIES
320
38
  AUTOMOC TRUE
53
    AUTOMOC TRUE
321
39
  LINK_FLAGS "-Wl,--no-undefined"
54
    POSITION_INDEPENDENT_CODE TRUE
322
40
  OUTPUT_NAME "storage-framework-qt-local-client-${SF_CLIENT_API_VERSION}"
55
    LINK_FLAGS "-Wl,--no-undefined"
323
41
  SOVERSION ${SF_CLIENT_SOVERSION}
56
    OUTPUT_NAME "storage-framework-qt-local-client-${SF_CLIENT_API_VERSION}"
324
42
  VERSION ${SF_CLIENT_LIBVERSION}
57
    SOVERSION ${SF_CLIENT_SOVERSION}
325
58
    VERSION ${SF_CLIENT_LIBVERSION}
326
43
)
59
)
327
44
target_link_libraries(storage-framework-qt-local-client
60
target_link_libraries(storage-framework-qt-local-client
328
45
    Qt5::Concurrent
61
    Qt5::Concurrent
329
46
    Qt5::Core
62
    Qt5::Core
330
47
    Qt5::Network
63
    Qt5::Network
331
48
    ${Boost_LIBRARIES}
64
    ${Boost_LIBRARIES}
334
49
    ${GLIB_DEPS_LIBRARIES})
65
    ${GLIB_DEPS_LIBRARIES}
335
50
66
)
336
51
install(
67
install(
339
52
  TARGETS storage-framework-qt-local-client
68
    TARGETS storage-framework-qt-local-client
340
53
  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
69
    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
341
54
)
70
)
342
55
71
343
56
configure_file(
72
configure_file(
346
57
  storage-framework-qt-local-client.pc.in
73
    storage-framework-qt-local-client.pc.in
347
58
  storage-framework-qt-local-client-${SF_CLIENT_API_VERSION}.pc
74
    storage-framework-qt-local-client-${SF_CLIENT_API_VERSION}.pc
348
59
)
75
)
349
60
install(
76
install(
352
61
  FILES ${CMAKE_CURRENT_BINARY_DIR}/storage-framework-qt-local-client-${SF_CLIENT_API_VERSION}.pc
77
    FILES ${CMAKE_CURRENT_BINARY_DIR}/storage-framework-qt-local-client-${SF_CLIENT_API_VERSION}.pc
353
62
  DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
78
    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
354
63
)
79
)
355
64
80
356
65
# Build the remote client library
81
# Build the remote client library
357
82
set_source_files_properties(${CMAKE_SOURCE_DIR}/data/provider.xml PROPERTIES
358
83
    CLASSNAME ProviderInterface
359
84
    INCLUDE unity/storage/qt/client/internal/remote_client/dbusmarshal.h
360
85
)
361
86
362
87
qt5_add_dbus_interface(generated_files
363
88
    ${CMAKE_SOURCE_DIR}/data/provider.xml
364
89
    ProviderInterface
365
90
)
366
91
set_source_files_properties(${generated_files} PROPERTIES
367
92
    COMPILE_FLAGS -Wno-ctor-dtor-privacy
368
93
    GENERATED TRUE
369
94
)
370
66
95
371
67
add_library(storage-framework-qt-client SHARED
96
add_library(storage-framework-qt-client SHARED
375
68
    $<TARGET_OBJECTS:qt-client-lib-public>
97
    $<TARGET_OBJECTS:qt-client-lib-common>
376
69
    $<TARGET_OBJECTS:qt-client-lib-remote>)
98
    ${QT_CLIENT_LIB_REMOTE_SRC}
377
70
qt5_use_modules(storage-framework-qt-client Core DBus Network)
99
    ${generated_files}
378
100
)
379
101
target_include_directories(storage-framework-qt-client PRIVATE
380
102
    ${GLIB_DEPS_INCLUDE_DIRS}
381
103
    ${ONLINEACCOUNTS_DEPS_INCLUDE_DIRS}
382
104
    ${Qt5Core_INCLUDE_DIRS}
383
105
    ${Qt5DBus_INCLUDE_DIRS}
384
106
    ${Qt5Network_INCLUDE_DIRS}
385
107
)
386
71
set_target_properties(storage-framework-qt-client PROPERTIES
108
set_target_properties(storage-framework-qt-client PROPERTIES
392
72
  AUTOMOC TRUE
109
    AUTOMOC TRUE
393
73
  LINK_FLAGS "-Wl,--no-undefined"
110
    LINK_FLAGS "-Wl,--no-undefined"
394
74
  OUTPUT_NAME "storage-framework-qt-client-${SF_CLIENT_API_VERSION}"
111
    OUTPUT_NAME "storage-framework-qt-client-${SF_CLIENT_API_VERSION}"
395
75
  SOVERSION ${SF_CLIENT_SOVERSION}
112
    SOVERSION ${SF_CLIENT_SOVERSION}
396
76
  VERSION ${SF_CLIENT_LIBVERSION}
113
    VERSION ${SF_CLIENT_LIBVERSION}
397
77
)
114
)
398
78
target_link_libraries(storage-framework-qt-client
115
target_link_libraries(storage-framework-qt-client
399
79
    Qt5::Concurrent
116
    Qt5::Concurrent
400
@@ -81,18 +118,18 @@
401
81
    Qt5::DBus
118
    Qt5::DBus
402
82
    Qt5::Network
119
    Qt5::Network
403
83
    ${Boost_LIBRARIES}
120
    ${Boost_LIBRARIES}
406
84
    ${ONLINEACCOUNTS_DEPS_LDFLAGS})
121
    ${ONLINEACCOUNTS_DEPS_LDFLAGS}
407
85
122
)
408
86
install(
123
install(
411
87
  TARGETS storage-framework-qt-client
124
    TARGETS storage-framework-qt-client
412
88
  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
125
    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
413
89
)
126
)
414
90
127
415
91
configure_file(
128
configure_file(
418
92
  storage-framework-qt-client.pc.in
129
    storage-framework-qt-client.pc.in
419
93
  storage-framework-qt-client-${SF_CLIENT_API_VERSION}.pc
130
    storage-framework-qt-client-${SF_CLIENT_API_VERSION}.pc
420
94
)
131
)
421
95
install(
132
install(
424
96
  FILES ${CMAKE_CURRENT_BINARY_DIR}/storage-framework-qt-client-${SF_CLIENT_API_VERSION}.pc
133
    FILES ${CMAKE_CURRENT_BINARY_DIR}/storage-framework-qt-client-${SF_CLIENT_API_VERSION}.pc
425
97
  DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
134
    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
426
98
)
135
)
427
99
136
428
=== modified file 'src/qt/client/internal/CMakeLists.txt'
429
--- src/qt/client/internal/CMakeLists.txt	2016-06-22 04:51:19 +0000
430
+++ src/qt/client/internal/CMakeLists.txt	2016-07-20 01:16:16 +0000
431
@@ -1,2 +1,5 @@
432
1
add_subdirectory(local_client)
1
add_subdirectory(local_client)
433
2
add_subdirectory(remote_client)
2
add_subdirectory(remote_client)
434
3
435
4
SET(QT_CLIENT_LIB_REMOTE_SRC ${QT_CLIENT_LIB_REMOTE_SRC} PARENT_SCOPE)
436
5
SET(QT_CLIENT_LIB_LOCAL_SRC ${QT_CLIENT_LIB_LOCAL_SRC} PARENT_SCOPE)
437
3
6
438
=== modified file 'src/qt/client/internal/local_client/CMakeLists.txt'
439
--- src/qt/client/internal/local_client/CMakeLists.txt	2016-07-11 02:55:24 +0000
440
+++ src/qt/client/internal/local_client/CMakeLists.txt	2016-07-20 01:16:16 +0000
441
@@ -1,24 +1,16 @@
465
1
add_library(qt-client-lib-local OBJECT
1
set(QT_CLIENT_LIB_LOCAL_SRC
466
2
    AccountImpl.cpp
2
        ${CMAKE_CURRENT_SOURCE_DIR}/AccountImpl.cpp
467
3
    DownloaderImpl.cpp
3
        ${CMAKE_CURRENT_SOURCE_DIR}/DownloaderImpl.cpp
468
4
    FileImpl.cpp
4
        ${CMAKE_CURRENT_SOURCE_DIR}/FileImpl.cpp
469
5
    FolderImpl.cpp
5
        ${CMAKE_CURRENT_SOURCE_DIR}/FolderImpl.cpp
470
6
    ItemImpl.cpp
6
        ${CMAKE_CURRENT_SOURCE_DIR}/ItemImpl.cpp
471
7
    RootImpl.cpp
7
        ${CMAKE_CURRENT_SOURCE_DIR}/RootImpl.cpp
472
8
    Runtime_create.cpp
8
        ${CMAKE_CURRENT_SOURCE_DIR}/Runtime_create.cpp
473
9
    RuntimeImpl.cpp
9
        ${CMAKE_CURRENT_SOURCE_DIR}/RuntimeImpl.cpp
474
10
    UploaderImpl.cpp
10
        ${CMAKE_CURRENT_SOURCE_DIR}/UploaderImpl.cpp
475
11
    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/local_client/DownloaderImpl.h
11
        ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/local_client/DownloaderImpl.h
476
12
    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/local_client/UploaderImpl.h
12
        ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/local_client/UploaderImpl.h
477
13
    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/local_client/RuntimeImpl.h
13
        ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/local_client/RuntimeImpl.h
478
14
    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/RuntimeBase.h
14
        ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/RuntimeBase.h
479
15
)
15
    PARENT_SCOPE
457
16
target_include_directories(qt-client-lib-local PRIVATE
458
17
  ${GLIB_DEPS_INCLUDE_DIRS}
459
18
  ${Qt5Core_INCLUDE_DIRS}
460
19
  ${Qt5Network_INCLUDE_DIRS}
461
20
  ${Qt5Concurrent_INCLUDE_DIRS})
462
21
set_target_properties(qt-client-lib-local PROPERTIES
463
22
  AUTOMOC TRUE
464
23
  POSITION_INDEPENDENT_CODE TRUE
480
24
)
16
)
481
25
17
482
=== modified file 'src/qt/client/internal/remote_client/CMakeLists.txt'
483
--- src/qt/client/internal/remote_client/CMakeLists.txt	2016-07-11 05:42:50 +0000
484
+++ src/qt/client/internal/remote_client/CMakeLists.txt	2016-07-20 01:16:16 +0000
485
@@ -1,36 +1,15 @@
522
1
set_source_files_properties(${CMAKE_SOURCE_DIR}/data/provider.xml PROPERTIES
1
set(QT_CLIENT_LIB_REMOTE_SRC
523
2
  CLASSNAME ProviderInterface
2
        ${CMAKE_CURRENT_SOURCE_DIR}/AccountImpl.cpp
524
3
  INCLUDE unity/storage/qt/client/internal/remote_client/dbusmarshal.h)
3
        ${CMAKE_CURRENT_SOURCE_DIR}/dbusmarshal.cpp
525
4
4
        ${CMAKE_CURRENT_SOURCE_DIR}/DownloaderImpl.cpp
526
5
qt5_add_dbus_interface(generated_files
5
        ${CMAKE_CURRENT_SOURCE_DIR}/FileImpl.cpp
527
6
    ${CMAKE_SOURCE_DIR}/data/provider.xml
6
        ${CMAKE_CURRENT_SOURCE_DIR}/FolderImpl.cpp
528
7
    ProviderInterface)
7
        ${CMAKE_CURRENT_SOURCE_DIR}/HandlerBase.cpp
529
8
set_source_files_properties(${generated_files} PROPERTIES COMPILE_FLAGS -Wno-ctor-dtor-privacy)
8
        ${CMAKE_CURRENT_SOURCE_DIR}/ItemImpl.cpp
530
9
9
        ${CMAKE_CURRENT_SOURCE_DIR}/RootImpl.cpp
531
10
add_library(qt-client-lib-remote OBJECT
10
        ${CMAKE_CURRENT_SOURCE_DIR}/Runtime_create.cpp
532
11
    AccountImpl.cpp
11
        ${CMAKE_CURRENT_SOURCE_DIR}/RuntimeImpl.cpp
533
12
    dbusmarshal.cpp
12
        ${CMAKE_CURRENT_SOURCE_DIR}/UploaderImpl.cpp
534
13
    DownloaderImpl.cpp
13
        ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/remote_client/HandlerBase.h
535
14
    FileImpl.cpp
14
        ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/remote_client/RuntimeImpl.h
536
15
    FolderImpl.cpp
15
    PARENT_SCOPE)
501
16
    HandlerBase.cpp
502
17
    ItemImpl.cpp
503
18
    RootImpl.cpp
504
19
    Runtime_create.cpp
505
20
    RuntimeImpl.cpp
506
21
    UploaderImpl.cpp
507
22
    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/remote_client/HandlerBase.h
508
23
    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/remote_client/RuntimeImpl.h
509
24
    ${generated_files}
510
25
)
511
26
target_include_directories(qt-client-lib-remote PRIVATE
512
27
  ${GLIB_DEPS_INCLUDE_DIRS}
513
28
  ${ONLINEACCOUNTS_DEPS_INCLUDE_DIRS}
514
29
  ${Qt5Core_INCLUDE_DIRS}
515
30
  ${Qt5DBus_INCLUDE_DIRS}
516
31
  ${Qt5Network_INCLUDE_DIRS}
517
32
  )
518
33
set_target_properties(qt-client-lib-remote PROPERTIES
519
34
  AUTOMOC TRUE
520
35
  POSITION_INDEPENDENT_CODE TRUE
521
36
)
537
37
16
538
=== modified file 'src/qt/client/internal/remote_client/FileImpl.cpp'
539
--- src/qt/client/internal/remote_client/FileImpl.cpp	2016-07-12 02:22:05 +0000
540
+++ src/qt/client/internal/remote_client/FileImpl.cpp	2016-07-20 01:16:16 +0000
541
@@ -91,8 +91,10 @@
542
91
        return make_exceptional_future<shared_ptr<Downloader>>(DeletedException());
91
        return make_exceptional_future<shared_ptr<Downloader>>(DeletedException());
543
92
    }
92
    }
544
93
93
547
94
    auto process_create_downloader_reply = [this](QDBusPendingReply<QString, QDBusUnixFileDescriptor> const& reply,
94
    auto reply = provider().Download(md_.item_id);
548
95
                                                  QFutureInterface<std::shared_ptr<Downloader>>& qf)
95
549
96
    auto process_reply = [this](QDBusPendingReply<QString, QDBusUnixFileDescriptor> const& reply,
550
97
                                QFutureInterface<std::shared_ptr<Downloader>>& qf)
551
96
    {
98
    {
552
97
        auto download_id = reply.argumentAt<0>();
99
        auto download_id = reply.argumentAt<0>();
553
98
        auto fd = reply.argumentAt<1>();
100
        auto fd = reply.argumentAt<1>();
554
@@ -108,9 +110,7 @@
555
108
        }
110
        }
556
109
    };
111
    };
557
110
112
561
111
    auto handler = new Handler<shared_ptr<Downloader>>(this,
113
    auto handler = new Handler<shared_ptr<Downloader>>(this, reply, process_reply);
559
112
                                                       provider().Download(md_.item_id),
560
113
                                                       process_create_downloader_reply);
562
114
    return handler->future();
114
    return handler->future();
563
115
}
115
}
564
116
116
565
117
117
566
=== modified file 'src/qt/client/internal/remote_client/HandlerBase.cpp'
567
--- src/qt/client/internal/remote_client/HandlerBase.cpp	2016-07-12 02:22:05 +0000
568
+++ src/qt/client/internal/remote_client/HandlerBase.cpp	2016-07-20 01:16:16 +0000
569
@@ -41,8 +41,8 @@
570
41
{
41
{
571
42
42
572
43
HandlerBase::HandlerBase(QObject* parent,
43
HandlerBase::HandlerBase(QObject* parent,
575
44
                         QDBusPendingCall const& call,
44
                         QDBusPendingCall& call,
576
45
                         function<void(QDBusPendingCallWatcher const&)> closure)
45
                         function<void(QDBusPendingCallWatcher&)> const& closure)
577
46
    : QObject(parent)
46
    : QObject(parent)
578
47
    , watcher_(call)
47
    , watcher_(call)
579
48
    , closure_(closure)
48
    , closure_(closure)
580
49
49
581
=== modified file 'tests/local-client/CMakeLists.txt'
582
--- tests/local-client/CMakeLists.txt	2016-06-22 04:51:19 +0000
583
+++ tests/local-client/CMakeLists.txt	2016-07-20 01:16:16 +0000
584
@@ -4,9 +4,9 @@
585
4
add_definitions(-DTEST_DIR="${CMAKE_CURRENT_BINARY_DIR}")
4
add_definitions(-DTEST_DIR="${CMAKE_CURRENT_BINARY_DIR}")
586
5
include_directories(${GLIB_DEPS_INCLUDE_DIRS})
5
include_directories(${GLIB_DEPS_INCLUDE_DIRS})
587
6
6
588
7
qt5_use_modules(local-client_test Test)
589
8
target_link_libraries(local-client_test
7
target_link_libraries(local-client_test
590
9
    storage-framework-qt-local-client
8
    storage-framework-qt-local-client
591
9
    Qt5::Test
592
10
    gtest
10
    gtest
593
11
)
11
)
594
12
add_test(local-client local-client_test)
12
add_test(local-client local-client_test)
595
13
13
596
=== modified file 'tests/local-client/local-client_test.cpp'
597
--- tests/local-client/local-client_test.cpp	2016-07-12 02:22:05 +0000
598
+++ tests/local-client/local-client_test.cpp	2016-07-20 01:16:16 +0000
599
@@ -18,7 +18,8 @@
600
18
18
601
19
#include <unity/storage/qt/client/client-api.h>
19
#include <unity/storage/qt/client/client-api.h>
602
20
20
604
21
#include <boost/filesystem.hpp>
21
#include <unity/storage/qt/client/internal/boost_filesystem.h>
605
22
606
22
#include <gtest/gtest.h>
23
#include <gtest/gtest.h>
607
23
#include <QCoreApplication>
24
#include <QCoreApplication>
608
24
#include <QFile>
25
#include <QFile>
609
25
26
610
=== modified file 'tests/remote-client/CMakeLists.txt'
611
--- tests/remote-client/CMakeLists.txt	2016-06-22 04:51:19 +0000
612
+++ tests/remote-client/CMakeLists.txt	2016-07-20 01:16:16 +0000
613
@@ -4,7 +4,6 @@
614
4
add_definitions(-DTEST_DIR="${CMAKE_CURRENT_BINARY_DIR}")
4
add_definitions(-DTEST_DIR="${CMAKE_CURRENT_BINARY_DIR}")
615
5
include_directories(${GLIB_DEPS_INCLUDE_DIRS})
5
include_directories(${GLIB_DEPS_INCLUDE_DIRS})
616
6
6
617
7
qt5_use_modules(remote-client_test Test)
618
8
target_link_libraries(remote-client_test
7
target_link_libraries(remote-client_test
619
9
    storage-framework-qt-client
8
    storage-framework-qt-client
620
10
    Qt5::Network
9
    Qt5::Network
Status:	Merged
Approved by:	James Henstridge on 2016-07-20
Approved revision:	39
Merged at revision:	25
Proposed branch:	lp:~michihenning/storage-framework/qt-cmake-fixes
Merge into:	lp:storage-framework/devel
Diff against target:	620 lines (+162/-131) 23 files modified CMakeLists.txt (+2/-1) debian/control (+1/-0) debian/source/format (+1/-1) include/unity/storage/provider/UploadJob.h (+1/-1) include/unity/storage/provider/internal/Handler.h (+1/-1) include/unity/storage/qt/client/internal/boost_filesystem.h (+1/-1) include/unity/storage/qt/client/internal/local_client/AccountImpl.h (+0/-1) include/unity/storage/qt/client/internal/local_client/ItemImpl.h (+1/-2) include/unity/storage/qt/client/internal/remote_client/FileImpl.h (+1/-1) include/unity/storage/qt/client/internal/remote_client/Handler.h (+18/-5) include/unity/storage/qt/client/internal/remote_client/HandlerBase.h (+9/-3) include/unity/storage/qt/client/internal/remote_client/RootImpl.h (+1/-1) src/provider/CMakeLists.txt (+2/-1) src/provider/internal/dbusmarshal.cpp (+2/-2) src/qt/client/CMakeLists.txt (+78/-41) src/qt/client/internal/CMakeLists.txt (+3/-0) src/qt/client/internal/local_client/CMakeLists.txt (+15/-23) src/qt/client/internal/remote_client/CMakeLists.txt (+15/-36) src/qt/client/internal/remote_client/FileImpl.cpp (+5/-5) src/qt/client/internal/remote_client/HandlerBase.cpp (+2/-2) tests/local-client/CMakeLists.txt (+1/-1) tests/local-client/local-client_test.cpp (+2/-1) tests/remote-client/CMakeLists.txt (+0/-1)
To merge this branch:	bzr merge lp:~michihenning/storage-framework/qt-cmake-fixes
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
James Henstridge		2016-07-12	Approve on 2016-07-20
unity-api-1-bot	continuous-integration		Needs Fixing on 2016-07-13
Review via email: mp+299767@code.launchpad.net