Merge lp:~ted/ubuntu-system-settings/dev-mode-env into lp:ubuntu-system-settings

[Ted Gould]

Adding Upstart job to set debuging environment in developer mode

Small upstart job to set global environment variables in Qt and GLib for debug messages

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1271
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1925/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/964
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/195
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/854
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/962
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/962/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17401

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1925/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks, but that job seems like something that should come with the session/touch init scripts, not with settings, it doesn't have much to do with the settings gui

review: Disapprove

[Ted Gould (ted)]

On Mon, 2015-01-26 at 09:15 +0000, Sebastien Bacher wrote:

> Thanks, but that job seems like something that should come with the
> session/touch init scripts, not with settings, it doesn't have much to
> do with the settings gui

I thought it should go with settings because that's where the setting
for how to configure developer mode is. So if we were to change how
developer mode is configured (I imagine we will at some point) that
could be handled all in the same package. The Upstart job just needs to
match the setting that the UI sets.

Unmerged revisions

1271. By Ted Gould on 2015-01-23

Attaching bug

1270. By Ted Gould on 2015-01-23

Make the directory as well

1269. By Ted Gould on 2015-01-23

Putting the config file in a package

1268. By Ted Gould on 2015-01-23

Adding an upstart job to use the developer mode setting for logging

=== added file 'debian/developer-mode-settings.conf'
--- debian/developer-mode-settings.conf	1970-01-01 00:00:00 +0000
+++ debian/developer-mode-settings.conf	2015-01-23 19:52:01 +0000
@@ -0,0 +1,13 @@
+
+start on starting dbus
+
+script
+	DEVELOPER_MODE=`gdbus call --system --dest com.canonical.PropertyService --object-path /com/canonical/PropertyService --method com.canonical.PropertyService.GetProperty adb`
+	if [ "$DEVELOPER_MODE" = "(true,)" ] ; then
+		initctl set-env --global "G_MESSAGES_DEBUG=all"
+		initctl set-env --global "QT_LOGGING_RULES=*.debug=true"
+	else
+		initctl set-env --global "G_MESSAGES_DEBUG="
+		initctl set-env --global "QT_LOGGING_RULES=*.debug=false"
+	fi
+end script

=== modified file 'debian/rules'
--- debian/rules	2014-11-10 16:39:17 +0000
+++ debian/rules	2015-01-23 19:52:01 +0000
@@ -22,6 +22,8 @@
 		$$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
 	done; \
 	cd $(CURDIR)
+	mkdir -p debian/tmp/usr/share/upstart/sessions
+	install -m 0644 debian/developer-mode-settings.conf debian/tmp/usr/share/upstart/sessions
 	dh_install -X'*.pyc' --fail-missing
 
 override_dh_makeshlibs:

=== modified file 'debian/ubuntu-system-settings.install'
--- debian/ubuntu-system-settings.install	2014-08-05 08:21:05 +0000
+++ debian/ubuntu-system-settings.install	2015-01-23 19:52:01 +0000
@@ -5,4 +5,5 @@
 usr/share/locale
 usr/share/ubuntu/settings/system
 usr/share/url-dispatcher
+usr/share/upstart/sessions/
 usr/lib/ubuntu-push-client/legacy-helpers