Merge lp:~ted/ubuntu-app-launch/drop-surface-flinger into lp:ubuntu-app-launch/14.04

[Ted Gould]

Drop Surface Flinger support

Free us from the flinger!

[Charles Kerr (charlesk)]

Looks good.

One suggestion, it would be better to use g_get_user_data_dir() than to build it by hand.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:147
http://jenkins.qa.ubuntu.com/job/upstart-app-launch-ci/252/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-amd64-ci/111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-armhf-ci/111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-i386-ci/112

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/upstart-app-launch-ci/252/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

gah! I just asked you to fix code that's being removed. Clearly you should fix it, /then/ remove it.

review: Approve

[lp:~ted/ubuntu-app-launch/drop-surface-flinger]

148. By Ted Gould on 2014-05-21

Merge trunk

=== modified file 'click-exec.c'
--- click-exec.c	2014-03-07 14:19:03 +0000
+++ click-exec.c	2014-05-21 15:00:36 +0000
@@ -160,13 +160,6 @@
 
 	tracepoint(upstart_app_launch, click_read_desktop);
 
-	/* TODO: This is for Surface Flinger, when we drop support we can drop this */
-	gchar * userdesktopfile = g_strdup_printf("%s.desktop", app_id);
-	gchar * userdesktoppath = g_build_filename(g_get_home_dir(), ".local", "share", "applications", userdesktopfile, NULL);
-	set_upstart_variable("APP_DESKTOP_FILE", userdesktoppath, FALSE);
-	g_free(userdesktopfile);
-	g_free(userdesktoppath);
-
 	g_debug("Setting 'APP_EXEC' to '%s'", exec);
 	/* NOTE: This should be the last upstart variable set as it is sync
 	   so it will wait for a reply from Upstart implying that Upstart
 
=== modified file 'desktop-exec.c'
--- desktop-exec.c	2014-02-07 14:56:27 +0000
+++ desktop-exec.c	2014-05-21 15:00:36 +0000
@@ -71,10 +71,8 @@
 
 	tracepoint(upstart_app_launch, desktop_found);
 
-	/* TODO: This is for Surface Flinger.  When we drop support, we can drop this code */
+	/* Desktop file name so that libs can get other info from it */
 	if (desktopfilename != NULL) {
-		set_upstart_variable("APP_DESKTOP_FILE", desktopfilename, FALSE);
-		/* This is not for SF, it's for platform API only above is for SF */
 		set_upstart_variable("APP_DESKTOP_FILE_PATH", desktopfilename, FALSE);
 		g_free(desktopfilename);
 	}
 
=== modified file 'exec-line-exec.c'
--- exec-line-exec.c	2014-02-07 14:56:27 +0000
+++ exec-line-exec.c	2014-05-21 15:00:36 +0000
@@ -46,7 +46,6 @@
 
 	/* URIs */
 	const gchar * app_uris = g_getenv("APP_URIS");
-	const gchar * app_desktop = g_getenv("APP_DESKTOP_FILE");
 
 	/* Look to see if we have a directory defined that we
 	   should be using for everything.  If so, change to it
@@ -117,12 +116,6 @@
 
 	tracepoint(upstart_app_launch, exec_parse_complete);
 
-	/* Surface flinger check */
-	if (g_getenv("USING_SURFACE_FLINGER") != NULL && app_desktop != NULL) {
-		gchar * sf = g_strdup_printf("--desktop_file_hint=%s", app_desktop);
-		g_array_append_val(newargv, sf);
-	}
-
 	/* Now exec */
 	gchar ** nargv = (gchar**)g_array_free(newargv, FALSE);
 
 
=== modified file 'tests/exec-util-test.cc'
--- tests/exec-util-test.cc	2014-03-12 00:28:05 +0000
+++ tests/exec-util-test.cc	2014-05-21 15:00:36 +0000
@@ -94,7 +94,7 @@
 	guint len = 0;
 	const DbusTestDbusMockCall * calls = dbus_test_dbus_mock_object_get_method_calls(mock, obj, "SetEnv", &len, NULL);
 
-	ASSERT_EQ(12, len);
+	ASSERT_EQ(11, len);
 	ASSERT_NE(nullptr, calls);
 
 	unsigned int i;
@@ -109,7 +109,6 @@
 	bool got_shader_dir = false;
 	bool got_app_dir = false;
 	bool got_app_exec = false;
-	bool got_app_desktop = false;
 	bool got_app_desktop_path = false;
 
 #define APP_DIR CMAKE_SOURCE_DIR "/click-root-dir/.click/users/test-user/com.test.good"
@@ -153,8 +152,6 @@
 		} else if (g_strcmp0(var, "APP_EXEC") == 0) {
 			EXPECT_STREQ("foo", value);
 			got_app_exec = true;
-		} else if (g_strcmp0(var, "APP_DESKTOP_FILE") == 0) {
-			got_app_desktop = true;
 		} else if (g_strcmp0(var, "APP_DESKTOP_FILE_PATH") == 0) {
 			EXPECT_STREQ(APP_DIR "/application.desktop", value);
 			got_app_desktop_path = true;
@@ -178,7 +175,6 @@
 	EXPECT_TRUE(got_shader_dir);
 	EXPECT_TRUE(got_app_dir);
 	EXPECT_TRUE(got_app_exec);
-	EXPECT_TRUE(got_app_desktop);
 	EXPECT_TRUE(got_app_desktop_path);
 }
 
@@ -193,13 +189,12 @@
 	guint len = 0;
 	const DbusTestDbusMockCall * calls = dbus_test_dbus_mock_object_get_method_calls(mock, obj, "SetEnv", &len, NULL);
 
-	ASSERT_EQ(4, len);
+	ASSERT_EQ(3, len);
 	ASSERT_NE(nullptr, calls);
 
 	unsigned int i;
 
 	bool got_app_exec = false;
-	bool got_app_desktop = false;
 	bool got_app_desktop_path = false;
 	bool got_app_exec_policy = false;
 
@@ -219,8 +214,6 @@
 		if (g_strcmp0(var, "APP_EXEC") == 0) {
 			EXPECT_STREQ("foo", value);
 			got_app_exec = true;
-		} else if (g_strcmp0(var, "APP_DESKTOP_FILE") == 0) {
-			got_app_desktop = true;
 		} else if (g_strcmp0(var, "APP_DESKTOP_FILE_PATH") == 0) {
 			EXPECT_STREQ(CMAKE_SOURCE_DIR "/applications/foo.desktop", value);
 			got_app_desktop_path = true;
@@ -236,7 +229,6 @@
 	}
 
 	EXPECT_TRUE(got_app_exec);
-	EXPECT_TRUE(got_app_desktop);
 	EXPECT_TRUE(got_app_desktop_path);
 	EXPECT_TRUE(got_app_exec_policy);
 }
 
=== modified file 'upstart-jobs/application-click.conf.in'
--- upstart-jobs/application-click.conf.in	2014-04-11 18:33:23 +0000
+++ upstart-jobs/application-click.conf.in	2014-05-21 15:00:36 +0000
@@ -10,22 +10,14 @@
 env APP_EXEC
 env APP_URIS
 env APP_DIR
-# For Surface Flinger
-env APP_DESKTOP_FILE
-env APP_PROCESS_GROUP
+env APP_DESKTOP_FILE_PATH
 
 env UPSTART_APP_LAUNCH_ARCH="@upstart_app_launch_arch@"
 export UPSTART_APP_LAUNCH_ARCH
 
 apparmor switch ${APP_ID}
 
-pre-start script
-	if pgrep -u system surfaceflinger ; then
-		initctl set-env USING_SURFACE_FLINGER=1
-	fi
-
-	exec @pkglibexecdir@/click-exec
-end script
+pre-start exec @pkglibexecdir@/click-exec
 
 # Remember, this is confined
 exec @pkglibexecdir@/exec-line-exec
 
=== modified file 'upstart-jobs/application-legacy.conf.in'
--- upstart-jobs/application-legacy.conf.in	2014-02-13 22:43:55 +0000
+++ upstart-jobs/application-legacy.conf.in	2014-05-21 15:00:36 +0000
@@ -10,20 +10,14 @@
 env APP_EXEC
 env APP_EXEC_POLICY=""
 env APP_URIS
-# For Surface Flinger
-env APP_DESKTOP_FILE
+env APP_DESKTOP_FILE_PATH
 
 # This will be set to "unconfined" by desktop-exec if there is no confinement defined
 apparmor switch $APP_EXEC_POLICY
 
-pre-start script
-	if pgrep -u system surfaceflinger ; then
-		initctl set-env USING_SURFACE_FLINGER=1
-	fi
-
-	exec @pkglibexecdir@/desktop-exec
-end script
-
+pre-start exec @pkglibexecdir@/desktop-exec
+
+# This could be confined
 exec @pkglibexecdir@/exec-line-exec
 
 post-start exec @pkglibexecdir@/zg-report-app open