Keeper

Merge lp:~charlesk/keeper/remove-click into lp:keeper/devel

remove-click
Merge into devel

Proposed by Charles Kerr on 2017-01-11

Status:	Needs review
Proposed branch:	lp:~charlesk/keeper/remove-click
Merge into:	lp:keeper/devel
Prerequisite:	lp:~unity-api-team/keeper/sf-errors-dbus-interface
Diff against target:	302 lines (+25/-100) 9 files modified CMakeLists.txt (+1/-5) debian/control (+0/-4) src/helper/CMakeLists.txt (+0/-1) src/service/backup-choices.cpp (+0/-66) tests/integration/helpers/CMakeLists.txt (+0/-5) tests/integration/helpers/test-helpers-base.cpp (+12/-10) tests/unit/manifest/manifest-test.cpp (+4/-3) tests/unit/storage-framework/create-uploader-test.cpp (+4/-3) tests/unit/storage-framework/folders-test.cpp (+4/-3)
To merge this branch:	bzr merge lp:~charlesk/keeper/remove-click
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
dobey (community)			Needs Fixing on 2017-02-27
Xavi Garcia (community)		2017-01-11	Approve on 2017-01-12
unity-api-1-bot	continuous-integration		Approve on 2017-01-11
Review via email: mp+314500@code.launchpad.net

Commit message

remove click, glib, properties-cpp dependencies

Description of the change

remove dependencies:
* click: dropping click support
* glib - unused except for trivial g_setenv() and g_unsetenv() calls
* properties-cpp: no longer used

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2017-01-11:

FAILED: Continuous integration, rev:140
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/166/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1340/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1347
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1125/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1125/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1125/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1125/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1125/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1125/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/166/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2017-01-11:

FAILED: Continuous integration, rev:140
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/169/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1343/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1350
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1128/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1128/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1128/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1128/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1128/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1128/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/169/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Xavi Garcia (xavi-garcia-mena) wrote on 2017-01-11:

Not sure why Jenkins is not happy about the branch.
In some builds I don't see a clear reason.

This is what amd64/zesty complains about:
/usr/bin/ld: cannot find -lpthread

Aside from that the branch looks good to me.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2017-01-11:

FAILED: Continuous integration, rev:
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/170/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1345/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1352
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1130/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1130/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1130/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1130/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1130/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1130/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/170/rebuild

review: Needs Fixing (continuous-integration)

lp:~charlesk/keeper/remove-click updated on 2017-01-11

141. By Charles Kerr on 2017-01-11: remove properties-cpp from dependencies; we don't use it
142. By Charles Kerr on 2017-01-11: remove glib from dendencies; we don't use it

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2017-01-11:

FAILED: Continuous integration, rev:
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/171/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1346/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1353
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1131/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1131/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1131/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1131/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1131/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1131/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/171/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2017-01-11:

FAILED: Continuous integration, rev:142
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/172/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1347/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1354
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1132/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1132/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1132/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1132/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1132/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1132/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/172/rebuild

review: Needs Fixing (continuous-integration)

lp:~charlesk/keeper/remove-click updated on 2017-01-11

143. By Charles Kerr on 2017-01-11: finish r140 by removing click from pkg-config invocation

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2017-01-11:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/173/rebuild

review: Approve (continuous-integration)

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2017-01-11:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/174/rebuild

review: Approve (continuous-integration)

lp:~charlesk/keeper/remove-click updated on 2017-01-11

144. By Charles Kerr on 2017-01-11: remove other unused dependencies

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2017-01-11:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/175/rebuild

review: Approve (continuous-integration)

Revision history for this message

Xavi Garcia (xavi-garcia-mena) wrote on 2017-01-12:

Good clean up! Looks good to me

review: Approve

Revision history for this message

dobey (dobey) on 2017-02-27:

review: Needs Fixing

Unmerged revisions

144. By Charles Kerr on 2017-01-11: remove other unused dependencies
143. By Charles Kerr on 2017-01-11: finish r140 by removing click from pkg-config invocation
142. By Charles Kerr on 2017-01-11: remove glib from dendencies; we don't use it
141. By Charles Kerr on 2017-01-11: remove properties-cpp from dependencies; we don't use it
140. By Charles Kerr on 2017-01-04: remove libclick use
139. By Charles Kerr on 2017-01-04: remove json-glib dependency

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Charles Kerr

Unity API Team

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2017-01-11 20:31:15 +0000
 +++ CMakeLists.txt	2017-01-11 20:31:16 +0000
@@ -54,7 +54,7 @@
  ##  Toolkits
  ##
--find_package(Threads REQUIRED)
++#find_package(Threads REQUIRED)
  set(CMAKE_AUTOMOC ON)
  set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -79,10 +79,6 @@
  find_package(PkgConfig REQUIRED)
  pkg_check_modules(SERVICE_DEPS REQUIRED
--    click-0.4>=0.4.30
--    glib-2.0
--    gobject-2.0
--    json-glib-1.0
      libarchive>=3.1.2
      uuid>=2.25
+ )
 === modified file 'debian/control'
 --- debian/control	2016-12-14 15:11:28 +0000
 +++ debian/control	2017-01-11 20:31:16 +0000
@@ -8,12 +8,9 @@
                 debhelper (>= 9),
  # for building the code:
                 libarchive-dev (>= 3.1.2),
--               libproperties-cpp-dev,
                 libubuntu-app-launch2-dev (>= 0.9),
                 storage-framework-client-dev,
--               libclick-0.4-dev,
                 uuid-dev,
--               libglib2.0-dev,
                 qt5-default,
                 qtbase5-dev,
                 qtbase5-dev-tools,
@@ -25,7 +22,6 @@
                 libgtest-dev,
                 google-mock (>= 1.6.0+svn437),
                 python3-dbusmock (>= 0.16.3),
--               libdbustest1-dev,
                 libqtdbusmock1-dev (>= 0.4),
                 libqtdbustest1-dev,
  # for the dbusmock template:
 === modified file 'src/helper/CMakeLists.txt'
 --- src/helper/CMakeLists.txt	2016-12-05 11:36:32 +0000
 +++ src/helper/CMakeLists.txt	2017-01-11 20:31:16 +0000
@@ -46,7 +46,6 @@
  include(FindPkgConfig)
  pkg_check_modules(BACKUP_HELPER_DEPENDENCIES REQUIRED
    ubuntu-app-launch-2
--  properties-cpp
+ )
  include_directories(
 === modified file 'src/service/backup-choices.cpp'
 --- src/service/backup-choices.cpp	2017-01-11 20:31:15 +0000
 +++ src/service/backup-choices.cpp	2017-01-11 20:31:16 +0000
@@ -19,15 +19,9 @@
  #include "service/backup-choices.h"
--#include <click.h>
--
  #include <uuid/uuid.h>
  #include <QDebug>
--#include <QJsonArray>
--#include <QJsonDocument>
--#include <QJsonObject>
--#include <QJsonValue>
  #include <QStandardPaths>
  #include <QString>
@@ -72,66 +66,6 @@
+     }
      //
--    //  Click Packages
--    //
--
--    QString manifests_str;
--    GError* error {};
--    auto user = click_user_new_for_user(nullptr, nullptr, &error);
--    if (user != nullptr)
--    {
--        auto tmp = click_user_get_manifests_as_string (user, &error);
--        manifests_str = QString::fromUtf8(tmp);
--        g_clear_pointer(&tmp, g_free);
--        g_clear_object(&user);
--    }
--    if (error != nullptr)
--    {
--        qCritical() << "Error getting click manifests:" << error->message;
--        g_clear_error(&error);
--    }
--
--    auto loadDoc = QJsonDocument::fromJson(manifests_str.toUtf8());
--    auto tmp = loadDoc.toJson();
--    if (loadDoc.isArray())
--    {
--        auto manifests = loadDoc.array();
--        for(auto it=manifests.begin(), end=manifests.end(); it!=end; ++it)
--        {
--            const auto& manifest (*it);
--            if (manifest.isObject())
--            {
--                auto o = manifest.toObject();
--
--                // manditory name
--                const auto name = o[Metadata::NAME_KEY];
--                if (name == QJsonValue::Undefined)
--                    continue;
--
--                // manditory title
--                const auto title = o[Metadata::TITLE_KEY];
--                if (title == QJsonValue::Undefined)
--                    continue;
--                QString display_name = title.toString();
--
--                // if version is available, append it to display_name
--                const auto version = o[Metadata::VERSION_KEY];
--                if (version != QJsonValue::Undefined)
--                    display_name = QStringLiteral("%1 (%2)").arg(display_name).arg(version.toString());
--
--                Metadata m(generate_new_uuid(), display_name);
--                m.set_property_value(Metadata::PACKAGE_KEY, name.toString());
--                m.set_property_value(Metadata::TYPE_KEY, Metadata::APPLICATION_VALUE);
--
--                if (version != QJsonValue::Undefined)
--                    m.set_property_value(Metadata::VERSION_KEY, version.toString());
--
--                backups_.push_back(m);
--            }
--        }
--    }
--
--    //
      //  XDG User Directories
      //
 === modified file 'tests/integration/helpers/CMakeLists.txt'
 --- tests/integration/helpers/CMakeLists.txt	2016-11-11 14:50:06 +0000
 +++ tests/integration/helpers/CMakeLists.txt	2017-01-11 20:31:16 +0000
@@ -11,11 +11,6 @@
  pkg_check_modules(HELPERS_TEST_DEPS REQUIRED
    ubuntu-app-launch-2
--  properties-cpp
--  dbustest-1>=14.04.0
--  glib-2.0>=2.26
--  gio-2.0>=2.26
--  gio-unix-2.0
+ )
  include_directories(
 === modified file 'tests/integration/helpers/test-helpers-base.cpp'
 --- tests/integration/helpers/test-helpers-base.cpp	2017-01-11 20:31:15 +0000
 +++ tests/integration/helpers/test-helpers-base.cpp	2017-01-11 20:31:16 +0000
@@ -26,6 +26,8 @@
  #include <sys/types.h>
  #include <signal.h>
++#include <cstdlib> // setenv(), unsetenv()
++
  using namespace QtDBusTest;
  using namespace QtDBusMock;
@@ -379,25 +381,25 @@
      Helper::registerMetaTypes();
      DBusTypes::registerMetaTypes();
--    g_setenv("XDG_DATA_DIRS", CMAKE_SOURCE_DIR, true);
--    g_setenv("XDG_CACHE_HOME", CMAKE_SOURCE_DIR "/libertine-data", true);
--    g_setenv("XDG_DATA_HOME", xdg_data_home_dir.path().toLatin1().data(), true);
++    setenv("XDG_DATA_DIRS", CMAKE_SOURCE_DIR, true);
++    setenv("XDG_CACHE_HOME", CMAKE_SOURCE_DIR "/libertine-data", true);
++    setenv("XDG_DATA_HOME", xdg_data_home_dir.path().toLatin1().data(), true);
      qDebug() << "XDG_DATA_HOME ON SETUP is:" << xdg_data_home_dir.path();
--    g_setenv("DBUS_SYSTEM_BUS_ADDRESS", dbus_test_runner.systemBus().toStdString().c_str(), true);
--    g_setenv("DBUS_SESSION_BUS_ADDRESS", dbus_test_runner.sessionBus().toStdString().c_str(), true);
++    setenv("DBUS_SYSTEM_BUS_ADDRESS", dbus_test_runner.systemBus().toStdString().c_str(), true);
++    setenv("DBUS_SESSION_BUS_ADDRESS", dbus_test_runner.sessionBus().toStdString().c_str(), true);
      dbus_test_runner.startServices();
+ }
  void TestHelpersBase::TearDown()
+ {
--    g_unsetenv("XDG_DATA_DIRS");
--    g_unsetenv("XDG_CACHE_HOME");
--    g_unsetenv("XDG_DATA_HOME");
--    g_unsetenv("DBUS_SYSTEM_BUS_ADDRESS");
--    g_unsetenv("DBUS_SESSION_BUS_ADDRESS");
++    unsetenv("XDG_DATA_DIRS");
++    unsetenv("XDG_CACHE_HOME");
++    unsetenv("XDG_DATA_HOME");
++    unsetenv("DBUS_SYSTEM_BUS_ADDRESS");
++    unsetenv("DBUS_SESSION_BUS_ADDRESS");
      // if the test failed, keep the artifacts so devs can examine them
      QDir data_home_dir(CMAKE_SOURCE_DIR "/libertine-home");
 === modified file 'tests/unit/manifest/manifest-test.cpp'
 --- tests/unit/manifest/manifest-test.cpp	2017-01-11 20:31:15 +0000
 +++ tests/unit/manifest/manifest-test.cpp	2017-01-11 20:31:16 +0000
@@ -31,7 +31,8 @@
  #include <QTemporaryDir>
  #include <gtest/gtest.h>
--#include <glib.h>
++
++#include <cstdlib> // setenv(), unsetenv()
  TEST(ManifestClass, AddEntries)
+ {
@@ -74,7 +75,7 @@
      QTemporaryDir tmp_dir;
      QString test_dir = QStringLiteral("test_dir");
--    g_setenv("XDG_DATA_HOME", tmp_dir.path().toLatin1().data(), true);
++    setenv("XDG_DATA_HOME", tmp_dir.path().toLatin1().data(), true);
      QSharedPointer<StorageFrameworkClient> sf_client(new StorageFrameworkClient, [](StorageFrameworkClient* sf){sf->deleteLater();});
      Manifest manifest(sf_client, test_dir);
@@ -166,5 +167,5 @@
          EXPECT_EQ(metadata_with_sf[i], original_metadata[i]);
+     }
--    g_unsetenv("XDG_DATA_HOME");
++    unsetenv("XDG_DATA_HOME");
+ }
 === modified file 'tests/unit/storage-framework/create-uploader-test.cpp'
 --- tests/unit/storage-framework/create-uploader-test.cpp	2016-11-11 14:50:06 +0000
 +++ tests/unit/storage-framework/create-uploader-test.cpp	2017-01-11 20:31:16 +0000
@@ -26,7 +26,8 @@
  #include <QTemporaryDir>
  #include <gtest/gtest.h>
--#include <glib.h>
++
++#include <cstdlib> // setenv(), unsetenv()
  namespace sf = unity::storage::qt::client;
@@ -43,7 +44,7 @@
      QString test_dir = QStringLiteral("test_dir");
      QString test_file_name = QStringLiteral("test_file");
--    g_setenv("XDG_DATA_HOME", tmp_dir.path().toLatin1().data(), true);
++    setenv("XDG_DATA_HOME", tmp_dir.path().toLatin1().data(), true);
      qDebug() << "XDG_DATA_HOME is:" << qPrintable(tmp_dir.path());
      StorageFrameworkClient sf_client;
@@ -143,5 +144,5 @@
      // check that files are exactly the same than before the second uploader
      EXPECT_EQ(sf_files, sf_files_after_dispose);
--    g_unsetenv("XDG_DATA_HOME");
++    unsetenv("XDG_DATA_HOME");
+ }
 === modified file 'tests/unit/storage-framework/folders-test.cpp'
 --- tests/unit/storage-framework/folders-test.cpp	2016-10-28 15:11:21 +0000
 +++ tests/unit/storage-framework/folders-test.cpp	2017-01-11 20:31:16 +0000
@@ -26,7 +26,8 @@
  #include <QTemporaryDir>
  #include <gtest/gtest.h>
--#include <glib.h>
++
++#include <cstdlib> // setenv(), unsetenv()
  namespace sf = unity::storage::qt::client;
@@ -42,7 +43,7 @@
          test_dirs.push_back(QString("test_dir_%1").arg(i+1));
+     }
--    g_setenv("XDG_DATA_HOME", tmp_dir.path().toLatin1().data(), true);
++    setenv("XDG_DATA_HOME", tmp_dir.path().toLatin1().data(), true);
      StorageFrameworkClient sf_client;
      for (auto i = 0; i < nb_tests; ++i)
@@ -105,5 +106,5 @@
          EXPECT_TRUE(found);
+     }
--    g_unsetenv("XDG_DATA_HOME");
++    unsetenv("XDG_DATA_HOME");
+ }