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

Proposed by Daniel Holbach
Status: Merged
Approved by: Daniel Holbach
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
Nicholas Skaggs (community) Approve
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.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
lp:~dholbach/help-app/misc-debug updated
144. By Daniel Holbach

fix typo and re-flow paragraph

Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

LGTM.

review: Approve
Revision history for this message
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
=== modified file 'HACKING'
--- HACKING 2015-05-13 16:32:57 +0000
+++ HACKING 2015-05-13 16:32:57 +0000
@@ -163,6 +163,23 @@
163163
164 make check164 make check
165165
166Debugging
167---------
168
169Did you find a bug and you're not sure how to debug it?
170
171Adding DEBUG=1 to the make command will give you additional information
172in a few cases. For example will
173
174 - pelican print out debug information, which is very useful if you
175 are changing pelican configuration options or are playing around
176 with markdown extensions.
177 - 'make launch' add the --inspector argument to ubuntu-html5-app-launcher.
178 This will allow you to point your webkit-enabled browser to
179 http://<yourip>:9221
180 to examine some of the web attributes of the app.
181
182
166Running the app on a phone183Running the app on a phone
167--------------------------184--------------------------
168185
169186
=== modified file 'Makefile'
--- Makefile 2015-03-31 08:24:35 +0000
+++ Makefile 2015-05-13 16:32:57 +0000
@@ -1,6 +1,7 @@
1PY?=python1PY?=python
2PELICAN?=pelican2PELICAN?=pelican
3PELICANOPTS=3PELICANOPTS=
4APP_ARGS=
45
5BASEDIR=$(CURDIR)6BASEDIR=$(CURDIR)
6INTERNALS_DIR=$(BASEDIR)/internals7INTERNALS_DIR=$(BASEDIR)/internals
@@ -21,6 +22,7 @@
21DEBUG ?= 022DEBUG ?= 0
22ifeq ($(DEBUG), 1)23ifeq ($(DEBUG), 1)
23 PELICANOPTS += -D24 PELICANOPTS += -D
25 APP_ARGS += --inspector
24endif26endif
2527
26MD_FILES=$(wildcard $(INPUTDIR)/pages/*.md)28MD_FILES=$(wildcard $(INPUTDIR)/pages/*.md)
@@ -75,7 +77,7 @@
75 cd $(APP_DIR) && click build . && mv *.click $(BASEDIR)77 cd $(APP_DIR) && click build . && mv *.click $(BASEDIR)
7678
77launch: app79launch: app
78 cd $(APP_DIR); `grep '^Exec' help.desktop | tail -1 | sed 's/^Exec=//' | sed 's/%.//'` &80 cd $(APP_DIR); `grep '^Exec' help.desktop | tail -1 | sed 's/^Exec=//' | sed 's/%.//'` $(APP_ARGS) &
7981
80update-pot:82update-pot:
81 cd $(INTERNALS_DIR) && ./generate-pot83 cd $(INTERNALS_DIR) && ./generate-pot
8284
=== modified file 'internals/pelicanconf.py'
--- internals/pelicanconf.py 2015-05-13 16:32:57 +0000
+++ internals/pelicanconf.py 2015-05-13 16:32:57 +0000
@@ -54,7 +54,8 @@
54TAG_SAVE_AS = ''54TAG_SAVE_AS = ''
55THEME = TOP_LEVEL_DIR+'static/themes/app/'55THEME = TOP_LEVEL_DIR+'static/themes/app/'
5656
57MD_EXTENSIONS = ['local.q-and-a', 'local.external-links', 'attr_list', 'toc']57MD_EXTENSIONS = ['local.q-and-a', 'local.external-links',
58 'attr_list', 'toc']
5859
59META_TAGS = [60META_TAGS = [
60 '[TOC]',61 '[TOC]',

Subscribers

People subscribed via source and target branches