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
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2015-02-04 10:33:57 +0000
+++ CMakeLists.txt 2015-05-22 00:14:10 +0000
@@ -69,12 +69,6 @@
69if(${CLICK_MODE})69if(${CLICK_MODE})
70 message("-- Configuring manifest.json")70 message("-- Configuring manifest.json")
7171
72 execute_process(
73 COMMAND dpkg-architecture -qDEB_HOST_ARCH
74 OUTPUT_VARIABLE CLICK_ARCH
75 OUTPUT_STRIP_TRAILING_WHITESPACE
76 )
77
78 configure_file(${UBUNTU_MANIFEST_PATH} ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)72 configure_file(${UBUNTU_MANIFEST_PATH} ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
79 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})73 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
80 install(FILES "${APP_HARDCODE}.apparmor" DESTINATION ${CMAKE_INSTALL_PREFIX})74 install(FILES "${APP_HARDCODE}.apparmor" DESTINATION ${CMAKE_INSTALL_PREFIX})
@@ -100,7 +94,6 @@
100 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)94 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
10195
102add_subdirectory(app)96add_subdirectory(app)
103add_subdirectory(backend)
104add_subdirectory(po)97add_subdirectory(po)
105add_subdirectory(tests)98add_subdirectory(tests)
10699
107100
=== removed directory 'backend'
=== removed file 'backend/CMakeLists.txt'
--- backend/CMakeLists.txt 2015-01-23 23:15:52 +0000
+++ backend/CMakeLists.txt 1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
1project(backend)
2
3include_directories(
4 ${CMAKE_CURRENT_SOURCE_DIR}
5)
6
7#set(
8# timeZone_SRCS
9# TimeZone/timezone.cpp
10# TimeZone/timezone_plugin.cpp
11#)
12
13#add_library(TimeZoneBackend MODULE
14# ${timeZone_SRCS}
15#)
16#set_target_properties(TimeZoneBackend PROPERTIES
17# LIBRARY_OUTPUT_DIRECTORY TimeZone)
18
19#qt5_use_modules(TimeZoneBackend Gui Qml Quick)
20
21# Copy qmldir file to build dir for running in QtCreator
22#add_custom_target(TimeZoneBackend-qmldir ALL
23# COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/TimeZone/qmldir ${CMAKE_CURRENT_BINARY_DIR}/TimeZone
24# DEPENDS ${QML_JS_FILES}
25#)
26
27# Install plugin file
28#install(TARGETS TimeZoneBackend DESTINATION ${QT_IMPORTS_DIR}/qt5/qml/UbuntuWeather/TimeZone/)
29#install(FILES TimeZone/qmldir DESTINATION ${QT_IMPORTS_DIR}/qt5/qml/UbuntuWeather/TimeZone/)
300
=== modified file 'manifest.json.in'
--- manifest.json.in 2015-01-23 23:15:52 +0000
+++ manifest.json.in 2015-05-22 00:14:10 +0000
@@ -1,7 +1,7 @@
1{1{
2 "architecture": "@CLICK_ARCH@",2 "architecture": "all",
3 "description": "A weather forecast application for Ubuntu with support for multiple online weather data sources",3 "description": "A weather forecast application for Ubuntu with support for multiple online weather data sources",
4 "framework": "ubuntu-sdk-14.10",4 "framework": "ubuntu-sdk-14.10-qml",
5 "hooks": {5 "hooks": {
6 "weather": {6 "weather": {
7 "apparmor": "ubuntu-weather-app.apparmor",7 "apparmor": "ubuntu-weather-app.apparmor",
88
=== modified file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot 2015-04-29 14:22:00 +0000
+++ po/com.ubuntu.weather.pot 2015-05-22 00:14:10 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: ubuntu-weather-app\n"9"Project-Id-Version: ubuntu-weather-app\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2015-04-29 15:21+0100\n"11"POT-Creation-Date: 2015-05-21 19:13-0500\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -70,31 +70,31 @@
70msgid "Select a city"70msgid "Select a city"
71msgstr ""71msgstr ""
7272
73#: ../app/ui/AddLocationPage.qml:4773#: ../app/ui/AddLocationPage.qml:46 ../app/ui/AddLocationPage.qml:68
74msgid "Back"
75msgstr ""
76
77#: ../app/ui/AddLocationPage.qml:53
74msgid "City"78msgid "City"
75msgstr ""79msgstr ""
7680
77#: ../app/ui/AddLocationPage.qml:6281#: ../app/ui/AddLocationPage.qml:95
78msgid "Back"
79msgstr ""
80
81#: ../app/ui/AddLocationPage.qml:89
82msgid "Search city"82msgid "Search city"
83msgstr ""83msgstr ""
8484
85#: ../app/ui/AddLocationPage.qml:26885#: ../app/ui/AddLocationPage.qml:274
86msgid "No city found"86msgid "No city found"
87msgstr ""87msgstr ""
8888
89#: ../app/ui/AddLocationPage.qml:28189#: ../app/ui/AddLocationPage.qml:287
90msgid "Couldn't load weather data, please try later again!"90msgid "Couldn't load weather data, please try later again!"
91msgstr ""91msgstr ""
9292
93#: ../app/ui/AddLocationPage.qml:29193#: ../app/ui/AddLocationPage.qml:297
94msgid "Location already added."94msgid "Location already added."
95msgstr ""95msgstr ""
9696
97#: ../app/ui/AddLocationPage.qml:29497#: ../app/ui/AddLocationPage.qml:300
98msgid "OK"98msgid "OK"
99msgstr ""99msgstr ""
100100

Subscribers

People subscribed via source and target branches

to all changes: