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

[Daniel Holbach]

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

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

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:143
http://91.189.93.70:8080/job/help-app-ci/32/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/help-app-utopic-amd64-ci/32
    SUCCESS: http://91.189.93.70:8080/job/help-app-vivid-amd64-ci/34

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/help-app-ci/32/rebuild

review: Approve (continuous-integration)

[lp:~dholbach/help-app/misc-debug]

144. By Daniel Holbach on 2015-05-13

fix typo and re-flow paragraph

[Nicholas Skaggs (nskaggs)]

LGTM.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:144
http://91.189.93.70:8080/job/help-app-ci/33/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/help-app-utopic-amd64-ci/33
    SUCCESS: http://91.189.93.70:8080/job/help-app-vivid-amd64-ci/35

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/help-app-ci/33/rebuild

review: Approve (continuous-integration)

=== modified file 'HACKING'
--- HACKING	2015-05-13 16:32:57 +0000
+++ HACKING	2015-05-13 16:32:57 +0000
@@ -163,6 +163,23 @@
 
 	make check
 
+Debugging
+---------
+
+Did you find a bug and you're not sure how to debug it? 
+
+Adding DEBUG=1 to the make command will give you additional information
+in a few cases. For example will 
+
+ - pelican print out debug information, which is very useful if you
+   are changing pelican configuration options or are playing around
+   with markdown extensions.
+ - 'make launch' add the --inspector argument to ubuntu-html5-app-launcher. 
+   This will allow you to point your webkit-enabled browser to  
+    http://<yourip>:9221  
+   to examine some of the web attributes of the app.
+  
+
 Running the app on a phone
 --------------------------
 

=== modified file 'Makefile'
--- Makefile	2015-03-31 08:24:35 +0000
+++ Makefile	2015-05-13 16:32:57 +0000
@@ -1,6 +1,7 @@
 PY?=python
 PELICAN?=pelican
 PELICANOPTS=
+APP_ARGS=
 
 BASEDIR=$(CURDIR)
 INTERNALS_DIR=$(BASEDIR)/internals
@@ -21,6 +22,7 @@
 DEBUG ?= 0
 ifeq ($(DEBUG), 1)
 	PELICANOPTS += -D
+	APP_ARGS += --inspector
 endif
 
 MD_FILES=$(wildcard $(INPUTDIR)/pages/*.md)
@@ -75,7 +77,7 @@
 	cd $(APP_DIR) && click build . && mv *.click $(BASEDIR)
 
 launch: app
-	cd $(APP_DIR); `grep '^Exec' help.desktop | tail -1 | sed 's/^Exec=//' | sed 's/%.//'` &
+	cd $(APP_DIR); `grep '^Exec' help.desktop | tail -1 | sed 's/^Exec=//' | sed 's/%.//'` $(APP_ARGS) &
 
 update-pot:
 	cd $(INTERNALS_DIR) && ./generate-pot

=== 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 @@
 TAG_SAVE_AS = ''
 THEME = TOP_LEVEL_DIR+'static/themes/app/'
 
-MD_EXTENSIONS = ['local.q-and-a', 'local.external-links', 'attr_list', 'toc']
+MD_EXTENSIONS = ['local.q-and-a', 'local.external-links',
+                 'attr_list', 'toc']
 
 META_TAGS = [
     '[TOC]',