Ubuntu Notes app

Merge lp:~dpm/reminders-app/qtc-changes into lp:reminders-app

  1. qtc-changes
  2. Merge into trunk
Proposed by David Planella
Status: Merged
Approved by: Riccardo Padovani
Approved revision: 106
Merged at revision: 103
Proposed branch: lp:~dpm/reminders-app/qtc-changes
Merge into: lp:reminders-app
Diff against target: 147 lines (+34/-43)
4 files modified
CMakeLists.txt (+23/-24)
apparmor.json (+1/-1)
click/CMakeLists.txt (+0/-8)
manifest.json (+10/-10)
To merge this branch: bzr merge lp:~dpm/reminders-app/qtc-changes
Reviewer Review Type Date Requested Status
Riccardo Padovani Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+214951@code.launchpad.net

Commit message

Fix Qt Creator running and packaging issues

Description of the change

Fixes launching from Qt Creator. The reason it doesn't work is because it's looking for a .desktop file named $PROJECT.desktop, whereas our file is named $PROJECT_$APP.desktop. This is something that will need to be fixed at some point on Qt Creator, but in the meantime we can work around it by removing the $APP suffix.

Some other fixes include the manifest, to adapt it to the location and the format where Qt Creator expects it, so that a click package can be created. This has unfortunately meant the values in the manifest are now hardcoded.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:104
http://91.189.93.70:8080/job/reminders-app-ci/255/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2014
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/255
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/255

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/255/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:105
http://91.189.93.70:8080/job/reminders-app-ci/257/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2016/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/257/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/257/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/257/rebuild

review: Needs Fixing (continuous-integration)
lp:~dpm/reminders-app/qtc-changes updated
106. By David Planella

Fix manifest installation for debian packages

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:106
http://91.189.93.70:8080/job/reminders-app-ci/258/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2018
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/258
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/258

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/258/rebuild

review: Approve (continuous-integration)
Revision history for this message
Riccardo Padovani (rpadovani) wrote :

Works as expected, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2014-02-15 17:06:12 +0000
+++ CMakeLists.txt 2014-04-09 19:09:30 +0000
@@ -11,7 +11,7 @@
11option(CLICK_MODE "Installs to a contained location" off)11option(CLICK_MODE "Installs to a contained location" off)
1212
13set(APP_NAME reminders)13set(APP_NAME reminders)
14set(DESKTOP_FILE "${PROJECT_NAME}_${APP_NAME}.desktop")14set(DESKTOP_FILE "${PROJECT_NAME}.desktop")
15set(ICON ${APP_NAME}.png)15set(ICON ${APP_NAME}.png)
16set(AUTOPILOT_DIR reminders)16set(AUTOPILOT_DIR reminders)
17set(APP_HARDCODE reminders)17set(APP_HARDCODE reminders)
@@ -20,40 +20,40 @@
2020
21if(CLICK_MODE)21if(CLICK_MODE)
22 if(NOT DEFINED BZR_SOURCE)22 if(NOT DEFINED BZR_SOURCE)
23 set(BZR_SOURCE "lp:${APP_HARDCODE}")23 set(BZR_SOURCE "lp:${APP_HARDCODE}")
24 message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")24 message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
25 endif(NOT DEFINED BZR_SOURCE)25 endif(NOT DEFINED BZR_SOURCE)
26 execute_process(26 execute_process(
27 COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH27 COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
28 OUTPUT_VARIABLE ARCH_TRIPLET28 OUTPUT_VARIABLE ARCH_TRIPLET
29 OUTPUT_STRIP_TRAILING_WHITESPACE29 OUTPUT_STRIP_TRAILING_WHITESPACE
30 )30 )
31 set(CMAKE_INSTALL_PREFIX /)31 set(CMAKE_INSTALL_PREFIX /)
32 set(QT_IMPORTS_DIR "/lib/${ARCH_TRIPLET}")32 set(QT_IMPORTS_DIR "/lib/${ARCH_TRIPLET}")
33 set(BIN_DIR /lib/${ARCH_TRIPLET}/bin)33 set(BIN_DIR /lib/${ARCH_TRIPLET}/bin)
34 set(DATA_DIR /)34 set(DATA_DIR /)
35 set(DESKTOP_DIR ${DATA_DIR})35 set(DESKTOP_DIR ${DATA_DIR})
36 install(FILES manifest.json apparmor.json DESTINATION ${CMAKE_INSTALL_PREFIX})
36else(CLICK_MODE)37else(CLICK_MODE)
37 # components PATH38 # components PATH
38 execute_process(39 execute_process(
39 COMMAND qmake -query QT_INSTALL_QML40 COMMAND qmake -query QT_INSTALL_QML
40 OUTPUT_VARIABLE QT_IMPORTS_DIR41 OUTPUT_VARIABLE QT_IMPORTS_DIR
41 OUTPUT_STRIP_TRAILING_WHITESPACE42 OUTPUT_STRIP_TRAILING_WHITESPACE
42 )43 )
43 set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})44 set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
44 set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON}")45 set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON}")
45 set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)46 set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
46endif(CLICK_MODE)47endif(CLICK_MODE)
4748
48file(GLOB_RECURSE I18N_SRC_FILES49file(GLOB_RECURSE I18N_SRC_FILES
49 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}50 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
50 src/app/qml/*.qml *.desktop.in)51 src/app/qml/*.qml *.desktop.in)
51list(SORT I18N_SRC_FILES)52list(SORT I18N_SRC_FILES)
5253
53
54file(GLOB SRC_FILES54file(GLOB SRC_FILES
55 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}55 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
56 *.qml *.js *.png *.js)56 *.qml *.js *.png *.js)
57install(FILES ${SRC_FILES} DESTINATION ${DATA_DIR})57install(FILES ${SRC_FILES} DESTINATION ${DATA_DIR})
5858
59configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})59configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
@@ -62,7 +62,6 @@
62# Tests62# Tests
63enable_testing()63enable_testing()
6464
65add_subdirectory(click)
66add_subdirectory(po)65add_subdirectory(po)
67add_subdirectory(tests)66add_subdirectory(tests)
68add_subdirectory(3rdParty)67add_subdirectory(3rdParty)
6968
=== renamed file 'click/apparmor.json' => 'apparmor.json'
--- click/apparmor.json 2014-02-16 10:51:11 +0000
+++ apparmor.json 2014-04-09 19:09:30 +0000
@@ -5,5 +5,5 @@
5 "content_exchange",5 "content_exchange",
6 "audio"6 "audio"
7 ],7 ],
8 "policy_version": 18 "policy_version": 1.1
9}9}
1010
=== removed directory 'click'
=== removed file 'click/CMakeLists.txt'
--- click/CMakeLists.txt 2014-01-19 13:59:12 +0000
+++ click/CMakeLists.txt 1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
1if(CLICK_MODE)
2 if(NOT BZR_REVNO)
3 set(BZR_REVNO "latest")
4 endif(NOT BZR_REVNO)
5 configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
6 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json apparmor.json
7 DESTINATION ${CMAKE_INSTALL_PREFIX})
8endif(CLICK_MODE)
90
=== renamed file 'com.ubuntu.reminders_reminders.desktop.in' => 'com.ubuntu.reminders.desktop.in'
=== renamed file 'click/manifest.json.in' => 'manifest.json'
--- click/manifest.json.in 2014-02-10 14:36:59 +0000
+++ manifest.json 2014-04-09 19:09:30 +0000
@@ -1,22 +1,22 @@
1{1{
2 "description": "Ubuntu Reminders app, powered by Evernote",2 "description": "Ubuntu Reminders app, powered by Evernote",
3 "framework": "ubuntu-sdk-13.10",3 "framework": "ubuntu-sdk-14.04-dev1",
4 "architecture": "armhf",4 "architecture": "armhf",
5 "hooks": {5 "hooks": {
6 "@APP_NAME@": {6 "reminders": {
7 "apparmor": "apparmor.json",7 "apparmor": "apparmor.json",
8 "desktop": "@DESKTOP_FILE@"8 "desktop": "com.ubuntu.reminders.desktop"
9 }9 }
10 },10 },
11 "maintainer": "Ubuntu Reminders app developers <ubuntu-phone@lists.launchpad.net>",11 "maintainer": "Ubuntu Reminders app developers <ubuntu-phone@lists.launchpad.net>",
12 "name": "@PROJECT_NAME@",12 "name": "com.ubuntu.reminders",
13 "title": "Reminders",13 "title": "Reminders",
14 "version": "0.4.@BZR_REVNO@",14 "version": "0.5",
15 "x-source": {15 "x-source": {
16 "vcs-bzr": "@BZR_SOURCE@", 16 "vcs-bzr": "lp:reminders",
17 "vcs-bzr-revno": "@BZR_REVNO@"17 "vcs-bzr-revno": "latest"
18 },18 },
19 "x-test": {19 "x-test": {
20 "autopilot": "@AUTOPILOT_DIR@"20 "autopilot": "reminders"
21 }21 }
22}22}
23\ No newline at end of file23\ No newline at end of file

Subscribers

People subscribed via source and target branches