Merge lp:~ted/unity-mir/ubuntu-app-launch into lp:unity-mir

[Ted Gould]

UAL name chance got Ubuntu App Launch

Didn't change the interface from the module, just the change needed with the library change.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:225
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/359/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/23/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/23/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/23/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/359/rebuild

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

Please add Checklist, including listing dependant branches:
https://wiki.ubuntu.com/Process/Merges/Checklists/Unity-Mir

Commit message needs expanding. Name change of what exactly?

Note we use "upstart" in many more places in the code, including a specific "upstart" directory in src/modules/Unity/Application/, an upstart namespace and comments & tests referring to "upstart" - so please update those too.

Higher level question: why is this launch tool "ubuntu" specific?

review: Needs Fixing

[lp:~ted/unity-mir/ubuntu-app-launch]

226. By Ted Gould on 2014-05-26

Wrong type name

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:226
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/361/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/25/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/25/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/25/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/361/rebuild

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

the packaging changes look fine to me, thanks

review: Approve (the debian changes)

[Ted Gould (ted)]

On Mon, 2014-05-26 at 09:52 +0000, Gerry Boland wrote:

> Please add Checklist, including listing dependant branches:
> https://wiki.ubuntu.com/Process/Merges/Checklists/Unity-Mir

 * Are there any related MPs required for this MP to build/function as
expected? Please list.

https://code.launchpad.net/~ted/upstart-app-launch/rename/+merge/217819

 * Did you perform an exploratory manual test run of your code change and any related functionality?

Ensured that it builds and runs, expect to do more testing on the
landing PPA. Need to get all the packages working together to test.

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

Asked for a packaging review

> Commit message needs expanding. Name change of what exactly?

Updated.

> Note we use "upstart" in many more places in the code, including a specific "upstart" directory in src/modules/Unity/Application/, an upstart namespace and comments & tests referring to "upstart" - so please update those too.

Well, those comments are still correct, we *are* using Upstart in those
places. I looked at them and they still seemed correct. I can change
them to "init system" but "Ubuntu" is the wrong substitution.

[Gerry Boland (gerboland)]

LGTM, approved

 * Did you perform an exploratory manual test run of the code change and any related functionality?
N - waiting for the silo to build everything ok
 * Did CI run pass? If not, please explain why.
N - package name change

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-04-30 15:56:45 +0000
+++ debian/control	2014-05-26 10:35:25 +0000
@@ -13,7 +13,7 @@
                libmirclient-dev (>= 0.1.8),
                libprocess-cpp-dev,
                libunity-api-dev (>= 7.80.6),
-               libupstart-app-launch2-dev,
+               libubuntu-app-launch2-dev,
                qt5-default,
                qtbase5-dev,
                qtdeclarative5-dev,
@@ -49,7 +49,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          libunity-mir1 (= ${binary:Version}),
-         libupstart-app-launch2-dev,
+         libubuntu-app-launch2-dev,
          libmirserver-dev (>= 0.1.8),
          libmirclient-dev (>= 0.1.8),
          libplatform-api1-dev,

=== modified file 'src/modules/Unity/Application/CMakeLists.txt'
--- src/modules/Unity/Application/CMakeLists.txt	2014-03-28 16:41:02 +0000
+++ src/modules/Unity/Application/CMakeLists.txt	2014-05-26 10:35:25 +0000
@@ -1,6 +1,6 @@
 pkg_check_modules(GLIB glib-2.0 REQUIRED)
 pkg_check_modules(PROCESS_CPP process-cpp REQUIRED)
-pkg_check_modules(UPSTART_APP_LAUNCH upstart-app-launch-2 REQUIRED)
+pkg_check_modules(UPSTART_APP_LAUNCH ubuntu-app-launch-2 REQUIRED)
 
 add_definitions(-DQT_PLUGIN)
 

=== modified file 'src/modules/Unity/Application/upstart/applicationcontroller.cpp'
--- src/modules/Unity/Application/upstart/applicationcontroller.cpp	2014-05-15 14:29:26 +0000
+++ src/modules/Unity/Application/upstart/applicationcontroller.cpp	2014-05-26 10:35:25 +0000
@@ -25,7 +25,7 @@
 
 // upstart
 extern "C" {
-    #include "upstart-app-launch.h"
+    #include "ubuntu-app-launch.h"
 }
 
 namespace unitymir
@@ -35,12 +35,12 @@
 
 struct ApplicationController::Private
 {
-    upstart_app_launch_app_observer_t preStartCallback = nullptr;
-    upstart_app_launch_app_observer_t startedCallback = nullptr;
-    upstart_app_launch_app_observer_t stopCallback = nullptr;
-    upstart_app_launch_app_observer_t focusCallback = nullptr;
-    upstart_app_launch_app_observer_t resumeCallback = nullptr;
-    upstart_app_launch_app_failed_observer_t failureCallback = nullptr;
+    UbuntuAppLaunchAppObserver preStartCallback = nullptr;
+    UbuntuAppLaunchAppObserver startedCallback = nullptr;
+    UbuntuAppLaunchAppObserver stopCallback = nullptr;
+    UbuntuAppLaunchAppObserver focusCallback = nullptr;
+    UbuntuAppLaunchAppObserver resumeCallback = nullptr;
+    UbuntuAppLaunchAppFailedObserver failureCallback = nullptr;
 };
 
 namespace {
@@ -51,7 +51,7 @@
  */
 QString toShortAppIdIfPossible(const QString &appId) {
     gchar *package, *application;
-    if (upstart_app_launch_app_id_parse(appId.toLatin1().constData(), &package, &application, nullptr)) {
+    if (ubuntu_app_launch_app_id_parse(appId.toLatin1().constData(), &package, &application, nullptr)) {
         // is long appId, so assemble its short appId
         QString shortAppId = QString("%1_%2").arg(package).arg(application);
         g_free(package);
@@ -69,7 +69,7 @@
  * entered, it is returned unchanged. Anything else is also returned unchanged.
  */
 QString toLongAppIdIfPossible(const QString &shortAppId) {
-    if (upstart_app_launch_app_id_parse(shortAppId.toLatin1().constData(), nullptr, nullptr, nullptr)) {
+    if (ubuntu_app_launch_app_id_parse(shortAppId.toLatin1().constData(), nullptr, nullptr, nullptr)) {
         // then we got a long appId after all, just return it
         return shortAppId;
     } else {
@@ -83,7 +83,7 @@
         // ask upstart for the long appId corresponding to this short appId
         QStringList parts = shortAppId.split("_");
         gchar *longAppId;
-        longAppId = upstart_app_launch_triplet_to_app_id(parts.first().toLatin1().constData(),
+        longAppId = ubuntu_app_launch_triplet_to_app_id(parts.first().toLatin1().constData(),
                                                          parts.last().toLatin1().constData(),
                                                          nullptr);
         if (longAppId == nullptr) {
@@ -128,39 +128,39 @@
         Q_EMIT(thiz->applicationResumeRequest(toShortAppIdIfPossible(appId)));
     };
 
-    impl->failureCallback = [](const gchar * appId, upstart_app_launch_app_failed_t failureType, gpointer userData) {
+    impl->failureCallback = [](const gchar * appId, UbuntuAppLaunchAppFailed failureType, gpointer userData) {
         ApplicationController::Error error;
         switch(failureType)
         {
-        case UPSTART_APP_LAUNCH_APP_FAILED_CRASH: error = ApplicationController::Error::APPLICATION_CRASHED;
-        case UPSTART_APP_LAUNCH_APP_FAILED_START_FAILURE: error = ApplicationController::Error::APPLICATION_FAILED_TO_START;
+        case UBUNTU_APP_LAUNCH_APP_FAILED_CRASH: error = ApplicationController::Error::APPLICATION_CRASHED;
+        case UBUNTU_APP_LAUNCH_APP_FAILED_START_FAILURE: error = ApplicationController::Error::APPLICATION_FAILED_TO_START;
         }
 
         auto thiz = static_cast<ApplicationController*>(userData);
         Q_EMIT(thiz->applicationError(toShortAppIdIfPossible(appId), error));
     };
 
-    upstart_app_launch_observer_add_app_starting(impl->preStartCallback, this);
-    upstart_app_launch_observer_add_app_started(impl->startedCallback, this);
-    upstart_app_launch_observer_add_app_stop(impl->stopCallback, this);
-    upstart_app_launch_observer_add_app_focus(impl->focusCallback, this);
-    upstart_app_launch_observer_add_app_resume(impl->resumeCallback, this);
-    upstart_app_launch_observer_add_app_failed(impl->failureCallback, this);
+    ubuntu_app_launch_observer_add_app_starting(impl->preStartCallback, this);
+    ubuntu_app_launch_observer_add_app_started(impl->startedCallback, this);
+    ubuntu_app_launch_observer_add_app_stop(impl->stopCallback, this);
+    ubuntu_app_launch_observer_add_app_focus(impl->focusCallback, this);
+    ubuntu_app_launch_observer_add_app_resume(impl->resumeCallback, this);
+    ubuntu_app_launch_observer_add_app_failed(impl->failureCallback, this);
 }
 
 ApplicationController::~ApplicationController()
 {
-    upstart_app_launch_observer_delete_app_starting(impl->preStartCallback, this);
-    upstart_app_launch_observer_delete_app_started(impl->startedCallback, this);
-    upstart_app_launch_observer_delete_app_stop(impl->stopCallback, this);
-    upstart_app_launch_observer_delete_app_focus(impl->focusCallback, this);
-    upstart_app_launch_observer_delete_app_resume(impl->resumeCallback, this);
-    upstart_app_launch_observer_delete_app_failed(impl->failureCallback, this);
+    ubuntu_app_launch_observer_delete_app_starting(impl->preStartCallback, this);
+    ubuntu_app_launch_observer_delete_app_started(impl->startedCallback, this);
+    ubuntu_app_launch_observer_delete_app_stop(impl->stopCallback, this);
+    ubuntu_app_launch_observer_delete_app_focus(impl->focusCallback, this);
+    ubuntu_app_launch_observer_delete_app_resume(impl->resumeCallback, this);
+    ubuntu_app_launch_observer_delete_app_failed(impl->failureCallback, this);
 }
 
 pid_t ApplicationController::primaryPidForAppId(const QString& appId)
 {
-    GPid pid = upstart_app_launch_get_primary_pid(toLongAppIdIfPossible(appId).toLatin1().constData());
+    GPid pid = ubuntu_app_launch_get_primary_pid(toLongAppIdIfPossible(appId).toLatin1().constData());
     DLOG_IF(!pid, "ApplicationController::stopApplication appId='%s' FAILED", qPrintable(appId));
 
     return pid;
@@ -168,19 +168,19 @@
 
 bool ApplicationController::appIdHasProcessId(pid_t pid, const QString& appId)
 {
-    return upstart_app_launch_pid_in_app_id(pid, toLongAppIdIfPossible(appId).toLatin1().constData());
+    return ubuntu_app_launch_pid_in_app_id(pid, toLongAppIdIfPossible(appId).toLatin1().constData());
 }
 
 bool ApplicationController::stopApplicationWithAppId(const QString& appId)
 {
-    auto result = upstart_app_launch_stop_application(toLongAppIdIfPossible(appId).toLatin1().constData());
+    auto result = ubuntu_app_launch_stop_application(toLongAppIdIfPossible(appId).toLatin1().constData());
     DLOG_IF(!result, "ApplicationController::stopApplicationWithAppId appId='%s' FAILED", qPrintable(appId));
     return result;
 }
 
 bool ApplicationController::startApplicationWithAppIdAndArgs(const QString& appId, const QStringList& arguments)
 {
-    // Convert arguments QStringList into format suitable for upstart-app-launch
+    // Convert arguments QStringList into format suitable for ubuntu-app-launch
     // The last item should be null, which is done by g_new0, we just don't fill it.
     auto upstartArgs = g_new0(gchar *, arguments.length() + 1);
 
@@ -188,7 +188,7 @@
         upstartArgs[i] = g_strdup(arguments.at(i).toUtf8().data());
     }
 
-    auto result = upstart_app_launch_start_application(
+    auto result = ubuntu_app_launch_start_application(
                 toLongAppIdIfPossible(appId).toLatin1().constData(),
                 static_cast<const gchar * const *>(upstartArgs));
 

=== modified file 'tests/auto/modules/Unity/Application/CMakeLists.txt'
--- tests/auto/modules/Unity/Application/CMakeLists.txt	2014-02-21 21:41:21 +0000
+++ tests/auto/modules/Unity/Application/CMakeLists.txt	2014-05-26 10:35:25 +0000
@@ -5,7 +5,7 @@
     ${CMAKE_SOURCE_DIR}/src/unity-mir
 
     ${MIRSERVER_INCLUDE_DIRS}
-    ${UPSTART_APP_LAUNCH_INCLUDE_DIRS})
+    ${UBUNTU_APP_LAUNCH_INCLUDE_DIRS})
 
 add_executable(
     unity-mir-test-app
@@ -20,7 +20,7 @@
     unityapplicationplugin
 
     ${MIRSERVER_LDFLAGS}
-    ${UPSTART_APP_LAUNCH_LDFLAGS})
+    ${UBUNTU_APP_LAUNCH_LDFLAGS})
 
 install(
     TARGETS unity-mir-test-app