Ubuntu Weather App

Merge lp:~vthompson/ubuntu-weather-app/reboot-qml-app into lp:ubuntu-weather-app

  1. reboot-qml-app
  2. Merge into reboot
Proposed by Victor Thompson
Status: Merged
Approved by: Victor Thompson
Approved revision: 42
Merged at revision: 45
Proposed branch: lp:~vthompson/ubuntu-weather-app/reboot-qml-app
Merge into: lp:ubuntu-weather-app
Prerequisite: lp:~vthompson/ubuntu-weather-app/reboot-location-qml
Diff against target: 127 lines (+13/-49)
4 files modified
CMakeLists.txt (+0/-7)
backend/CMakeLists.txt (+0/-29)
manifest.json.in (+2/-2)
po/com.ubuntu.weather.pot (+11/-11)
To merge this branch: bzr merge lp:~vthompson/ubuntu-weather-app/reboot-qml-app
Reviewer Review Type Date Requested Status
Nekhelesh Ramananthan (community) Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Review via email: mp+259463@code.launchpad.net

Commit message

* Set as a non-arch specific app

Description of the change

This change makes the app non-arch specific. If the prerequisite branch is something we can land to detect location, then the app can be qml only and will not need to be re-compiled on an arch by arch basis.

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:41
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/91/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/61
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/91

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/91/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

LGTM

review: Approve
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Hmm there was a reason why we needed a c++ backend plugin which made it arch dependent. Looking at the old weather-app I see a Timezone plugin which is there in weather-reboot. Can we get a confirmation from martin before approving this?

review: Needs Information
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Typo. .. I meant that the Timezone plugin *isn't* included in weather-reboot while it is there in the old weather app.

Revision history for this message
Victor Thompson (vthompson) wrote :

The reasoning was that we need a reverse geocoding plugin--similar to what Clock has. However, reverse geocoding can be done in QML, which I have working in the prerequisite MP [1].

1 - https://code.launchpad.net/~vthompson/ubuntu-weather-app/reboot-location-qml/+merge/259462

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

ah ok. In that case could you also remove the backend folder since it is no longer required then.

Revision history for this message
Victor Thompson (vthompson) wrote :

Good call. I'll do so tonight.

lp:~vthompson/ubuntu-weather-app/reboot-qml-app updated
42. By Victor Thompson

Remove backend dir

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

PASSED: Continuous integration, rev:42
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/95/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/65
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/95

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/95/rebuild

review: Approve (continuous-integration)
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

lgtm!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-02-04 10:33:57 +0000
3+++ CMakeLists.txt 2015-05-22 00:14:10 +0000
4@@ -69,12 +69,6 @@
5 if(${CLICK_MODE})
6 message("-- Configuring manifest.json")
7
8- execute_process(
9- COMMAND dpkg-architecture -qDEB_HOST_ARCH
10- OUTPUT_VARIABLE CLICK_ARCH
11- OUTPUT_STRIP_TRAILING_WHITESPACE
12- )
13-
14 configure_file(${UBUNTU_MANIFEST_PATH} ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
15 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
16 install(FILES "${APP_HARDCODE}.apparmor" DESTINATION ${CMAKE_INSTALL_PREFIX})
17@@ -100,7 +94,6 @@
18 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
19
20 add_subdirectory(app)
21-add_subdirectory(backend)
22 add_subdirectory(po)
23 add_subdirectory(tests)
24
25
26=== removed directory 'backend'
27=== removed file 'backend/CMakeLists.txt'
28--- backend/CMakeLists.txt 2015-01-23 23:15:52 +0000
29+++ backend/CMakeLists.txt 1970-01-01 00:00:00 +0000
30@@ -1,29 +0,0 @@
31-project(backend)
32-
33-include_directories(
34- ${CMAKE_CURRENT_SOURCE_DIR}
35-)
36-
37-#set(
38-# timeZone_SRCS
39-# TimeZone/timezone.cpp
40-# TimeZone/timezone_plugin.cpp
41-#)
42-
43-#add_library(TimeZoneBackend MODULE
44-# ${timeZone_SRCS}
45-#)
46-#set_target_properties(TimeZoneBackend PROPERTIES
47-# LIBRARY_OUTPUT_DIRECTORY TimeZone)
48-
49-#qt5_use_modules(TimeZoneBackend Gui Qml Quick)
50-
51-# Copy qmldir file to build dir for running in QtCreator
52-#add_custom_target(TimeZoneBackend-qmldir ALL
53-# COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/TimeZone/qmldir ${CMAKE_CURRENT_BINARY_DIR}/TimeZone
54-# DEPENDS ${QML_JS_FILES}
55-#)
56-
57-# Install plugin file
58-#install(TARGETS TimeZoneBackend DESTINATION ${QT_IMPORTS_DIR}/qt5/qml/UbuntuWeather/TimeZone/)
59-#install(FILES TimeZone/qmldir DESTINATION ${QT_IMPORTS_DIR}/qt5/qml/UbuntuWeather/TimeZone/)
60
61=== modified file 'manifest.json.in'
62--- manifest.json.in 2015-01-23 23:15:52 +0000
63+++ manifest.json.in 2015-05-22 00:14:10 +0000
64@@ -1,7 +1,7 @@
65 {
66- "architecture": "@CLICK_ARCH@",
67+ "architecture": "all",
68 "description": "A weather forecast application for Ubuntu with support for multiple online weather data sources",
69- "framework": "ubuntu-sdk-14.10",
70+ "framework": "ubuntu-sdk-14.10-qml",
71 "hooks": {
72 "weather": {
73 "apparmor": "ubuntu-weather-app.apparmor",
74
75=== modified file 'po/com.ubuntu.weather.pot'
76--- po/com.ubuntu.weather.pot 2015-04-29 14:22:00 +0000
77+++ po/com.ubuntu.weather.pot 2015-05-22 00:14:10 +0000
78@@ -8,7 +8,7 @@
79 msgstr ""
80 "Project-Id-Version: ubuntu-weather-app\n"
81 "Report-Msgid-Bugs-To: \n"
82-"POT-Creation-Date: 2015-04-29 15:21+0100\n"
83+"POT-Creation-Date: 2015-05-21 19:13-0500\n"
84 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
85 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
86 "Language-Team: LANGUAGE <LL@li.org>\n"
87@@ -70,31 +70,31 @@
88 msgid "Select a city"
89 msgstr ""
90
91-#: ../app/ui/AddLocationPage.qml:47
92+#: ../app/ui/AddLocationPage.qml:46 ../app/ui/AddLocationPage.qml:68
93+msgid "Back"
94+msgstr ""
95+
96+#: ../app/ui/AddLocationPage.qml:53
97 msgid "City"
98 msgstr ""
99
100-#: ../app/ui/AddLocationPage.qml:62
101-msgid "Back"
102-msgstr ""
103-
104-#: ../app/ui/AddLocationPage.qml:89
105+#: ../app/ui/AddLocationPage.qml:95
106 msgid "Search city"
107 msgstr ""
108
109-#: ../app/ui/AddLocationPage.qml:268
110+#: ../app/ui/AddLocationPage.qml:274
111 msgid "No city found"
112 msgstr ""
113
114-#: ../app/ui/AddLocationPage.qml:281
115+#: ../app/ui/AddLocationPage.qml:287
116 msgid "Couldn't load weather data, please try later again!"
117 msgstr ""
118
119-#: ../app/ui/AddLocationPage.qml:291
120+#: ../app/ui/AddLocationPage.qml:297
121 msgid "Location already added."
122 msgstr ""
123
124-#: ../app/ui/AddLocationPage.qml:294
125+#: ../app/ui/AddLocationPage.qml:300
126 msgid "OK"
127 msgstr ""
128

Subscribers

People subscribed via source and target branches

to all changes: