Merge lp:~flscogna/ubuntu-weather-app/reorganization-and-native-launcher into lp:ubuntu-weather-app/obsolete.trunk

[Filippo Scognamiglio]

Project reorganization and migration to native launcher.

The project has been reorganized following the terminal as a guideline. The program is now launched from a binary executable (instead of relying on qmlscene) I tested it both on the phone and on the desktop. I really hope everything is in place.

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

FAILED: Continuous integration, rev:388
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/298/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-vivid-weather-app/8/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-vivid-amd64-ci/6/console

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

review: Needs Fixing (continuous-integration)

[Martin Borho (martin-borho)]

Getting the following tracebacks when running the autopilot tests:

http://paste.ubuntu.com/8944971/

[Nicholas Skaggs (nskaggs)]

It's not currently building; dpkg-buildpackage -rfakeroot -D -us -uc failed

review: Needs Fixing

[Filippo Scognamiglio (flscogna)]

I'm sorry I completely forgot about this. I will take a look at it soon.

[Daniel Holbach (dholbach)]

<dholbach> dh_install: qtdeclarative5-ubuntuweather-timezone-plugin1.0 missing files (usr/lib/*/qt5/), aborting
<swordfish90> balloons, dholbach Ok thanks. There is probably an issue with the timezone plugin.
<dholbach> looks like stuff gets installed into:
 /tmp/buildd/ubuntu-weather-app-1.8.3ubuntu1/debian/tmp/usr/lib/x86_64-linux-gnu/TimeZone/*
 so qt5 <-> TimeZone
 that's the mismatch
 I don't know where you want things installed
 either you need to change things in CMakeLists.txt
 or in debian/*.install
<dholbach> I would suggest to have a look at where other app store their plugins
 so it's nice and consistent

Let me know if you need any help.

review: Needs Fixing

[lp:~flscogna/ubuntu-weather-app/reorganization-and-native-launcher]

389. By Filippo Scognamiglio on 2014-12-09

Fix a couple of issues in desktop building.

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

FAILED: Continuous integration, rev:389
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/301/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-vivid-weather-app/11/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-vivid-amd64-ci/9

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

review: Needs Fixing (continuous-integration)

[lp:~flscogna/ubuntu-weather-app/reorganization-and-native-launcher]

390. By Filippo Scognamiglio on 2014-12-09

Fix names and removes unused files.

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

FAILED: Continuous integration, rev:390
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/302/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-vivid-weather-app/12/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-vivid-amd64-ci/10

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

review: Needs Fixing (continuous-integration)

[Daniel Holbach (dholbach)]

Proposed some small fixes in https://code.launchpad.net/~dholbach/ubuntu-weather-app/packaging-fixes/+merge/244189

[lp:~flscogna/ubuntu-weather-app/reorganization-and-native-launcher]

391. By Filippo Scognamiglio on 2014-12-09

Merge changes from dholbach.

[Filippo Scognamiglio (flscogna)]

Ok, I just merged the branch by Daniel (thank you very very much), and it seems to work fine. Please give it another go.

[Filippo Scognamiglio (flscogna)]

Ok, I just merged the branch by Daniel (thank you very very much), and it seems to work fine. Please give it another go.

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

FAILED: Continuous integration, rev:391
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/303/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-vivid-weather-app/13/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-vivid-amd64-ci/11

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:391
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/305/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-vivid-weather-app/16/console
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-vivid-amd64-ci/13

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

review: Needs Fixing (continuous-integration)

[Daniel Holbach (dholbach)]

Is anyone looking after this? Maybe somebody from the touch team can help make this work?

[Nicholas Skaggs (nskaggs)]

Daniel, it seems the build still fails; not sure why.

dpkg-source: info: use the '3.0 (quilt)' format to have separate and documented changes to upstream files, see dpkg-source(1)
dpkg-source: unrepresentable changes to source
dpkg-buildpackage: error: dpkg-source -b ubuntu-weather-app-1.8.3ubuntu1 gave error exit status 1
debuild: fatal error at line 1364:
dpkg-buildpackage -rfakeroot -D -us -uc failed
bzr: ERROR: The build failed.

[Daniel Holbach (dholbach)]

Right... I think we need a landing team expert to get on the case.

Unmerged revisions

391. By Filippo Scognamiglio on 2014-12-09

Merge changes from dholbach.

390. By Filippo Scognamiglio on 2014-12-09

Fix names and removes unused files.

389. By Filippo Scognamiglio on 2014-12-09

Fix a couple of issues in desktop building.

388. By Filippo Scognamiglio on 2014-11-11

Project reorganization and migration to native launcher.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-09-20 20:05:02 +0000
+++ CMakeLists.txt	2014-12-09 18:21:47 +0000
@@ -6,7 +6,9 @@
 find_package(Qt5Core REQUIRED)
 find_package(Qt5Qml REQUIRED)
 find_package(Qt5Quick REQUIRED)
+
 set(CMAKE_AUTOMOC ON)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra -fPIC")
 
 # Standard install paths
 include(GNUInstallDirs)
@@ -14,8 +16,8 @@
 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_NAME ubuntu-weather-app)
+set(DESKTOP_FILE "${PROJECT_NAME}_weather.desktop")
 set(APP_HARDCODE ubuntu-weather-app)
 set(MAIN_QML ubuntu-weather-app.qml)
 set(ICON_FILE [e-mail])
@@ -35,6 +37,8 @@
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
+set(EXEC "${APP_NAME}")
+
 if(CLICK_MODE)
     if(NOT DEFINED BZR_SOURCE)
         set(BZR_SOURCE "lp:${APP_HARDCODE}")
@@ -44,16 +48,15 @@
     set(CMAKE_INSTALL_BINDIR /)
     set(DATA_DIR /)
     set(ICON ${ICON_FILE})
-    set(EXEC "qmlscene $@ ${MAIN_QML}")
     set(DESKTOP_DIR ${DATA_DIR})
+    set(BIN_DIR /lib/${ARCH_TRIPLET}/bin)
 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})
+#    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)
 endif(CLICK_MODE)
 
@@ -64,13 +67,15 @@
 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})
-
+#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})
+
+install(FILES ${ICON_FILE} DESTINATION ${DATA_DIR})
 configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
 
 add_custom_target(${DESKTOP_FILE} ALL
@@ -87,9 +92,7 @@
 file(GLOB QML_JS_FILES *.qml *.js)
 add_custom_target(ubuntu-weather-app_QMlFiles ALL SOURCES ${QML_JS_FILES})
 
+add_subdirectory(src)
 add_subdirectory(click)
 add_subdirectory(po)
 add_subdirectory(tests)
-add_subdirectory(components)
-add_subdirectory(plugins)
-

=== modified file 'debian/control'
--- debian/control	2014-10-01 09:45:07 +0000
+++ debian/control	2014-12-09 18:21:47 +0000
@@ -11,27 +11,28 @@
                qtbase5-dev-tools,
                qtdeclarative5-dev,
                qtdeclarative5-dev-tools,
-               qtdeclarative5-ubuntu-ui-toolkit-plugin,
-Standards-Version: 3.9.5
+               qtdeclarative5-ubuntu-ui-toolkit-plugin
+Standards-Version: 3.9.6
 Section: misc
 Homepage: https://launchpad.net/ubuntu-weather-app
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-weather-dev/ubuntu-weather-app/trunk
 
 Package: ubuntu-weather-app
-Architecture: all
+Architecture: any
 Depends: qmlscene,
          qtdeclarative5-localstorage-plugin,
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
+         qtdeclarative5-ubuntuweather-timezone-plugin1.0 (>= ${source:Version}),
          suru-icon-theme | ubuntu-mobile-icons,
-         qtdeclarative5-ubuntuweather-timezone-plugin1.0 (>= ${source:Version}),
-         ${misc:Depends}
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Weather application
  Core Weather application
 
 Package: qtdeclarative5-ubuntuweather-timezone-plugin1.0
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Timezone plugin, used by the Ubuntu Weather app
  This package contains the timezone plugin written for the Ubuntu
  Weather app.

=== modified file 'debian/qtdeclarative5-ubuntuweather-timezone-plugin1.0.install'
--- debian/qtdeclarative5-ubuntuweather-timezone-plugin1.0.install	2014-10-01 09:45:07 +0000
+++ debian/qtdeclarative5-ubuntuweather-timezone-plugin1.0.install	2014-12-09 18:21:47 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/qt5/
+usr/lib/*/TimeZone/*

=== added directory 'src'
=== added file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/CMakeLists.txt	2014-12-09 18:21:47 +0000
@@ -0,0 +1,2 @@
+add_subdirectory(plugins)
+add_subdirectory(app)

=== added directory 'src/app'
=== added file 'src/app/CMakeLists.txt'
--- src/app/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/app/CMakeLists.txt	2014-12-09 18:21:47 +0000
@@ -0,0 +1,24 @@
+file(GLOB_RECURSE QML_SRCS *.qml *.js)
+
+set(weather_SRCS
+    main.cpp
+    ${QML_SRCS}
+)
+
+add_executable(ubuntu-weather-app ${weather_SRCS})
+
+qt5_use_modules(ubuntu-weather-app Gui Qml Quick)
+
+if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+add_custom_target(weahter-qmlfiles ALL
+    COMMAND cp -r ${CMAKE_CURRENT_SOURCE_DIR}/qml ${CMAKE_CURRENT_BINARY_DIR}
+    DEPENDS ${QMLFILES}
+)
+endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
+
+install(DIRECTORY qml DESTINATION ${DATA_DIR})
+if(CLICK_MODE)
+  install(TARGETS ubuntu-weather-app DESTINATION ${BIN_DIR})
+else()
+  install(TARGETS ubuntu-weather-app RUNTIME DESTINATION bin)
+endif()

=== added file 'src/app/main.cpp'
--- src/app/main.cpp	1970-01-01 00:00:00 +0000
+++ src/app/main.cpp	2014-12-09 18:21:47 +0000
@@ -0,0 +1,66 @@
+/*
+ * Copyright: 2013 - 2014 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 as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * ubuntu-weather-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/>.
+ *
+ * Authors: Filippo Scognamiglio <[e-mail]>
+ */
+
+#include <QtGui/QGuiApplication>
+#include <QtQuick/QQuickView>
+#include <QtQml/QtQml>
+#include <QLibrary>
+#include <QDir>
+
+#include <QDebug>
+
+int main(int argc, char *argv[])
+{
+    QGuiApplication a(argc, argv);
+    QQuickView view;
+    view.setResizeMode(QQuickView::SizeRootObjectToView);
+
+    // Set up import paths. Might be useful to tweak them.
+    QStringList importPathList = view.engine()->importPathList();
+    importPathList.prepend(QCoreApplication::applicationDirPath() + "/../plugins/");
+    view.engine()->setImportPathList(importPathList);
+
+    // TODO: Manage command line arguments if needed.
+    QStringList args = a.arguments();
+
+    // Load the main QML file
+    QStringList paths = QStandardPaths::standardLocations(QStandardPaths::DataLocation);
+    paths.prepend(QDir::currentPath());
+    paths.prepend(QCoreApplication::applicationDirPath());
+
+    QString qmlfile;
+
+    foreach (const QString &path, paths) {
+        QString filename("/qml/ubuntu-weather-app.qml");
+        QFileInfo fi(path + filename);
+        qDebug() << "Trying to load QML from:" << path + filename;
+        if (fi.exists()) {
+            qmlfile = path + filename;
+            break;
+        }
+    }
+
+    qDebug() << "using main qml file from:" << qmlfile;
+    view.setSource(QUrl::fromLocalFile(qmlfile));
+    view.show();
+
+    return a.exec();
+}

=== added directory 'src/app/qml'
=== renamed directory 'components' => 'src/app/qml/components'
=== renamed file 'key.js' => 'src/app/qml/key.js'
=== renamed directory 'resources' => 'src/app/qml/resources'
=== renamed file 'ubuntu-weather-app.qml' => 'src/app/qml/ubuntu-weather-app.qml'
=== renamed file 'ubuntu-weather-app.qmlproject' => 'src/app/qml/ubuntu-weather-app.qmlproject'
=== renamed directory 'plugins' => 'src/plugins'
=== modified file 'src/plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2014-10-01 09:45:07 +0000
+++ src/plugins/CMakeLists.txt	2014-12-09 18:21:47 +0000
@@ -2,9 +2,13 @@
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
+set(PLUGIN_DIR TimeZone)
+
 set(
     timeZone_SRCS
+    TimeZone/timezone.h
     TimeZone/timezone.cpp
+    TimeZone/timezone_plugin.h
     TimeZone/timezone_plugin.cpp
 )
 
@@ -23,5 +27,5 @@
 )
 
 # Install plugin file
-install(TARGETS TimeZoneBackend DESTINATION ${QT_IMPORTS_DIR}/qt5/qml/UbuntuWeather/TimeZone/)
-install(FILES TimeZone/qmldir DESTINATION ${QT_IMPORTS_DIR}/qt5/qml/UbuntuWeather/TimeZone/)
+install(TARGETS TimeZoneBackend DESTINATION ${QT_IMPORTS_DIR}/${PLUGIN_DIR})
+install(FILES TimeZone/qmldir DESTINATION ${QT_IMPORTS_DIR}/${PLUGIN_DIR})

=== removed file 'ubuntu-weather-app.desktop'
--- ubuntu-weather-app.desktop	2014-04-16 14:42:16 +0000
+++ ubuntu-weather-app.desktop	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Exec=qmlscene -qt5 ubuntu-weather-app.qml
-Icon=weather64.png
-Name=Weather
-X-Ubuntu-Touch=true
-X-Ubuntu-StageHint=SideStage

=== removed file 'ubuntu-weather-app.in'
--- ubuntu-weather-app.in	2014-04-16 17:35:03 +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@