Merge lp:~ted/ubuntu-calendar-app/url-dispatcher into lp:ubuntu-calendar-app

[Ted Gould]

Add URL dispatcher configuration

Configure calendar-app to get the calendar:// URL

This requires an unreleased version of URL dispatcher, but should be fine to merge as it just won't be used until that version lands.

[David Planella (dpm)]

Thanks, and sorry for the delay with the review! Has that URL dispatcher version landed now?

review: Approve

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

FAILED: Continuous integration, rev:182
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/259/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/812/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/259/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/259/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/93/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/259/rebuild

review: Needs Fixing (continuous-integration)

[David Planella (dpm)]

We made some changes to the manifest file recently, which now conflict with the branch.

Would you mind merging trunk and pushing again? Thanks!

review: Needs Fixing

[lp:~ted/ubuntu-calendar-app/url-dispatcher]

183. By Ted Gould on 2014-01-27

Merging trunk

184. By Ted Gould on 2014-01-27

Making the URL dispatcher work more like the desktop file stuff does now

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

PASSED: Continuous integration, rev:184
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/260/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/816
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/260
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/260
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-ci/94

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/260/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

LGTM, thanks!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-01-18 23:29:11 +0000
+++ CMakeLists.txt	2014-01-27 14:55:30 +0000
@@ -9,6 +9,7 @@
 
 set(APP_NAME calendar)
 set(DESKTOP_FILE "${PROJECT_NAME}_${APP_NAME}.desktop")
+set(URLS_FILE "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
 set(MAIN_QML calendar.qml)
 set(ICON calendar64.png)
 set(AUTOPILOT_DIR calendar_app)
@@ -24,6 +25,7 @@
 	set(DATA_DIR /)
 	set(EXEC "qmlscene %u ${MAIN_QML}")
 	set(DESKTOP_DIR ${DATA_DIR})
+	set(URLS_DIR ${DATA_DIR})
 else(CLICK_MODE)
 	set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
 	set(EXEC ${APP_HARDCODE})
@@ -33,6 +35,7 @@
 	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}
 		DESTINATION ${CMAKE_INSTALL_BINDIR})
 	set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
+	set(URLS_DIR ${CMAKE_INSTALL_DATADIR}/url-dispatcher/urls)
 endif(CLICK_MODE)
 
 file(GLOB_RECURSE I18N_SRC_FILES
@@ -49,6 +52,8 @@
 configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} DESTINATION ${DESKTOP_DIR})
  
+install(FILES ${URLS_FILE} DESTINATION ${URLS_DIR})
+
 # Tests
 enable_testing()
 

=== modified file 'click/manifest.json.in'
--- click/manifest.json.in	2014-01-27 14:22:40 +0000
+++ click/manifest.json.in	2014-01-27 14:55:30 +0000
@@ -4,7 +4,8 @@
     "hooks": {
         "@APP_NAME@": {
             "apparmor": "apparmor.json",
-            "desktop": "@DESKTOP_FILE@"
+            "desktop": "@DESKTOP_FILE@",
+            "urls": "@URLS_FILE@"
         }
     },
     "icon": "@ICON@",

=== added file 'com.ubuntu.calendar_calendar.url-dispatcher'
--- com.ubuntu.calendar_calendar.url-dispatcher	1970-01-01 00:00:00 +0000
+++ com.ubuntu.calendar_calendar.url-dispatcher	2014-01-27 14:55:30 +0000
@@ -0,0 +1,5 @@
+[
+	{
+		"protocol": "calendar"
+	}
+]