Merge lp:~nik90/ubuntu-weather-app/weather-reboot-fixes into lp:~vthompson/ubuntu-weather-app/build-reboot

[Nekhelesh Ramananthan]

- Can be built and run on the phone
- Cmake command is now more verbal by providing logs like "Configuring manifest file, install intltool package (if missing) etc etc...
- Removed qmlproject file as this is a pure cmake project
- Removed unnecessary ubuntu-weather-app.in file
- Removed "click" folder and moved manifest.json.in file to the root directory as recommended by bzoltan.
- Added ubuntu-weather-app.qml which shows a blank page at the moment as a starting point
- Moved "tests" folder to the root directory
- Fixed CMakelists.txt file to work with the above folder structure changes (mostly copied from the clock app)

This MP fixes the following,

- Can be built and run on the phone
- Cmake command is now more verbal by providing logs like "Configuring manifest file, install intltool package (if missing) etc etc...
- Removed qmlproject file as this is a pure cmake project
- Removed unnecessary ubuntu-weather-app.in file
- Removed "click" folder and moved manifest.json.in file to the root directory as recommended by bzoltan.
- Added ubuntu-weather-app.qml which shows a blank page at the moment as a starting point
- Moved "tests" folder to the root directory
- Fixed CMakelists.txt file to work with the above folder structure changes (mostly copied from the clock app)

Note: This branch can be built and run on the phone :) .. At the moment it shows a blank page with the page title "Weather" as a starting point.

http://imgur.com/Jfao7gV

[lp:~nik90/ubuntu-weather-app/weather-reboot-fixes]

7. By Nekhelesh Ramananthan on 2015-01-23

Removed unnecessary ubuntu-weather-app.in file

8. By Nekhelesh Ramananthan on 2015-01-23

Minor fixes

9. By Nekhelesh Ramananthan on 2015-01-23

Removed references to clock app

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-01-23 13:30:46 +0000
+++ CMakeLists.txt	2015-01-23 23:36:13 +0000
@@ -1,94 +1,108 @@
 project(com.ubuntu.weather)
 cmake_minimum_required(VERSION 2.8.9)
+
 find_program(INTLTOOL_MERGE intltool-merge)
+if(NOT INTLTOOL_MERGE)
+    message(FATAL_ERROR "Could not find intltool-merge, please install the intltool package")
+endif()
 find_program(INTLTOOL_EXTRACT intltool-extract)
+if(NOT INTLTOOL_EXTRACT)
+    message(FATAL_ERROR "Could not find intltool-extract, please install the intltool package")
+endif()
+
+set (UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra")
 
 find_package(Qt5Core REQUIRED)
 find_package(Qt5Qml REQUIRED)
 find_package(Qt5Quick REQUIRED)
+
+# Automatically create moc files
 set(CMAKE_AUTOMOC ON)
 
+option(INSTALL_TESTS "Install the tests on make install" on)
+option(CLICK_MODE "Build as a click package" on)
+
+# Tests
+enable_testing()
+
 # Standard install paths
 include(GNUInstallDirs)
 
-option(INSTALL_TESTS "Install the tests on make install" on)
-option(CLICK_MODE "Installs to a contained location" on)
-
 set(APP_NAME weather)
-set(DESKTOP_FILE "${PROJECT_NAME}_${APP_NAME}.desktop")
 set(APP_HARDCODE ubuntu-weather-app)
-set(MAIN_QML ubuntu-weather-app.qml)
-set(ICON_FILE [e-mail])
+set(MAIN_QML ${APP_HARDCODE}.qml)
+set(DESKTOP_FILE "${APP_HARDCODE}.desktop")
+set(ICON [e-mail])
 set(AUTOPILOT_DIR ubuntu_weather_app)
-set(UBUNTU_MANIFEST_PATH "click/manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
-
-# components PATH
-execute_process(
-    COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
-    OUTPUT_VARIABLE ARCH_TRIPLET
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-set(QT_IMPORTS_DIR "lib/${ARCH_TRIPLET}")
-execute_process(
-  COMMAND dpkg-architecture -qDEB_HOST_ARCH
-  OUTPUT_VARIABLE CLICK_ARCH
-  OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
+
+# Set install paths
 if(CLICK_MODE)
-    if(NOT DEFINED BZR_SOURCE)
-        set(BZR_SOURCE "lp:${APP_HARDCODE}")
-        message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
-    endif(NOT DEFINED BZR_SOURCE)
-    set(CMAKE_INSTALL_PREFIX /)
-    set(CMAKE_INSTALL_BINDIR /)
-    set(DATA_DIR /)
-    set(ICON ${ICON_FILE})
-    set(EXEC "qmlscene $@ ${MAIN_QML}")
-    set(DESKTOP_DIR ${DATA_DIR})
+  set(CMAKE_INSTALL_PREFIX "/")
+  set(UBUNTU-WEATHER_APP_DIR "${CMAKE_INSTALL_DATADIR}/qml")
+
+  set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}")
+  set(EXEC "qmlscene $@ ${UBUNTU-WEATHER_APP_DIR}/${MAIN_QML}")
+  set(MODULE_PATH ${QT_IMPORTS_DIR})
+  if(NOT BZR_REVNO)
+    execute_process(
+      COMMAND bzr revno
+              OUTPUT_VARIABLE BZR_REVNO
+              WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+              OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
+  endif(NOT BZR_REVNO)
+  if(NOT BZR_SOURCE)
+    set(BZR_SOURCE "lp:${APP_HARDCODE}/reboot")
+    message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
+  endif(NOT BZR_SOURCE)
 else(CLICK_MODE)
-    set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
-    set(EXEC ${APP_HARDCODE})
-    set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE})
-    configure_file(${APP_HARDCODE}.in
-        ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
-    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}
-        DESTINATION ${CMAKE_INSTALL_BINDIR})
-    set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
+  set(UBUNTU-WEATHER_APP_DIR "${CMAKE_INSTALL_DATADIR}/ubuntu-weather-app")
+  execute_process(
+    COMMAND qmake -query QT_INSTALL_QML
+            OUTPUT_VARIABLE QT_IMPORTS_DIR
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+  set(MODULE_PATH ${QT_IMPORTS_DIR}/WeatherApp)
 endif(CLICK_MODE)
 
+if(${CLICK_MODE})
+  message("-- Configuring manifest.json")
+
+  execute_process(
+    COMMAND dpkg-architecture -qDEB_HOST_ARCH
+    OUTPUT_VARIABLE CLICK_ARCH
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+
+  configure_file(${UBUNTU_MANIFEST_PATH} ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
+  install(FILES "${APP_HARDCODE}.apparmor" DESTINATION ${CMAKE_INSTALL_PREFIX})
+else(CLICK_MODE)
+  set(EXEC "qmlscene $@ -I ${MODULE_PATH}  ${CMAKE_INSTALL_PREFIX}/${UBUNTU-WEATHER_APP_DIR}/${MAIN_QML}")
+endif()
+
+
 file(GLOB_RECURSE I18N_SRC_FILES
-     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po
-     components/*.qml components/*.js *.qml)
+    RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po
+    *.qml *.js)
 list(APPEND I18N_SRC_FILES ${DESKTOP_FILE}.in.in.h)
 list(SORT I18N_SRC_FILES)
-message("Found ${I18N_SRC_FILES}")
-
-file(GLOB SRC_FILES
-     RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-     *.qml *.js *.png *.js)
-install(DIRECTORY components resources DESTINATION ${DATA_DIR})
-install(FILES key.js DESTINATION ${DATA_DIR})
-install(FILES ${MAIN_QML} ${ICON_FILE} DESTINATION ${DATA_DIR})
 
 configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
 
 add_custom_target(${DESKTOP_FILE} ALL
-  COMMENT "Merging translations into ${DESKTOP_FILE}"
-  COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${DESKTOP_FILE}.in ${DESKTOP_FILE} >/dev/null
+    COMMENT "Merging translations into ${DESKTOP_FILE}..."
+    COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${DESKTOP_FILE}.in ${DESKTOP_FILE}
 )
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
-    DESTINATION ${DESKTOP_DIR})
-
-# Tests
-enable_testing()
-
-file(GLOB QML_JS_FILES *.qml *.js)
-add_custom_target(ubuntu-weather-app_QMlFiles ALL SOURCES ${QML_JS_FILES})
-
-add_subdirectory(click)
-add_subdirectory(po)
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
+
 add_subdirectory(app)
 add_subdirectory(backend)
+add_subdirectory(po)
+add_subdirectory(tests)
+
+# TODO: Add custom target for autopilot and run.
 

=== modified file 'app/CMakeLists.txt'
--- app/CMakeLists.txt	2015-01-23 13:30:46 +0000
+++ app/CMakeLists.txt	2015-01-23 23:36:13 +0000
@@ -1,4 +1,15 @@
-file(GLOB COMPONENTS_QML_JS_FILES *.qml *.js)
-add_custom_target(ubuntu-weather-app_app_QMlFiles ALL SOURCES ${COMPONENTS_QML_JS_FILES})
+if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+  file(GLOB QML_JS_FILES *.qml *.js)
+  add_custom_target(ubuntu-weather-app_QMlFiles ALL SOURCES ${QML_JS_FILES})
+endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+
+
+if(CLICK_MODE)
+  set(ICON ${ICON})
+  install(FILES ${ICON} DESTINATION ${CMAKE_INSTALL_PREFIX})
+endif(CLICK_MODE)
+
+install(FILES ${MAIN_QML} DESTINATION ${UBUNTU-WEATHER_APP_DIR})
+
 add_subdirectory(components)
-add_subdirectory(tests)
+

=== modified file 'app/components/CMakeLists.txt'
--- app/components/CMakeLists.txt	2015-01-23 02:25:35 +0000
+++ app/components/CMakeLists.txt	2015-01-23 23:36:13 +0000
@@ -1,2 +1,5 @@
 file(GLOB COMPONENTS_QML_JS_FILES *.qml *.js)
+
 add_custom_target(ubuntu-weather-app_components_QMlFiles ALL SOURCES ${COMPONENTS_QML_JS_FILES})
+
+install(FILES ${COMPONENTS_QML_JS_FILES} DESTINATION ${UBUNTU-WEATHER_APP_DIR}/components)

=== added file 'app/ubuntu-weather-app.qml'
--- app/ubuntu-weather-app.qml	1970-01-01 00:00:00 +0000
+++ app/ubuntu-weather-app.qml	2015-01-23 23:36:13 +0000
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This file is part of Ubuntu Weather App
+ *
+ * Ubuntu Weather App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Clock App is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+
+MainView {
+    id: weatherApp
+
+    objectName: "weather"
+
+    applicationName: "com.ubuntu.weather"
+
+    automaticOrientation: false
+
+    width: units.gu(40)
+    height: units.gu(70)
+
+    backgroundColor: "#F5F5F5"
+
+    useDeprecatedToolbar: false
+    anchorToKeyboard: true
+
+
+    Page {
+        title: "Weather Reboot"
+
+        Label {
+            anchors.centerIn: parent
+            text: "Let the awesomeness begin :)"
+        }
+
+    }
+}

=== renamed file '[e-mail]' => 'app/[e-mail]'
=== modified file 'backend/CMakeLists.txt'
--- backend/CMakeLists.txt	2015-01-23 02:25:35 +0000
+++ backend/CMakeLists.txt	2015-01-23 23:36:13 +0000
@@ -1,12 +1,14 @@
+project(backend)
+
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-set(
-    timeZone_SRCS
-    TimeZone/timezone.cpp
-    TimeZone/timezone_plugin.cpp
-)
+#set(
+#    timeZone_SRCS
+#    TimeZone/timezone.cpp
+#    TimeZone/timezone_plugin.cpp
+#)
 
 #add_library(TimeZoneBackend MODULE
 #    ${timeZone_SRCS}

=== removed directory 'click'
=== removed file 'click/CMakeLists.txt'
--- click/CMakeLists.txt	2015-01-22 21:56:55 +0000
+++ click/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-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 weather.apparmor
-            DESTINATION ${CMAKE_INSTALL_PREFIX})
-
-    # make the click files visible in qtcreator
-    file(GLOB CLICK_FILES
-         RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-         *.json *.json.in *.apparmor)
-
-    add_custom_target(com_ubuntu_weather_CLICKFiles ALL SOURCES ${CLICK_FILES})
-endif(CLICK_MODE)

=== renamed file 'click/manifest.json.in' => 'manifest.json.in'
--- click/manifest.json.in	2015-01-22 21:56:55 +0000
+++ manifest.json.in	2015-01-23 23:36:13 +0000
@@ -4,15 +4,15 @@
     "framework": "ubuntu-sdk-14.10",
     "hooks": {
         "weather": {
-            "apparmor": "weather.apparmor",
-            "desktop": "@DESKTOP_FILE@"
+            "apparmor": "ubuntu-weather-app.apparmor",
+            "desktop": "@CMAKE_INSTALL_DATADIR@/applications/ubuntu-weather-app.desktop"
         }
     },
     "icon": "@ICON@",
     "maintainer": "Ubuntu App Cats <[e-mail]>",
     "name": "@PROJECT_NAME@",
     "title": "Weather",
-    "version": "2.0.@BZR_REVNO@",
+    "version": "3.0.@BZR_REVNO@",
     "x-source": {
         "vcs-bzr": "@BZR_SOURCE@",
         "vcs-bzr-revno": "@BZR_REVNO@"

=== added file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot	1970-01-01 00:00:00 +0000
+++ po/com.ubuntu.weather.pot	2015-01-23 23:36:13 +0000
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Canonical Ltd.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ubuntu-weather-app\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-01-24 00:26+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ubuntu-weather-app.desktop.in.in.h:1
+msgid "Weather"
+msgstr ""
+
+#: ubuntu-weather-app.desktop.in.in.h:2
+msgid ""
+"A weather forecast application for Ubuntu with support for multiple online "
+"weather data sources"
+msgstr ""
+
+#: ubuntu-weather-app.desktop.in.in.h:3
+msgid "weather;forecast;twc;openweathermap;the weather channel;"
+msgstr ""

=== renamed directory 'app/tests' => 'tests'
=== modified file 'tests/CMakeLists.txt'
--- app/tests/CMakeLists.txt	2015-01-23 02:25:35 +0000
+++ tests/CMakeLists.txt	2015-01-23 23:36:13 +0000
@@ -1,1 +1,3 @@
-add_subdirectory(autopilot)
+if(NOT CLICK_MODE)
+  add_subdirectory(autopilot)
+endif(NOT CLICK_MODE)

=== renamed file 'click/weather.apparmor' => 'ubuntu-weather-app.apparmor'
--- click/weather.apparmor	2015-01-22 21:56:55 +0000
+++ ubuntu-weather-app.apparmor	2015-01-23 23:36:13 +0000
@@ -1,5 +1,6 @@
 {
-    "policy_groups": ["networking"
-                      ], 
+    "policy_groups": [
+    	"networking"
+    ], 
     "policy_version": 1.2
 }

=== renamed file 'com.ubuntu.weather_weather.desktop.in.in' => 'ubuntu-weather-app.desktop.in.in'
=== removed file 'ubuntu-weather-app.in'
--- ubuntu-weather-app.in	2015-01-22 21:56:55 +0000
+++ ubuntu-weather-app.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-#!/bin/bash
-export QT_SELECT=qt5
-exec qmlscene @CMAKE_INSTALL_PREFIX@/@DATA_DIR@/@MAIN_QML@

=== removed file 'ubuntu-weather-app.qmlproject'
--- ubuntu-weather-app.qmlproject	2015-01-22 21:56:55 +0000
+++ ubuntu-weather-app.qmlproject	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-/* File generated by Qt Creator, version 2.6.1 */
-
-import QmlProject 1.1
-
-Project {
-    mainFile: "ubuntu-weather-app.qml"
-
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* Shows the README files in the project view */
-    Files {
-        filter: "README*"
-    }
-    /* Shows the translation files and the .pro file used to generate the .pot template */
-    Files {
-        filter: "*.po*"
-    }
-    /* Shows the CMake files */
-    Files {
-        filter: "CMakeLists.txt"
-    }
-    /* List of plugin directories passed to QML runtime */
-    importPaths: [ "." ,"/usr/lib/x86_64-linux-gnu/qt5/qml" ]
-}