camera-app

Merge lp:~sergiusens/camera-app/click into lp:camera-app

click
Merge into trunk

Proposed by Sergio Schvezov on 2013-09-26

Status:	Merged
Approved by:	Gustavo Pichorim Boiko on 2013-09-26
Approved revision:	194
Merged at revision:	201
Proposed branch:	lp:~sergiusens/camera-app/click
Merge into:	lp:camera-app
Diff against target:	282 lines (+119/-16) 11 files modified CMakeLists.txt (+20/-3) CameraApp/CMakeLists.txt (+9/-8) README.click (+15/-0) camera-app.desktop.in (+1/-1) cameraapplication.cpp (+6/-1) click/CMakeLists.txt (+10/-0) click/camera-apparmor.json (+7/-0) click/manifest.json.in (+21/-0) config.h.in (+20/-1) tests/autopilot/CMakeLists.txt (+2/-1) tests/autopilot/camera_app/tests/__init__.py (+8/-1)
To merge this branch:	bzr merge lp:~sergiusens/camera-app/click
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Gustavo Pichorim Boiko (community)		2013-09-26	Approve on 2013-09-26
PS Jenkins bot	continuous-integration		Approve on 2013-09-26
Review via email: mp+187800@code.launchpad.net

Commit message

Click build support

Description of the change

Still requires a security policy for user metrics input, but aside from that is ok.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-26:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/camera-app-ci/110/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Gustavo Pichorim Boiko (boiko) wrote on 2013-09-26:

201 + static bool click = (QString("@CLICK_MODE@") != QString("off"));

This is not reliable: cmake accepts also uppercase ON/OFF, and also lower and upper case true/false as arguments for enabling/disabling the arguments.

For instance, if I don't set CLICK_MODE to anything, the value will already be different:
static bool click = (QString("OFF") != QString("off"))

Can you set the value of another variable in CMakeLists.txt to some value depending on whether CLICK_MODE is enabled or disabled?

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-26:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/camera-app-ci/112/rebuild

review: Needs Fixing (continuous-integration)

lp:~sergiusens/camera-app/click updated on 2013-09-26

192. By Sergio Schvezov on 2013-09-26: use a fixed tag for config.h
193. By Sergio Schvezov on 2013-09-26: Adding a hack to detect if installed and default to click/confined.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-26:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/camera-app-ci/113/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-09-26:

Click here to trigger a rebuild:
http://s-jenkins:8080/job/camera-app-ci/114/rebuild

review: Approve (continuous-integration)

Revision history for this message

Gustavo Pichorim Boiko (boiko) wrote on 2013-09-26:

106 +pkcon install-local com.ubuntu.notes_*.click

It should probably read com.ubuntu.camera_

review: Needs Fixing

lp:~sergiusens/camera-app/click updated on 2013-09-26

194. By Sergio Schvezov on 2013-09-26: Copy paste typo fix

Revision history for this message

Gustavo Pichorim Boiko (boiko) wrote on 2013-09-26:

Looks good now!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Sergio Schvezov

Ubuntu Phablet Team

deaunapaul

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2013-09-23 12:40:33 +0000
 +++ CMakeLists.txt	2013-09-26 21:51:29 +0000
@@ -15,7 +15,23 @@
  # Standard install paths
  include(GNUInstallDirs)
--set(CAMERA_APP_DIR ${CMAKE_INSTALL_DATADIR}/camera-app)
++option(INSTALL_TESTS "Install the tests on make install" on)
++option(CLICK_MODE "Installs to a contained location" off)
++
++if(CLICK_MODE)
++    set(CAMERA_APP camera)
++    set(CMAKE_INSTALL_PREFIX /)
++    set(CAMERA_APP_DIR /)
++    set(CMAKE_INSTALL_BINDIR /)
++    set(PLUGIN_BASE lib/${CMAKE_LIBRARY_ARCHITECTURE})
++    set(PLUGIN_DIR ${PLUGIN_BASE}/CameraApp)
++    set(DESKTOP_EXEC "./${CAMERA_APP}")
++    set(CLICK_TAG click)
++else(CLICK_MODE)
++    set(CAMERA_APP camera-app)
++    set(CAMERA_APP_DIR ${CMAKE_INSTALL_DATADIR}/${CAMERA_APP})
++    set(DESKTOP_EXEC ${CAMERA_APP})
++endif(CLICK_MODE)
  configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)
@@ -27,8 +43,6 @@
      ${Qt5Multimedia_INCLUDE_DIRS}
+     )
--set(CAMERA_APP camera-app)
--
  set(camera_app_HDRS
      cameraapplication.h)
@@ -74,6 +88,8 @@
  file(STRINGS ${DESKTOP_FILE}.in DESKTOP_FILE_CONTENTS)
  foreach(LINE ${DESKTOP_FILE_CONTENTS})
      string(REGEX REPLACE "tr\\\(\"(.*)\"\\\)" "\\1" LINE "${LINE}")
++    string(REGEX REPLACE "\@DESKTOP_EXEC\@"
++        "${DESKTOP_EXEC}" LINE "${LINE}")
      file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} "${LINE}\n")
  endforeach(LINE)
@@ -82,6 +98,7 @@
+     )
  add_subdirectory(CameraApp)
++add_subdirectory(click)
  file(GLOB_RECURSE I18N_SRC_FILES
       RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
 === modified file 'CameraApp/CMakeLists.txt'
 --- CameraApp/CMakeLists.txt	2013-01-18 16:09:32 +0000
 +++ CameraApp/CMakeLists.txt	2013-09-26 21:51:29 +0000
@@ -20,18 +20,19 @@
  # Qt5's cmake does not export QT_IMPORTS_DIR, lets query qmake on our own for now
++if(NOT CLICK_MODE)
  get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
--function(QUERY_QMAKE VAR RESULT)
--  exec_program(${QMAKE_EXECUTABLE} ARGS "-query ${VAR}" RETURN_VALUE return_code OUTPUT_VARIABLE output )
--  if(NOT return_code)
--    file(TO_CMAKE_PATH "${output}" output)
--    set(${RESULT} ${output} PARENT_SCOPE)
--  endif(NOT return_code)
++    function(QUERY_QMAKE VAR RESULT)
++    exec_program(${QMAKE_EXECUTABLE} ARGS "-query ${VAR}" RETURN_VALUE return_code OUTPUT_VARIABLE output )
++    if(NOT return_code)
++        file(TO_CMAKE_PATH "${output}" output)
++        set(${RESULT} ${output} PARENT_SCOPE)
++    endif(NOT return_code)
  endfunction(QUERY_QMAKE)
  query_qmake(QT_INSTALL_QML QT_IMPORTS_DIR)
--
--
  set(PLUGIN_DIR ${QT_IMPORTS_DIR}/CameraApp)
++endif(NOT CLICK_MODE)
++
  install(TARGETS camera-qml DESTINATION ${PLUGIN_DIR})
  install(FILES qmldir DESTINATION ${PLUGIN_DIR})
 === added file 'README.click'
 --- README.click	1970-01-01 00:00:00 +0000
 +++ README.click	2013-09-26 21:51:29 +0000
@@ -0,0 +1,15 @@
++Building for click
++==================
++
++To build for a click package configure cmake as:
++
++mkdir build
++cd build
++cmake [path_to_this_location] -DINSTALL_TESTS=off -DCLICK_MODE=on \
++    -DBZR_REVNO=$(cd [path_to_this_location]; bzr revno)
++make DESTDIR=package install
++click build package
++
++This package can be installed by running:
++
++pkcon install-local com.ubuntu.camera_*.click
 === modified file 'camera-app.desktop.in'
 --- camera-app.desktop.in	2013-06-11 16:05:35 +0000
 +++ camera-app.desktop.in	2013-09-26 21:51:29 +0000
@@ -3,7 +3,7 @@
  Name=tr("Camera")
  GenericName=camera-app
  Comment=tr("Camera application")
--Exec=camera-app --fullscreen %u
++Exec=@DESKTOP_EXEC@ --fullscreen %u
  Terminal=false
  Icon=camera-app
  #MimeType=x-scheme-handler/contact;x-scheme-handler/call
 === modified file 'cameraapplication.cpp'
 --- cameraapplication.cpp	2013-09-23 12:40:33 +0000
 +++ cameraapplication.cpp	2013-09-26 21:51:29 +0000
@@ -76,8 +76,13 @@
      m_view->setTitle("Camera");
      m_view->rootContext()->setContextProperty("application", this);
      m_view->engine()->setBaseUrl(QUrl::fromLocalFile(cameraAppDirectory()));
++    if (isClick()) {
++        m_view->engine()->addImportPath(cameraAppImportDirectory());
++        qDebug() << "Import path added" << cameraAppImportDirectory();
++    }
++    qDebug() << "Camera app directory" << cameraAppDirectory();
      QObject::connect(m_view->engine(), SIGNAL(quit()), this, SLOT(quit()));
--    m_view->setSource(QUrl::fromLocalFile("camera-app.qml"));
++    m_view->setSource(QUrl::fromLocalFile(sourceQml()));
      if (arguments().contains(QLatin1String("--fullscreen"))) m_view->showFullScreen();
      else m_view->show();
 === added directory 'click'
 === added file 'click/CMakeLists.txt'
 --- click/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ click/CMakeLists.txt	2013-09-26 21:51:29 +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 camera-apparmor.json
++            DESTINATION ${CMAKE_INSTALL_PREFIX})
++endif(CLICK_MODE)
 === added file 'click/camera-apparmor.json'
 --- click/camera-apparmor.json	1970-01-01 00:00:00 +0000
 +++ click/camera-apparmor.json	2013-09-26 21:51:29 +0000
@@ -0,0 +1,7 @@
++{
++    "policy_groups": ["picture_files",
++                      "camera",
++                      "audio"
++                      ],
++    "policy_version": 1.0
++}
 === added file 'click/manifest.json.in'
 --- click/manifest.json.in	1970-01-01 00:00:00 +0000
 +++ click/manifest.json.in	2013-09-26 21:51:29 +0000
@@ -0,0 +1,21 @@
++{
++    "description":
++        "An application to take pictures and videos with the device cameras",
++    "framework": "ubuntu-sdk-13.10",
++    "architecture": "armhf",
++    "hooks": {
++        "camera": {
++            "apparmor": "camera-apparmor.json",
++            "desktop": "@CMAKE_INSTALL_DATADIR@/applications/@DESKTOP_FILE@"
++        }
++    },
++    "icon": "camera-app",
++    "maintainer": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
++    "name": "com.ubuntu.camera",
++    "title": "Camera",
++    "version": "2.9.1",
++    "x-source": {
++        "vcs-bzr": "lp:camera-app",
++        "vcs-bzr-revno": "@BZR_REVNO@"
++    }
++}
 === modified file 'config.h.in'
 --- config.h.in	2012-10-30 15:48:34 +0000
 +++ config.h.in	2013-09-26 21:51:29 +0000
@@ -21,6 +21,11 @@
  #include <QtCore/QCoreApplication>
  #include <QtCore/QDir>
++inline bool isClick() {
++    static bool click = (QString("@CLICK_TAG@") == QString("click"));
++    return click;
++}
++
  inline bool isRunningInstalled() {
      static bool installed = (QCoreApplication::applicationDirPath() ==
                               QDir(("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@")).canonicalPath());
@@ -28,10 +33,24 @@
+ }
  inline QString cameraAppDirectory() {
--    if (isRunningInstalled()) {
++    if (isClick()) {
++        return QDir::currentPath();
++    } else if (isRunningInstalled()) {
          return QString("@CMAKE_INSTALL_PREFIX@/@CAMERA_APP_DIR@/");
      } else {
          return QString("@CMAKE_SOURCE_DIR@/");
+     }
+ }
++inline QString cameraAppImportDirectory() {
++    return QDir::currentPath() + "/@PLUGIN_BASE@";
++}
++
++inline QString sourceQml() {
++    static QString qmlFile("camera-app.qml");
++    if (isClick()) {
++        return QDir::currentPath() + "/" + qmlFile;
++    } else {
++        return qmlFile;
++    }
++}
 === modified file 'tests/autopilot/CMakeLists.txt'
 --- tests/autopilot/CMakeLists.txt	2013-01-08 13:44:38 +0000
 +++ tests/autopilot/CMakeLists.txt	2013-09-26 21:51:29 +0000
@@ -3,7 +3,8 @@
  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)
 === modified file 'tests/autopilot/camera_app/tests/__init__.py'
 --- tests/autopilot/camera_app/tests/__init__.py	2013-05-25 07:16:22 +0000
 +++ tests/autopilot/camera_app/tests/__init__.py	2013-09-26 21:51:29 +0000
@@ -33,14 +33,17 @@
          ('with touch', dict(input_device_class=Touch))]
      local_location = "../../camera-app"
++    deb_location = '/usr/bin/camera-app'
      def setUp(self):
          self.pointing_device = Pointer(self.input_device_class.create())
          super(CameraAppTestCase, self).setUp()
          if os.path.exists(self.local_location):
              self.launch_test_local()
--        else:
++        elif os.path.exists(self.deb_location):
              self.launch_test_installed()
++        else:
++            self.launch_click_installed()
      def launch_test_local(self):
          self.app = self.launch_test_application(
@@ -57,6 +60,10 @@
                  "--desktop_file_hint=/usr/share/applications/camera-app.desktop",
                  app_type='qt')
++    def launch_click_installed(self):
++        self.app = self.launch_click_package(
++            "com.ubuntu.camera")
++
      def get_center(self, object_proxy):
          x, y, w, h = object_proxy.globalRect
          return [x + (w / 2), y + (h / 2)]