Merge lp:~ted/ubuntu-app-launch/libertine-id-field into lp:ubuntu-app-launch/16.10

[Ted Gould]

Use the --id field for launching with libertine-launch and use it for setting up other X11 environments

Matching libertine merge:

https://code.launchpad.net/~townsend/libertine/support-non-container-apps/+merge/302554

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:253
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/102/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/666
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/672
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/487
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/487/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/487
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/487/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/487
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/487/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/487
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/487/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/487
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/487/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/487
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/487/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/487
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/487/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/487
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/487/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/487
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/487/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/102/rebuild

review: Approve (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

Looks good (Great test coverage in this project btw!)

review: Approve

=== modified file 'libubuntu-app-launch/application-impl-legacy.cpp'
--- libubuntu-app-launch/application-impl-legacy.cpp	2016-09-15 17:15:22 +0000
+++ libubuntu-app-launch/application-impl-legacy.cpp	2016-09-15 17:15:24 +0000
@@ -303,7 +303,23 @@
     info();
 
     retval.emplace_back(std::make_pair("APP_XMIR_ENABLE", appinfo_->xMirEnable().value() ? "1" : "0"));
-    retval.emplace_back(std::make_pair("APP_EXEC", appinfo_->execLine().value()));
+    if (appinfo_->xMirEnable())
+    {
+        /* If we're setting up XMir we also need the other helpers
+           that libertine is helping with */
+        auto libertine_launch = g_getenv("UBUNTU_APP_LAUNCH_LIBERTINE_LAUNCH");
+        if (libertine_launch == nullptr)
+        {
+            libertine_launch = LIBERTINE_LAUNCH;
+        }
+
+        retval.emplace_back(
+            std::make_pair("APP_EXEC", std::string(libertine_launch) + " " + appinfo_->execLine().value()));
+    }
+    else
+    {
+        retval.emplace_back(std::make_pair("APP_EXEC", appinfo_->execLine().value()));
+    }
 
     /* Honor the 'Path' key if it is in the desktop file */
     if (g_key_file_has_key(_keyfile.get(), "Desktop Entry", "Path", nullptr))

=== modified file 'libubuntu-app-launch/application-impl-libertine.cpp'
--- libubuntu-app-launch/application-impl-libertine.cpp	2016-09-15 17:15:22 +0000
+++ libubuntu-app-launch/application-impl-libertine.cpp	2016-09-15 17:15:24 +0000
@@ -300,7 +300,7 @@
     }
 
     auto desktopexec = appinfo_->execLine().value();
-    auto execline = std::string(libertine_launch) + " \"" + _container.value() + "\" " + desktopexec;
+    auto execline = std::string(libertine_launch) + " \"--id=" + _container.value() + "\" " + desktopexec;
     retval.emplace_back(std::make_pair("APP_EXEC", execline));
 
     /* TODO: Go multi instance */

=== modified file 'libubuntu-app-launch/application-impl-snap.cpp'
--- libubuntu-app-launch/application-impl-snap.cpp	2016-09-15 17:15:22 +0000
+++ libubuntu-app-launch/application-impl-snap.cpp	2016-09-15 17:15:24 +0000
@@ -418,10 +418,14 @@
     {
         /* If we're setting up XMir we also need the other helpers
            that libertine is helping with */
-        /* retval.emplace_back(std::make_pair("APP_EXEC", "libertine-launch --no-container " +
-         * info_->execLine().value())); */
-        /* Not yet */
-        retval.emplace_back(std::make_pair("APP_EXEC", info_->execLine().value()));
+        auto libertine_launch = g_getenv("UBUNTU_APP_LAUNCH_LIBERTINE_LAUNCH");
+        if (libertine_launch == nullptr)
+        {
+            libertine_launch = LIBERTINE_LAUNCH;
+        }
+
+        retval.emplace_back(
+            std::make_pair("APP_EXEC", std::string(libertine_launch) + " " + info_->execLine().value()));
     }
     else
     {

=== modified file 'tests/exec-util-test.cc'
--- tests/exec-util-test.cc	2016-09-15 17:15:22 +0000
+++ tests/exec-util-test.cc	2016-09-15 17:15:24 +0000
@@ -218,7 +218,7 @@
 {
 	StartCheckEnv("xmir", {
 		{"APP_EXEC", [](const gchar * value) {
-			EXPECT_STREQ("xfoo", value); }},
+			EXPECT_STREQ("libertine-launch xfoo", value); }},
 		{"APP_DESKTOP_FILE_PATH", [](const gchar * value) {
 			EXPECT_STREQ(CMAKE_SOURCE_DIR "/applications/xmir.desktop", value); }},
 		{"APP_EXEC_POLICY", [](const gchar * value) {
@@ -300,7 +300,7 @@
 {
 	StartCheckEnv("container-name_test_0.0", {
 		{"APP_EXEC", [](const gchar * value) {
-			EXPECT_STREQ("libertine-launch \"container-name\" test", value); }},
+			EXPECT_STREQ("libertine-launch \"--id=container-name\" test", value); }},
 		{"APP_EXEC_POLICY", [](const gchar * value) {
 			EXPECT_STREQ("unconfined", value); }},
 		{"APP_ID", [](const gchar * value) {
@@ -317,7 +317,7 @@
 {
 	StartCheckEnv("container-name_user-app_0.0", {
 		{"APP_EXEC", [](const gchar * value) {
-			EXPECT_STREQ("libertine-launch \"container-name\" user-app", value); }},
+			EXPECT_STREQ("libertine-launch \"--id=container-name\" user-app", value); }},
 		{"APP_EXEC_POLICY", [](const gchar * value) {
 			EXPECT_STREQ("unconfined", value); }},
 		{"APP_ID", [](const gchar * value) {