Merge lp:~sergiusens/ubuntu-clock-app/reboot-packaging into lp:~dholbach/ubuntu-clock-app/reboot-packaging

[Sergio Schvezov]

Changes:
- used a proper qt_imports_dir (still needs qml import updates).
- moved gnuinstalldirs higher up for better path management
- removed a bunch of very custom variables and build on top
- removed the install target for the gallery directory as it was a dup and going to the wrong path
- not installing icon for deb and just rely on us using the desktop default (we can depend on the suru icon set, it's there)
- made some rules filter out if not in qtcreator
- I've changed the path for a couple of things to use common subpaths in most cases, it may break some of your scenarios.

TODOs:
- change qml imports
- test (I haven't touched anything autopilot)

I hope this unblocks you guys

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

FAILED: Continuous integration, rev:60
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~sergiusens/ubuntu-clock-app/reboot-packaging/+merge/230011/+edit-commit-message

http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/128/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1411/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1411/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-utopic-amd64-ci/128

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-dev-ubuntu-clock-app-utopic-3.0-ci/128/rebuild

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

- change qml imports

What do you mean by this? Does this mean "import Alarm.Settings 1.0" in the qml code will change to something else?

- I've changed the path for a couple of things to use common subpaths in most cases, it may break some of your scenarios.

Not exactly sure what you mean by scenarios.

review: Needs Information

[Sergio Schvezov (sergiusens)]

On Thu, Aug 7, 2014 at 7:34 PM, Nekhelesh Ramananthan <<email address hidden>
> wrote:

> Review: Needs Information
>
> - change qml imports
>
> What do you mean by this? Does this mean "import Alarm.Settings 1.0" in
> the qml code will change to something else?
>

Since Daniel mentioned a better location for the libs I appended a Clock.
to the path, so most likely it means you need to prepend this.

>
> - I've changed the path for a couple of things to use common subpaths in
> most cases, it may break some of your scenarios.
>
> Not exactly sure what you mean by scenarios.
>

In other words, needs testing in qt creator

I don't have a full environment with me to test all this; I'll look into
this in the AM

Is this landing into the archives btw?

[Nekhelesh Ramananthan (nik90)]

> On Thu, Aug 7, 2014 at 7:34 PM, Nekhelesh Ramananthan <<email address hidden>
> > wrote:
>
> > Review: Needs Information
> >
> > - change qml imports
> >
> > What do you mean by this? Does this mean "import Alarm.Settings 1.0" in
> > the qml code will change to something else?
> >
>
> Since Daniel mentioned a better location for the libs I appended a Clock.
> to the path, so most likely it means you need to prepend this.
>
>

Ah okay. I don't think it will require a prepend since the QMLDir files still state Alarm.Setting or DateTime etc. But I will have to try in the morning to confirm that.

> >
> > - I've changed the path for a couple of things to use common subpaths in
> > most cases, it may break some of your scenarios.
> >
> > Not exactly sure what you mean by scenarios.
> >
>
> In other words, needs testing in qt creator
>
> I don't have a full environment with me to test all this; I'll look into
> this in the AM

Initial run on the device failed as it received a failed event. Again will see in the morning what is the issue.
>
> Is this landing into the archives btw?

We are planning to swap the old clock app with the new clock app (next week) in the default phone images since we are nearly feature complete. This is why I am trying to get the cmake stuff and the debian packaging done asap.

[lp:~sergiusens/ubuntu-clock-app/reboot-packaging]

60. By Daniel Holbach on 2014-08-08

* Using GnuInstallDirs takes care of the arch triplet.
* Used a proper qt_imports_dir (still needs qml import updates).
* Moved gnuinstalldirs higher up for better path management.
* Removed a bunch of very custom variables and build on top.
* Removed the install target for the gallery directory as it was a dup
  and going to the wrong path.
* Not installing icon for deb and just rely on us using the desktop
  default (we can depend on the suru icon set, it's there).
* Made some rules filter out if not in qtcreator.
* Changed the path for a couple of things to use common subpaths in most
  cases.

[Daniel Holbach (dholbach)]

Thanks a lot. Great work. This almost fixes LP: #1354081 and takes care of LP: #1354082 for good.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-05 07:46:44 +0000
+++ CMakeLists.txt	2014-08-07 21:06:25 +0000
@@ -2,7 +2,6 @@
 cmake_minimum_required(VERSION 2.8.9)
 
 set (UBUNTU_PROJECT_TYPE "ClickApp" CACHE INTERNAL "Tells QtCreator this is a Click application project")
-set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra")
 
 find_package(Qt5Core)
@@ -20,38 +19,33 @@
 set(APP_NAME                clock)
 set(APP_HARDCODE            ubuntu-clock-app)
 set(MAIN_QML                ${APP_HARDCODE}.qml)
-set(ICON                    [e-mail])
+set(ICON                    clock-app)
+
+# Standard install paths 
+include(GNUInstallDirs) 
 
 #set install paths
-if(${CLICK_MODE})
-  set(CMAKE_INSTALL_PREFIX /)
-  set(DATA_DIR /)
-  set(DESKTOP_DIR ${DATA_DIR})
-  set(UBUNTU-CLOCK-APP_DIR    "share/qml/ubuntu-clock-app")
-  set(ICON "${UBUNTU-CLOCK-APP_DIR}/${ICON}")
+if(CLICK_MODE)
+  set(CMAKE_INSTALL_PREFIX "/")
+  set(UBUNTU-CLOCK_APP_DIR    "${CMAKE_INSTALL_DATADIR}/qml")
 
-  execute_process(
-      COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
-      OUTPUT_VARIABLE ARCH_TRIPLET
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-  set(QT_IMPORTS_DIR "lib/${ARCH_TRIPLET}")
-else()
-  set(DATA_DIR "share/clockapp")
-  set(DESKTOP_DIR ${DATA_DIR})
-  set(ICON "${DATA_DIR}/${ICON}")
-  set(UBUNTU-CLOCK-APP_DIR    "share/ubuntu-clock-app/qml")
-  include(GNUInstallDirs)
   set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}")
-endif()
+  set(EXEC "qmlscene $@ ${UBUNTU-CLOCK_APP_DIR}/${MAIN_QML}")
+else(CLICK_MODE)
+  set(UBUNTU-CLOCK_APP_DIR "${CMAKE_INSTALL_DATADIR}/ubuntu-clock-app/qml")
+  execute_process( 
+    COMMAND qmake -query QT_INSTALL_QML 
+            OUTPUT_VARIABLE QT_IMPORTS_DIR 
+            OUTPUT_STRIP_TRAILING_WHITESPACE 
+    )
 
-set(EXEC "qmlscene $@ ${UBUNTU-CLOCK-APP_DIR}/${MAIN_QML}")
+  set(EXEC "qmlscene $@ ${CMAKE_INSTALL_DATADIR}/${UBUNTU-CLOCK_APP_DIR}/${MAIN_QML}")
+endif(CLICK_MODE)
 
 if(${CLICK_MODE})
   install(FILES manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
+  install(FILES "${APP_HARDCODE}.json" DESTINATION ${CMAKE_INSTALL_DATADIR})
 endif()
-install(DIRECTORY "app/graphics" DESTINATION ${DATA_DIR})
-install(FILES "${APP_HARDCODE}.json" DESTINATION ${DATA_DIR})
 
 add_subdirectory(app)
 add_subdirectory(backend)
 
=== modified file 'app/CMakeLists.txt'
--- app/CMakeLists.txt	2014-07-13 11:18:31 +0000
+++ app/CMakeLists.txt	2014-08-07 21:06:25 +0000
@@ -1,14 +1,20 @@
-file(GLOB QML_JS_FILES *.qml *.js *.png)
-
-# make the files visible on qtcreator
+if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
 add_custom_target(ubuntu-clock-app_QMlFiles ALL SOURCES ${QML_JS_FILES})
+endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+
+
+if(CLICK_MODE)
+  set(ICON "${ICON}@30.png")
+  install(FILES ${ICON} DESTINATION ${CMAKE_INSTALL_PREFIX})
+endif(CLICK_MODE)
 
 # substitute variables in the desktop file
 set(DESKTOP_FILE "ubuntu-clock-app.desktop")
 configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} DESTINATION ${DESKTOP_DIR})
-install(FILES ${QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK-APP_DIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} 
+    DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+install(FILES ${MAIN_QML} DESTINATION ${UBUNTU-CLOCK_APP_DIR})
 
 add_subdirectory(clock)
 add_subdirectory(alarm)
 
=== modified file 'app/alarm/CMakeLists.txt'
--- app/alarm/CMakeLists.txt	2014-06-16 14:09:12 +0000
+++ app/alarm/CMakeLists.txt	2014-08-07 21:06:25 +0000
@@ -3,4 +3,4 @@
 # make the files visible in the qtcreator tree
 add_custom_target(ubuntu-clock-app_alarm_QMlFiles ALL SOURCES ${ALARM_QML_JS_FILES})
 
-install(FILES ${ALARM_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK-APP_DIR}/alarm)
+install(FILES ${ALARM_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK_APP_DIR}/alarm)
 
=== modified file 'app/clock/CMakeLists.txt'
--- app/clock/CMakeLists.txt	2014-06-06 18:45:49 +0000
+++ app/clock/CMakeLists.txt	2014-08-07 21:06:25 +0000
@@ -3,4 +3,4 @@
 # make the files visible in the qtcreator tree
 add_custom_target(ubuntu-clock-app_clock_QMlFiles ALL SOURCES ${CLOCK_QML_JS_FILES})
 
-install(FILES ${CLOCK_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK-APP_DIR}/clock)
+install(FILES ${CLOCK_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK_APP_DIR}/clock)
 
=== modified file 'app/components/CMakeLists.txt'
--- app/components/CMakeLists.txt	2014-06-06 18:45:49 +0000
+++ app/components/CMakeLists.txt	2014-08-07 21:06:25 +0000
@@ -3,4 +3,4 @@
 # make the files visible in the qtcreator tree
 add_custom_target(ubuntu-clock-app_components_QMlFiles ALL SOURCES ${COMPONENTS_QML_JS_FILES})
 
-install(FILES ${COMPONENTS_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK-APP_DIR}/components)
+install(FILES ${COMPONENTS_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK_APP_DIR}/components)
 
=== modified file 'app/graphics/CMakeLists.txt'
--- app/graphics/CMakeLists.txt	2014-06-06 18:45:49 +0000
+++ app/graphics/CMakeLists.txt	2014-08-07 21:06:25 +0000
@@ -1,6 +1,8 @@
-file(GLOB IMAGES_PNG_FILES *.png *.jpg)
+file(GLOB GRAPHICS_FILES *.png *.jpg)
 
 # make the files visible in the qtcreator tree
-add_custom_target(ubuntu-clock-app_graphics_PNGFiles ALL SOURCES ${IMAGES_PNG_FILES})
+if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+  add_custom_target(ubuntu-clock-app_graphics_PNGFiles ALL SOURCES ${IMAGES_PNG_FILES})
+endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
 
-install(FILES ${IMAGES_PNG_FILES} DESTINATION ${UBUNTU-CLOCK-APP_DIR}/graphics)
+install(FILES ${GRAPHICS_FILES} DESTINATION ${UBUNTU-CLOCK_APP_DIR}/graphics)
 
=== modified file 'app/worldclock/CMakeLists.txt'
--- app/worldclock/CMakeLists.txt	2014-07-13 11:18:31 +0000
+++ app/worldclock/CMakeLists.txt	2014-08-07 21:06:25 +0000
@@ -3,4 +3,4 @@
 # make the files visible in the qtcreator tree
 add_custom_target(ubuntu-clock-app_worldclock_QMlFiles ALL SOURCES ${WORLDCLOCK_QML_JS_FILES})
 
-install(FILES ${WORLDCLOCK_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK-APP_DIR}/worldclock)
+install(FILES ${WORLDCLOCK_QML_JS_FILES} DESTINATION ${UBUNTU-CLOCK_APP_DIR}/worldclock)
 
=== modified file 'backend/CMakeLists.txt'
--- backend/CMakeLists.txt	2014-07-26 09:34:15 +0000
+++ backend/CMakeLists.txt	2014-08-07 21:06:25 +0000
@@ -66,12 +66,14 @@
     DEPENDS ${QMLFILES}
 )
 
+set(MODULE_PATH ${QT_IMPORTS_DIR}/Clock)
+
 # Install plugin file
-install(TARGETS timezone DESTINATION ${QT_IMPORTS_DIR}/Timezone/)
-install(FILES   modules/Timezone/qmldir DESTINATION ${QT_IMPORTS_DIR}/Timezone/)
-
-install(TARGETS datetime DESTINATION ${QT_IMPORTS_DIR}/DateTime/)
-install(FILES   modules/DateTime/qmldir DESTINATION ${QT_IMPORTS_DIR}/DateTime/)
-
-install(TARGETS alarmsettings DESTINATION ${QT_IMPORTS_DIR}/Alarm/Settings/)
-install(FILES   modules/Alarm/Settings/qmldir DESTINATION ${QT_IMPORTS_DIR}/Alarm/Settings/)
+install(TARGETS timezone DESTINATION ${MODULE_PATH}/Timezone/)
+install(FILES   modules/Timezone/qmldir DESTINATION ${MODULE_PATH}/Timezone/)
+
+install(TARGETS datetime DESTINATION ${MODULE_PATH}/DateTime/)
+install(FILES   modules/DateTime/qmldir DESTINATION ${MODULE_PATH}/DateTime/)
+
+install(TARGETS alarmsettings DESTINATION ${MODULE_PATH}/Alarm/Settings/)
+install(FILES   modules/Alarm/Settings/qmldir DESTINATION ${MODULE_PATH}/Alarm/Settings/)
 
=== removed directory 'cmake'
=== removed file 'cmake/Click.cmake'
--- cmake/Click.cmake	2014-06-06 18:45:49 +0000
+++ cmake/Click.cmake	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-if(CLICK_MODE)
-    STRING(REPLACE "/usr/" "/"  QT_IMPORTS_DIR  ${QT_IMPORTS_DIR})
-    set(CMAKE_INSTALL_PREFIX /)
-    set(CMAKE_INSTALL_BINDIR /)
-        set(DATA_DIR /)
-        set(EXEC "qmlscene $@ -I .${QT_IMPORTS_DIR} ${UBUNTU-CLOCK-APP_DIR}/${MAIN_QML}")
-        set(DESKTOP_DIR ${DATA_DIR})
-        set(ICON ".${DATA_DIR}/${ICON}")
-    install(FILES manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
-    install(DIRECTORY "app/graphics" DESTINATION ${DATA_DIR})
-    install(FILES "${CMAKE_PROJECT_NAME}.json" DESTINATION ${DATA_DIR})
-else(CLICK_MODE)
-        set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_NAME})
-        set(EXEC "qmlscene $@ ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/qml/${MAIN_QML}")
-        set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON}")
-        set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
-endif(CLICK_MODE)
 
=== modified file 'manifest.json'
--- manifest.json	2014-07-31 19:33:54 +0000
+++ manifest.json	2014-08-07 21:06:25 +0000
@@ -4,10 +4,11 @@
     "framework": "ubuntu-sdk-14.10-dev2",
     "architecture": "all",
     "title": "Clock Reboot",
+    "icon": "[e-mail]",
     "hooks": {
         "ubuntu-clock-app": {
             "apparmor": "ubuntu-clock-app.json",
-            "desktop": "ubuntu-clock-app.desktop"
+            "desktop": "share/applications/ubuntu-clock-app.desktop"
         }
     },
     "version": "0.1",