Ubuntu Help App

Merge lp:~dholbach/help-app/misc-debug into lp:help-app

  1. misc-debug
  2. Merge into trunk
Proposed by Daniel Holbach on 2015-05-13
Status: Merged
Approved by: Daniel Holbach on 2015-05-13
Approved revision: 144
Merged at revision: 136
Proposed branch: lp:~dholbach/help-app/misc-debug
Merge into: lp:help-app
Prerequisite: lp:~dholbach/help-app/1433525
Diff against target: 70 lines (+22/-2)
3 files modified
HACKING (+17/-0)
Makefile (+3/-1)
internals/pelicanconf.py (+2/-1)
To merge this branch: bzr merge lp:~dholbach/help-app/misc-debug
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-05-13
Nicholas Skaggs 2015-05-13 Approve on 2015-05-13
Review via email: mp+259011@code.launchpad.net

Commit Message

Add --inspector arg for ubuntu-html5-app-launcher to DEBUG=1 case in Makefile, document it and pelican's more verbose output.

Description of the Change

Add --inspector arg for ubuntu-html5-app-launcher to DEBUG=1 case in Makefile, document it and pelican's more verbose output.

To post a comment you must log in.
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
lp:~dholbach/help-app/misc-debug updated on 2015-05-13
144. By Daniel Holbach on 2015-05-13

fix typo and re-flow paragraph

Nicholas Skaggs (nskaggs) wrote :

LGTM.

review: Approve
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'HACKING'
2--- HACKING 2015-05-13 16:32:57 +0000
3+++ HACKING 2015-05-13 16:32:57 +0000
4@@ -163,6 +163,23 @@
5
6 make check
7
8+Debugging
9+---------
10+
11+Did you find a bug and you're not sure how to debug it?
12+
13+Adding DEBUG=1 to the make command will give you additional information
14+in a few cases. For example will
15+
16+ - pelican print out debug information, which is very useful if you
17+ are changing pelican configuration options or are playing around
18+ with markdown extensions.
19+ - 'make launch' add the --inspector argument to ubuntu-html5-app-launcher.
20+ This will allow you to point your webkit-enabled browser to
21+ http://<yourip>:9221
22+ to examine some of the web attributes of the app.
23+
24+
25 Running the app on a phone
26 --------------------------
27
28
29=== modified file 'Makefile'
30--- Makefile 2015-03-31 08:24:35 +0000
31+++ Makefile 2015-05-13 16:32:57 +0000
32@@ -1,6 +1,7 @@
33 PY?=python
34 PELICAN?=pelican
35 PELICANOPTS=
36+APP_ARGS=
37
38 BASEDIR=$(CURDIR)
39 INTERNALS_DIR=$(BASEDIR)/internals
40@@ -21,6 +22,7 @@
41 DEBUG ?= 0
42 ifeq ($(DEBUG), 1)
43 PELICANOPTS += -D
44+ APP_ARGS += --inspector
45 endif
46
47 MD_FILES=$(wildcard $(INPUTDIR)/pages/*.md)
48@@ -75,7 +77,7 @@
49 cd $(APP_DIR) && click build . && mv *.click $(BASEDIR)
50
51 launch: app
52- cd $(APP_DIR); `grep '^Exec' help.desktop | tail -1 | sed 's/^Exec=//' | sed 's/%.//'` &
53+ cd $(APP_DIR); `grep '^Exec' help.desktop | tail -1 | sed 's/^Exec=//' | sed 's/%.//'` $(APP_ARGS) &
54
55 update-pot:
56 cd $(INTERNALS_DIR) && ./generate-pot
57
58=== modified file 'internals/pelicanconf.py'
59--- internals/pelicanconf.py 2015-05-13 16:32:57 +0000
60+++ internals/pelicanconf.py 2015-05-13 16:32:57 +0000
61@@ -54,7 +54,8 @@
62 TAG_SAVE_AS = ''
63 THEME = TOP_LEVEL_DIR+'static/themes/app/'
64
65-MD_EXTENSIONS = ['local.q-and-a', 'local.external-links', 'attr_list', 'toc']
66+MD_EXTENSIONS = ['local.q-and-a', 'local.external-links',
67+ 'attr_list', 'toc']
68
69 META_TAGS = [
70 '[TOC]',

Subscribers

People subscribed via source and target branches