Merge lp:~mvo/unity-scope-click/libclick into lp:unity-scope-click/devel

[Michael Vogt]

This branch adds libclick as a build/runtime dependency to unity-scope-click. For now it only uses it to get the installed frameworks. But eventually we can use it to e.g. get the list of installed click apps (bug #1292645).

Thanks,
 Michael

Unmerged revisions

223. By Michael Vogt on 2014-05-19

use libclick instead of using list_folder() to get available frameworks

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-06 17:24:10 +0000
+++ debian/changelog	2014-05-19 09:27:46 +0000
@@ -1,3 +1,18 @@
+unity-scope-click (0.1+14.10.20140508.1-0ubuntu1) utopic; urgency=low
+
+  [ Ubuntu daily release ]
+  * New rebuild forced
+
+  [ Rodney Dawes ]
+  * Support for translations of installed apps. (LP: #1237992) Fix
+    translations not being installed. (LP: #1316802) Fix merge of
+    translations to clickscope.ini. (LP: #1316778) Strip full path from
+    translations and template. (LP: #1316777) Enable submission of
+    reviews from the installed preview. (LP: #1237992, #1316777,
+    #1316802, #1316778)
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 08 May 2014 18:24:59 +0000
+
 unity-scope-click (0.1+14.10.20140506-0ubuntu1) utopic; urgency=low
 
   [ Alejandro J. Cura ]

=== modified file 'debian/control'
--- debian/control	2014-05-16 13:09:36 +0000
+++ debian/control	2014-05-19 09:27:46 +0000
@@ -6,6 +6,7 @@
                dh-translations,
                google-mock,
                intltool,
+               libclick-0.4-dev,
                libglib2.0-dev (>= 2.32),
                libjsoncpp-dev,
                libubuntu-download-manager-client-dev (>= 0.3+14.10.20140430-0ubuntu1),

=== modified file 'debian/tests/control'
--- debian/tests/control	2013-12-17 17:56:49 +0000
+++ debian/tests/control	2014-05-19 09:27:46 +0000
@@ -5,6 +5,7 @@
  dh-autoreconf,
  gnome-common,
  libaccounts-glib-dev,
+ libclick-0.4-dev,
  libdee-dev (>= 1.2.5),
  libgee-dev,
  libglib2.0-dev (>= 2.32),

=== modified file 'scope/click/CMakeLists.txt'
--- scope/click/CMakeLists.txt	2014-05-13 19:32:29 +0000
+++ scope/click/CMakeLists.txt	2014-05-19 09:27:46 +0000
@@ -2,6 +2,7 @@
 SET (CMAKE_AUTOMOC ON)
 find_package (Qt5Core REQUIRED)
 pkg_check_modules(JSON_CPP REQUIRED jsoncpp)
+pkg_check_modules(CLICK REQUIRED click-0.4)
 
 add_definitions(
   -DGETTEXT_PACKAGE=\"${PROJECT_NAME}\"
@@ -28,15 +29,27 @@
 )
 
 include_directories(
+<<<<<<< TREE
   ${CMAKE_SOURCE_DIR}/libclickscope
   ${JSON_CPP_INCLUDE_DIRS}
 )
+=======
+    ${CLICK_INCLUDE_DIRS}
+    ${JSON_CPP_INCLUDE_DIRS}
+    ${LIBURL_DISPATCHER_INCLUDE_DIRS})
+
+link_directories(${LIBURL_DISPATCHER_LIBRARY_DIRS})
+>>>>>>> MERGE-SOURCE
 
 qt5_use_modules (${SCOPE_LIB_UNVERSIONED} Network)
 
 target_link_libraries (${SCOPE_LIB_UNVERSIONED}
+<<<<<<< TREE
   -L${CMAKE_BINARY_DIR}/libclickscope
   ${SCOPE_LIB_NAME}
+=======
+  ${CLICK_LDFLAGS}
+>>>>>>> MERGE-SOURCE
   ${JSON_CPP_LDFLAGS}
   ${UNITY_SCOPES_LDFLAGS}
   ${UBUNTUONE_LDFLAGS}

=== modified file 'scope/click/configuration.cpp'
--- scope/click/configuration.cpp	2014-05-01 21:04:23 +0000
+++ scope/click/configuration.cpp	2014-05-19 09:27:46 +0000
@@ -27,6 +27,10 @@
  * files in the program, then also delete it here.
  */
 
+#include <glib-2.0/glib.h>
+#include <click-0.4/click.h>
+
+
 #include <string>
 #include <vector>
 
@@ -57,10 +61,20 @@
 
 std::vector<std::string> Configuration::get_available_frameworks()
 {
+    GList *l = nullptr;
+    GList *frameworks = l = click_framework_get_frameworks();
+
     std::vector<std::string> result;
-    for (auto f: list_folder(FRAMEWORKS_FOLDER, FRAMEWORKS_PATTERN)) {
-        result.push_back(f.substr(0, f.size()-FRAMEWORKS_EXTENSION_LENGTH));
+    while (l != nullptr) {
+        gchar *framework_name = nullptr;
+        GObject *framework = (GObject *)l->data;
+        g_object_get(framework, "name", &framework_name, nullptr);
+        result.push_back(framework_name);
+        l = g_list_next(l);
+        g_free(framework_name);
     }
+    g_list_free_full(frameworks, g_object_unref);
+
     return result;
 }
 

=== modified file 'scope/click/configuration.h'
--- scope/click/configuration.h	2014-05-01 21:04:23 +0000
+++ scope/click/configuration.h	2014-05-19 09:27:46 +0000
@@ -39,9 +39,6 @@
 class Configuration
 {
 public:
-    constexpr static const char* FRAMEWORKS_FOLDER {"/usr/share/click/frameworks/"};
-    constexpr static const char* FRAMEWORKS_PATTERN {"*.framework"};
-    constexpr static const int FRAMEWORKS_EXTENSION_LENGTH = 10; // strlen(".framework")
     constexpr static const char* LANGUAGE_ENVVAR {"LANGUAGE"};
 
     virtual std::vector<std::string> get_available_frameworks();

=== modified file 'scope/tests/test_configuration.cpp'
--- scope/tests/test_configuration.cpp	2014-05-01 21:04:23 +0000
+++ scope/tests/test_configuration.cpp	2014-05-19 09:27:46 +0000
@@ -46,50 +46,10 @@
 
 }
 
-
-TEST(Configuration, getAvailableFrameworksUsesRightFolder)
-{
-    using namespace ::testing;
-    FakeConfiguration locator;
-    EXPECT_CALL(locator, list_folder(Configuration::FRAMEWORKS_FOLDER, _))
-            .Times(1).WillOnce(Return(std::vector<std::string>()));
-    locator.get_available_frameworks();
-}
-
-TEST(Configuration, getAvailableFrameworksUsesRightPattern)
-{
-    using namespace ::testing;
-    FakeConfiguration locator;
-    EXPECT_CALL(locator, list_folder(_, Configuration::FRAMEWORKS_PATTERN))
-            .Times(1).WillOnce(Return(std::vector<std::string>()));
-    locator.get_available_frameworks();
-}
-
-TEST(Configuration, getAvailableFrameworksTwoResults)
-{
-    using namespace ::testing;
-
-    FakeConfiguration locator;
-    std::vector<std::string> response = {"abc.framework", "def.framework"};
-    EXPECT_CALL(locator, list_folder(_, _))
-            .Times(1)
-            .WillOnce(Return(response));
-    auto frameworks = locator.get_available_frameworks();
-    std::vector<std::string> expected = {"abc", "def"};
-    EXPECT_EQ(expected, frameworks);
-}
-
-TEST(Configuration, getAvailableFrameworksNoResults)
-{
-    using namespace ::testing;
-
-    FakeConfiguration locator;
-    std::vector<std::string> response = {};
-    EXPECT_CALL(locator, list_folder(_, _))
-            .Times(1)
-            .WillOnce(Return(response));
-    auto frameworks = locator.get_available_frameworks();
-    EXPECT_EQ(0, frameworks.size());
+TEST(Configuration, getAvailableFrameworksSmokeTest)
+{
+    FakeConfiguration locator;
+    std::vector<std::string> frameworks = locator.get_available_frameworks();
 }
 
 TEST(Configuration, getLanguageCorrect)