Merge lp:~sergiusens/mediaplayer-app/click-support into lp:mediaplayer-app

[Sergio Schvezov]

Initial click support sans autopilot tests

[lp:~sergiusens/mediaplayer-app/click-support]

195. By Sergio Schvezov on 2014-01-13

Add default bzr source for click

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:194
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/173/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2279/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2160/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-amd64-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-armhf-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-i386-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2281/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2160/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediaplayer-app-ci/173/rebuild

review: Needs Fixing (continuous-integration)

[lp:~sergiusens/mediaplayer-app/click-support]

196. By Sergio Schvezov on 2014-01-13

Adding missing cmake options

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:195
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/174/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2280/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2161/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-amd64-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-armhf-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-i386-ci/30/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2282/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2161/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediaplayer-app-ci/174/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:196
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/175/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2281
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-armhf-ci/31/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-trusty-i386-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2001
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2283
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2283/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2162
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2162/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4621
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3029

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediaplayer-app-ci/175/rebuild

review: Approve (continuous-integration)

Unmerged revisions

196. By Sergio Schvezov on 2014-01-13

Adding missing cmake options

195. By Sergio Schvezov on 2014-01-13

Add default bzr source for click

194. By Sergio Schvezov on 2014-01-13

Initial click support sans test adaptation

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-09-25 23:08:08 +0000
+++ CMakeLists.txt	2014-01-13 09:49:12 +0000
@@ -35,11 +35,28 @@
 # Standard install paths
 include(GNUInstallDirs)
 
-set(MEDIAPLAYER_DIR ${CMAKE_INSTALL_DATADIR}/mediaplayer-app)
-
-# for dh_translations to extract the domain
-# (regarding syntax consistency, see http://pad.lv/1181187)
-set (GETTEXT_PACKAGE "mediaplayer-app")
+option(INSTALL_TESTS "Install the tests on make install" on)
+option(CLICK_MODE "Installs to a contained location" off)
+
+set(MEDIAPLAYER mediaplayer-app)
+
+if(CLICK_MODE)
+    if(NOT DEFINED BZR_SOURCE)
+        set(BZR_SOURCE "lp:mediaplayer-app")
+    endif(NOT DEFINED BZR_SOURCE)
+    set(APP_PACKAGE_NAME "com.ubuntu.media")
+    set(CMAKE_INSTALL_PREFIX /)
+    set(CMAKE_INSTALL_BINDIR /)
+    set(INSTALL_TESTS off)
+    set (GETTEXT_PACKAGE "${APP_PACKAGE_NAME}")
+    add_definitions("-DCLICK_MODE=1")
+else(CLICK_MODE)
+    # for dh_translations to extract the domain
+    # (regarding syntax consistency, see http://pad.lv/1181187)
+    set (GETTEXT_PACKAGE "${MEDIAPLAYER}")
+endif(CLICK_MODE)
+
+set(MEDIAPLAYER_DIR ${CMAKE_INSTALL_DATADIR}/${MEDIAPLAYER})
 
 # Tests
 enable_testing()
@@ -49,6 +66,7 @@
 add_subdirectory(src)
 add_subdirectory(tests)
 add_subdirectory(po)
+add_subdirectory(click)
 
 configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)
 

=== added directory 'click'
=== added file 'click-build.sh'
--- click-build.sh	1970-01-01 00:00:00 +0000
+++ click-build.sh	2014-01-13 09:49:12 +0000
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+export LC_ALL=C
+
+BZR_SOURCE=${1:-"lp:mediaplayer-app"}
+
+CLICKARCH=armhf
+rm -rf $CLICKARCH-build
+mkdir $CLICKARCH-build
+cd $CLICKARCH-build
+cmake .. -DINSTALL_TESTS=off -DCLICK_MODE=on \
+	-DBZR_REVNO=$(cd ..; bzr revno) \
+	-DBZR_SOURCE="$BZR_SOURCE"
+make DESTDIR=../package install
+cd ..
+click build package

=== added file 'click/CMakeLists.txt'
--- click/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ click/CMakeLists.txt	2014-01-13 09:49:12 +0000
@@ -0,0 +1,10 @@
+if(CLICK_MODE)
+    if(NOT BZR_REVNO)
+        set(BZR_REVNO "latest")
+    endif(NOT BZR_REVNO)
+    configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json
+            DESTINATION ${CMAKE_INSTALL_PREFIX})
+    install(FILES mediaplayer-apparmor.json
+            DESTINATION ${CMAKE_INSTALL_PREFIX})
+endif(CLICK_MODE)

=== added file 'click/manifest.json.in'
--- click/manifest.json.in	1970-01-01 00:00:00 +0000
+++ click/manifest.json.in	2014-01-13 09:49:12 +0000
@@ -0,0 +1,21 @@
+{
+    "description": 
+        "Watch media files",
+    "framework": "ubuntu-sdk-13.10", 
+    "architecture": "armhf",
+    "hooks": {
+        "mediaplayer": {
+            "apparmor": "mediaplayer-apparmor.json", 
+            "desktop": "@CMAKE_INSTALL_DATADIR@/applications/@MEDIAPLAYER@.desktop"
+        }
+    }, 
+    "icon": "share/icons/hicolor/scalable/apps/@MEDIAPLAYER@.svg",
+    "maintainer": "Ubuntu Developers <[e-mail]>",
+    "name": "@APP_PACKAGE_NAME@", 
+    "title": "Media", 
+    "version": "1.0.@BZR_REVNO@",
+    "x-source": {
+        "vcs-bzr": "@BZR_SOURCE@", 
+        "vcs-bzr-revno": "@BZR_REVNO@"
+    }
+}

=== added file 'click/mediaplayer-apparmor.json'
--- click/mediaplayer-apparmor.json	1970-01-01 00:00:00 +0000
+++ click/mediaplayer-apparmor.json	2014-01-13 09:49:12 +0000
@@ -0,0 +1,10 @@
+{
+    "policy_groups": ["accounts",
+                      "audio",
+                      "content_exchange",
+                      "content_exchange_source",
+                      "video",
+                      "video_files"
+                      ], 
+    "policy_version": 1.0
+}

=== modified file 'config.h.in'
--- config.h.in	2013-01-18 17:40:11 +0000
+++ config.h.in	2014-01-13 09:49:12 +0000
@@ -28,11 +28,20 @@
     return installed;
 }
 
+inline bool isClick() {
+#ifdef CLICK_MODE
+    return true;
+#else
+    return false;
+#endif
+}
+
 inline QString mediaPlayerDirectory() {
-    if (isRunningInstalled()) {
+    if (isClick()) {
+        return QDir::currentPath() + "@CMAKE_INSTALL_PREFIX@/@MEDIAPLAYER_DIR@";
+	} else if (isRunningInstalled()) {
         return QString("@CMAKE_INSTALL_PREFIX@/@MEDIAPLAYER_DIR@");
     } else {
         return QString("@mediaplayer_src_SOURCE_DIR@");
     }
 }
-

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2013-06-11 15:54:49 +0000
+++ data/CMakeLists.txt	2014-01-13 09:49:12 +0000
@@ -1,5 +1,5 @@
-set(MEDIAPLAYER_DESKTOP_FILE mediaplayer-app.desktop)
-set(MEDIAPLAYER_APP_ICON mediaplayer-app.svg)
+set(MEDIAPLAYER_DESKTOP_FILE @MEDIAPLAYER@.desktop)
+set(MEDIAPLAYER_APP_ICON @MEDIAPLAYER@.svg)
 
 file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/${MEDIAPLAYER_DESKTOP_FILE})
 file(STRINGS ${MEDIAPLAYER_DESKTOP_FILE}.in DESKTOP_FILE_CONTENTS)

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2013-06-12 12:07:34 +0000
+++ po/CMakeLists.txt	2014-01-13 09:49:12 +0000
@@ -2,7 +2,7 @@
 
 include(FindGettext)
 
-set(DOMAIN mediaplayer-app)
+set(DOMAIN ${GETTEXT_PACKAGE})
 set(POT_FILE ${DOMAIN}.pot)
 file(GLOB PO_FILES *.po)
 file(GLOB_RECURSE I18N_SRCS RELATIVE ${CMAKE_SOURCE_DIR}

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-01-07 19:36:45 +0000
+++ src/CMakeLists.txt	2014-01-13 09:49:12 +0000
@@ -1,21 +1,14 @@
 project(mediaplayer_src)
 
-set(MEDIAPLAYER mediaplayer-app)
-
 include_directories(
     ${CMAKE_BINARY_DIR}
     ${sdkhelper_SOURCE_DIR}
-    #${GSTLIB_INCLUDE_DIRS}
     )
 
 set(mediaplayer_HDRS
-    #thumbnail-provider.h
-    #thumbnail-pipeline-gst.h
     mediaplayer.h)
 
 set(mediaplayer_SRCS
-    #thumbnail-provider.cpp
-    #thumbnail-pipeline-gst.cpp
     mediaplayer.cpp
     main.cpp)
 

=== modified file 'tests/autopilot/CMakeLists.txt'
--- tests/autopilot/CMakeLists.txt	2013-05-23 20:00:37 +0000
+++ tests/autopilot/CMakeLists.txt	2014-01-13 09:49:12 +0000
@@ -3,9 +3,11 @@
 execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
     OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
 
+if(INSTALL_TESTS)
 install(DIRECTORY ${AUTOPILOT_DIR}
     DESTINATION ${PYTHON_PACKAGE_DIR}
     )
+endif(INSTALL_TESTS)
 
 include(${CMAKE_SOURCE_DIR}/cmake/autopilot.cmake)
 declare_autopilot_test("MEDIAPLAYER_APP=${mediaplayer_src_BINARY_DIR}/mediaplayer-app;MEDIAPLAYER_DATA_DIR=${sample_videos_SOURCE_DIR}"

=== modified file 'tests/videos/CMakeLists.txt'
--- tests/videos/CMakeLists.txt	2013-11-01 13:24:19 +0000
+++ tests/videos/CMakeLists.txt	2014-01-13 09:49:12 +0000
@@ -2,6 +2,8 @@
 
 set(MEDIAPLAYER_TEST_VIDEOS small.ogg)
 
-install(FILES ${MEDIAPLAYER_TEST_VIDEOS}
-    DESTINATION ${CMAKE_INSTALL_DATADIR}/mediaplayer-app/videos
-    )
+if(INSTALL_TESTS)
+    install(FILES ${MEDIAPLAYER_TEST_VIDEOS}
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/mediaplayer-app/videos
+        )
+endif(INSTALL_TESTS)