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

Proposed by Victor Thompson on 2015-01-23
Status: Merged
Approved by: Martin Borho on 2015-01-25
Approved revision: 5
Merged at revision: 2
Proposed branch: lp:~vthompson/ubuntu-weather-app/build-reboot
Merge into: lp:ubuntu-weather-app
Diff against target: 499 lines (+255/-117)
14 files modified
CMakeLists.txt (+75/-62)
app/CMakeLists.txt (+15/-0)
app/components/CMakeLists.txt (+5/-0)
app/ubuntu-weather-app.qml (+49/-0)
backend/CMakeLists.txt (+29/-0)
click/CMakeLists.txt (+0/-15)
manifest.json.in (+3/-3)
po/CMakeLists.txt (+33/-0)
po/com.ubuntu.weather.pot (+32/-0)
tests/CMakeLists.txt (+3/-0)
tests/autopilot/CMakeLists.txt (+8/-0)
ubuntu-weather-app.apparmor (+3/-2)
ubuntu-weather-app.in (+0/-3)
ubuntu-weather-app.qmlproject (+0/-32)
To merge this branch: bzr merge lp:~vthompson/ubuntu-weather-app/build-reboot
Reviewer Review Type Date Requested Status
Martin Borho Approve on 2015-01-25
Nekhelesh Ramananthan (community) 2015-01-23 Approve on 2015-01-24
Review via email: mp+247372@code.launchpad.net

This proposal supersedes a proposal from 2015-01-23.

Commit message

* Fill out file structure to allow CMake to build, using the file structure typical in QtCreator.

Description of the change

* Fill out file structure to allow CMake to build, assuming old file layout.

Let's decide how we want to organize the code for our components/plugins/etc. This currently assumes we will use the structure that the Weather app used previously:

components/
resources/
plugins/
po/
tests/

I'm A-OK with that if we want to keep things that way, otherwise I'd suggest the following (which is how QtCreator lays out a C++/QML application):

app/components/
app/graphics/
app/tests/
apps/ui/
backend/modules/
backend/tests/
po/

To post a comment you must log in.
Nekhelesh Ramananthan (nik90) wrote :

I would also recommend going with the 2nd folder structure (which is also how QtC lays out) since personally I think it is more organized. Waiting for a decision from m-b-o.

Martin Borho (martin-borho) wrote :

Yes, second folder structure seems much more organized, let us go with that one!

3. By Victor Thompson on 2015-01-23

Update file structure

Martin Borho (martin-borho) wrote :

Looks good!

Should we add a blueprint "ubuntu-weather-app.qml" at start too?

Nekhelesh Ramananthan (nik90) wrote :

Please move "tests" outside the app directory as it is not something we will include in our click package.

23 +add_subdirectory(tests)

review: Needs Fixing
Nekhelesh Ramananthan (nik90) wrote :

@Victor, I made the necessary fixes and changes to https://code.launchpad.net/~nik90/ubuntu-weather-app/weather-reboot-fixes/+merge/247495. Please merge it into this MP.

4. By Victor Thompson on 2015-01-24

Merge nik90's changes

5. By Victor Thompson on 2015-01-24

Remove last Clock app reference

Nekhelesh Ramananthan (nik90) wrote :

LGTM! I think the basic stuff needed to start development and running on phone is now complete with this MR. We can do debian and autopilot setup in separate MPs.

review: Approve
Martin Borho (martin-borho) wrote :

Looks good for me too! Let's go! :)

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-01-22 21:56:55 +0000
3+++ CMakeLists.txt 2015-01-24 00:41:21 +0000
4@@ -1,95 +1,108 @@
5 project(com.ubuntu.weather)
6 cmake_minimum_required(VERSION 2.8.9)
7+
8 find_program(INTLTOOL_MERGE intltool-merge)
9+if(NOT INTLTOOL_MERGE)
10+ message(FATAL_ERROR "Could not find intltool-merge, please install the intltool package")
11+endif()
12 find_program(INTLTOOL_EXTRACT intltool-extract)
13+if(NOT INTLTOOL_EXTRACT)
14+ message(FATAL_ERROR "Could not find intltool-extract, please install the intltool package")
15+endif()
16+
17+set (UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
18+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra")
19
20 find_package(Qt5Core REQUIRED)
21 find_package(Qt5Qml REQUIRED)
22 find_package(Qt5Quick REQUIRED)
23+
24+# Automatically create moc files
25 set(CMAKE_AUTOMOC ON)
26
27+option(INSTALL_TESTS "Install the tests on make install" on)
28+option(CLICK_MODE "Build as a click package" on)
29+
30+# Tests
31+enable_testing()
32+
33 # Standard install paths
34 include(GNUInstallDirs)
35
36-option(INSTALL_TESTS "Install the tests on make install" on)
37-option(CLICK_MODE "Installs to a contained location" on)
38-
39 set(APP_NAME weather)
40-set(DESKTOP_FILE "${PROJECT_NAME}_${APP_NAME}.desktop")
41 set(APP_HARDCODE ubuntu-weather-app)
42-set(MAIN_QML ubuntu-weather-app.qml)
43-set(ICON_FILE weather-app@30.png)
44+set(MAIN_QML ${APP_HARDCODE}.qml)
45+set(DESKTOP_FILE "${APP_HARDCODE}.desktop")
46+set(ICON weather-app@30.png)
47 set(AUTOPILOT_DIR ubuntu_weather_app)
48-set(UBUNTU_MANIFEST_PATH "click/manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
49-
50-# components PATH
51-execute_process(
52- COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
53- OUTPUT_VARIABLE ARCH_TRIPLET
54- OUTPUT_STRIP_TRAILING_WHITESPACE
55-)
56-set(QT_IMPORTS_DIR "lib/${ARCH_TRIPLET}")
57-execute_process(
58- COMMAND dpkg-architecture -qDEB_HOST_ARCH
59- OUTPUT_VARIABLE CLICK_ARCH
60- OUTPUT_STRIP_TRAILING_WHITESPACE
61-)
62-
63+
64+# Set install paths
65 if(CLICK_MODE)
66- if(NOT DEFINED BZR_SOURCE)
67- set(BZR_SOURCE "lp:${APP_HARDCODE}")
68- message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
69- endif(NOT DEFINED BZR_SOURCE)
70- set(CMAKE_INSTALL_PREFIX /)
71- set(CMAKE_INSTALL_BINDIR /)
72- set(DATA_DIR /)
73- set(ICON ${ICON_FILE})
74- set(EXEC "qmlscene $@ ${MAIN_QML}")
75- set(DESKTOP_DIR ${DATA_DIR})
76+ set(CMAKE_INSTALL_PREFIX "/")
77+ set(UBUNTU-WEATHER_APP_DIR "${CMAKE_INSTALL_DATADIR}/qml")
78+
79+ set(QT_IMPORTS_DIR "${CMAKE_INSTALL_LIBDIR}")
80+ set(EXEC "qmlscene $@ ${UBUNTU-WEATHER_APP_DIR}/${MAIN_QML}")
81+ set(MODULE_PATH ${QT_IMPORTS_DIR})
82+ if(NOT BZR_REVNO)
83+ execute_process(
84+ COMMAND bzr revno
85+ OUTPUT_VARIABLE BZR_REVNO
86+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
87+ OUTPUT_STRIP_TRAILING_WHITESPACE
88+ )
89+ endif(NOT BZR_REVNO)
90+ if(NOT BZR_SOURCE)
91+ set(BZR_SOURCE "lp:${APP_HARDCODE}/reboot")
92+ message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
93+ endif(NOT BZR_SOURCE)
94 else(CLICK_MODE)
95- set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
96- set(EXEC ${APP_HARDCODE})
97- set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE})
98- configure_file(${APP_HARDCODE}.in
99- ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
100- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}
101- DESTINATION ${CMAKE_INSTALL_BINDIR})
102- set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
103+ set(UBUNTU-WEATHER_APP_DIR "${CMAKE_INSTALL_DATADIR}/ubuntu-weather-app")
104+ execute_process(
105+ COMMAND qmake -query QT_INSTALL_QML
106+ OUTPUT_VARIABLE QT_IMPORTS_DIR
107+ OUTPUT_STRIP_TRAILING_WHITESPACE
108+ )
109+ set(MODULE_PATH ${QT_IMPORTS_DIR}/WeatherApp)
110 endif(CLICK_MODE)
111
112+if(${CLICK_MODE})
113+ message("-- Configuring manifest.json")
114+
115+ execute_process(
116+ COMMAND dpkg-architecture -qDEB_HOST_ARCH
117+ OUTPUT_VARIABLE CLICK_ARCH
118+ OUTPUT_STRIP_TRAILING_WHITESPACE
119+ )
120+
121+ configure_file(${UBUNTU_MANIFEST_PATH} ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
122+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
123+ install(FILES "${APP_HARDCODE}.apparmor" DESTINATION ${CMAKE_INSTALL_PREFIX})
124+else(CLICK_MODE)
125+ set(EXEC "qmlscene $@ -I ${MODULE_PATH} ${CMAKE_INSTALL_PREFIX}/${UBUNTU-WEATHER_APP_DIR}/${MAIN_QML}")
126+endif()
127+
128+
129 file(GLOB_RECURSE I18N_SRC_FILES
130- RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po
131- components/*.qml components/*.js *.qml)
132+ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po
133+ *.qml *.js)
134 list(APPEND I18N_SRC_FILES ${DESKTOP_FILE}.in.in.h)
135 list(SORT I18N_SRC_FILES)
136-message("Found ${I18N_SRC_FILES}")
137-
138-file(GLOB SRC_FILES
139- RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
140- *.qml *.js *.png *.js)
141-install(DIRECTORY components resources DESTINATION ${DATA_DIR})
142-install(FILES key.js DESTINATION ${DATA_DIR})
143-install(FILES ${MAIN_QML} ${ICON_FILE} DESTINATION ${DATA_DIR})
144
145 configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
146
147 add_custom_target(${DESKTOP_FILE} ALL
148- COMMENT "Merging translations into ${DESKTOP_FILE}"
149- COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${DESKTOP_FILE}.in ${DESKTOP_FILE} >/dev/null
150+ COMMENT "Merging translations into ${DESKTOP_FILE}..."
151+ COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${DESKTOP_FILE}.in ${DESKTOP_FILE}
152 )
153
154 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
155- DESTINATION ${DESKTOP_DIR})
156-
157-# Tests
158-enable_testing()
159-
160-file(GLOB QML_JS_FILES *.qml *.js)
161-add_custom_target(ubuntu-weather-app_QMlFiles ALL SOURCES ${QML_JS_FILES})
162-
163-add_subdirectory(click)
164+ DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
165+
166+add_subdirectory(app)
167+add_subdirectory(backend)
168 add_subdirectory(po)
169 add_subdirectory(tests)
170-add_subdirectory(components)
171-add_subdirectory(plugins)
172+
173+# TODO: Add custom target for autopilot and run.
174
175
176=== added directory 'app'
177=== added file 'app/CMakeLists.txt'
178--- app/CMakeLists.txt 1970-01-01 00:00:00 +0000
179+++ app/CMakeLists.txt 2015-01-24 00:41:21 +0000
180@@ -0,0 +1,15 @@
181+if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
182+ file(GLOB QML_JS_FILES *.qml *.js)
183+ add_custom_target(ubuntu-weather-app_QMlFiles ALL SOURCES ${QML_JS_FILES})
184+endif(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
185+
186+
187+if(CLICK_MODE)
188+ set(ICON ${ICON})
189+ install(FILES ${ICON} DESTINATION ${CMAKE_INSTALL_PREFIX})
190+endif(CLICK_MODE)
191+
192+install(FILES ${MAIN_QML} DESTINATION ${UBUNTU-WEATHER_APP_DIR})
193+
194+add_subdirectory(components)
195+
196
197=== added directory 'app/components'
198=== added file 'app/components/CMakeLists.txt'
199--- app/components/CMakeLists.txt 1970-01-01 00:00:00 +0000
200+++ app/components/CMakeLists.txt 2015-01-24 00:41:21 +0000
201@@ -0,0 +1,5 @@
202+file(GLOB COMPONENTS_QML_JS_FILES *.qml *.js)
203+
204+add_custom_target(ubuntu-weather-app_components_QMlFiles ALL SOURCES ${COMPONENTS_QML_JS_FILES})
205+
206+install(FILES ${COMPONENTS_QML_JS_FILES} DESTINATION ${UBUNTU-WEATHER_APP_DIR}/components)
207
208=== added file 'app/ubuntu-weather-app.qml'
209--- app/ubuntu-weather-app.qml 1970-01-01 00:00:00 +0000
210+++ app/ubuntu-weather-app.qml 2015-01-24 00:41:21 +0000
211@@ -0,0 +1,49 @@
212+/*
213+ * Copyright (C) 2015 Canonical Ltd
214+ *
215+ * This file is part of Ubuntu Weather App
216+ *
217+ * Ubuntu Weather App is free software: you can redistribute it and/or modify
218+ * it under the terms of the GNU General Public License version 3 as
219+ * published by the Free Software Foundation.
220+ *
221+ * Ubuntu Weather App is distributed in the hope that it will be useful,
222+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
223+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
224+ * GNU General Public License for more details.
225+ *
226+ * You should have received a copy of the GNU General Public License
227+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
228+ */
229+
230+import QtQuick 2.3
231+import Ubuntu.Components 1.1
232+
233+MainView {
234+ id: weatherApp
235+
236+ objectName: "weather"
237+
238+ applicationName: "com.ubuntu.weather"
239+
240+ automaticOrientation: false
241+
242+ width: units.gu(40)
243+ height: units.gu(70)
244+
245+ backgroundColor: "#F5F5F5"
246+
247+ useDeprecatedToolbar: false
248+ anchorToKeyboard: true
249+
250+
251+ Page {
252+ title: "Weather Reboot"
253+
254+ Label {
255+ anchors.centerIn: parent
256+ text: "Let the awesomeness begin :)"
257+ }
258+
259+ }
260+}
261
262=== renamed file 'weather-app@30.png' => 'app/weather-app@30.png'
263=== added directory 'backend'
264=== added file 'backend/CMakeLists.txt'
265--- backend/CMakeLists.txt 1970-01-01 00:00:00 +0000
266+++ backend/CMakeLists.txt 2015-01-24 00:41:21 +0000
267@@ -0,0 +1,29 @@
268+project(backend)
269+
270+include_directories(
271+ ${CMAKE_CURRENT_SOURCE_DIR}
272+)
273+
274+#set(
275+# timeZone_SRCS
276+# TimeZone/timezone.cpp
277+# TimeZone/timezone_plugin.cpp
278+#)
279+
280+#add_library(TimeZoneBackend MODULE
281+# ${timeZone_SRCS}
282+#)
283+#set_target_properties(TimeZoneBackend PROPERTIES
284+# LIBRARY_OUTPUT_DIRECTORY TimeZone)
285+
286+#qt5_use_modules(TimeZoneBackend Gui Qml Quick)
287+
288+# Copy qmldir file to build dir for running in QtCreator
289+#add_custom_target(TimeZoneBackend-qmldir ALL
290+# COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/TimeZone/qmldir ${CMAKE_CURRENT_BINARY_DIR}/TimeZone
291+# DEPENDS ${QML_JS_FILES}
292+#)
293+
294+# Install plugin file
295+#install(TARGETS TimeZoneBackend DESTINATION ${QT_IMPORTS_DIR}/qt5/qml/UbuntuWeather/TimeZone/)
296+#install(FILES TimeZone/qmldir DESTINATION ${QT_IMPORTS_DIR}/qt5/qml/UbuntuWeather/TimeZone/)
297
298=== removed directory 'click'
299=== removed file 'click/CMakeLists.txt'
300--- click/CMakeLists.txt 2015-01-22 21:56:55 +0000
301+++ click/CMakeLists.txt 1970-01-01 00:00:00 +0000
302@@ -1,15 +0,0 @@
303-if(CLICK_MODE)
304- if(NOT BZR_REVNO)
305- set(BZR_REVNO "latest")
306- endif(NOT BZR_REVNO)
307- configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
308- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json weather.apparmor
309- DESTINATION ${CMAKE_INSTALL_PREFIX})
310-
311- # make the click files visible in qtcreator
312- file(GLOB CLICK_FILES
313- RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
314- *.json *.json.in *.apparmor)
315-
316- add_custom_target(com_ubuntu_weather_CLICKFiles ALL SOURCES ${CLICK_FILES})
317-endif(CLICK_MODE)
318
319=== renamed file 'click/manifest.json.in' => 'manifest.json.in'
320--- click/manifest.json.in 2015-01-22 21:56:55 +0000
321+++ manifest.json.in 2015-01-24 00:41:21 +0000
322@@ -4,15 +4,15 @@
323 "framework": "ubuntu-sdk-14.10",
324 "hooks": {
325 "weather": {
326- "apparmor": "weather.apparmor",
327- "desktop": "@DESKTOP_FILE@"
328+ "apparmor": "ubuntu-weather-app.apparmor",
329+ "desktop": "@CMAKE_INSTALL_DATADIR@/applications/ubuntu-weather-app.desktop"
330 }
331 },
332 "icon": "@ICON@",
333 "maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>",
334 "name": "@PROJECT_NAME@",
335 "title": "Weather",
336- "version": "2.0.@BZR_REVNO@",
337+ "version": "3.0.@BZR_REVNO@",
338 "x-source": {
339 "vcs-bzr": "@BZR_SOURCE@",
340 "vcs-bzr-revno": "@BZR_REVNO@"
341
342=== added directory 'po'
343=== added file 'po/CMakeLists.txt'
344--- po/CMakeLists.txt 1970-01-01 00:00:00 +0000
345+++ po/CMakeLists.txt 2015-01-24 00:41:21 +0000
346@@ -0,0 +1,33 @@
347+include(FindGettext)
348+find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
349+
350+set(DOMAIN ${PROJECT_NAME})
351+set(POT_FILE ${DOMAIN}.pot)
352+file(GLOB PO_FILES *.po)
353+
354+# Creates the .pot file containing the translations template
355+add_custom_target(${POT_FILE} ALL
356+ COMMENT "Generating translation template"
357+ COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
358+ --srcdir=${CMAKE_SOURCE_DIR} ${DESKTOP_FILE}.in.in
359+ COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}
360+ -D ${CMAKE_CURRENT_SOURCE_DIR}
361+ -D ${CMAKE_CURRENT_BINARY_DIR}
362+ --from-code=UTF-8
363+ --c++ --qt --add-comments=TRANSLATORS
364+ --keyword=tr --keyword=tr:1,2 --keyword=N_
365+ --package-name='${APP_HARDCODE}'
366+ --copyright-holder='Canonical Ltd.'
367+ ${I18N_SRC_FILES}
368+ COMMAND ${CMAKE_COMMAND} -E copy ${POT_FILE} ${CMAKE_CURRENT_SOURCE_DIR})
369+
370+# Builds the binary translations catalog for each language
371+# it finds source translations (*.po) for
372+foreach(PO_FILE ${PO_FILES})
373+ get_filename_component(LANG ${PO_FILE} NAME_WE)
374+ gettext_process_po_files(${LANG} ALL PO_FILES ${PO_FILE})
375+ set(INSTALL_DIR ${CMAKE_INSTALL_LOCALEDIR}/${LANG}/LC_MESSAGES)
376+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo
377+ DESTINATION ${INSTALL_DIR}
378+ RENAME ${DOMAIN}.mo)
379+endforeach(PO_FILE)
380
381=== added file 'po/com.ubuntu.weather.pot'
382--- po/com.ubuntu.weather.pot 1970-01-01 00:00:00 +0000
383+++ po/com.ubuntu.weather.pot 2015-01-24 00:41:21 +0000
384@@ -0,0 +1,32 @@
385+# SOME DESCRIPTIVE TITLE.
386+# Copyright (C) YEAR Canonical Ltd.
387+# This file is distributed under the same license as the PACKAGE package.
388+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
389+#
390+#, fuzzy
391+msgid ""
392+msgstr ""
393+"Project-Id-Version: ubuntu-weather-app\n"
394+"Report-Msgid-Bugs-To: \n"
395+"POT-Creation-Date: 2015-01-24 00:26+0100\n"
396+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
397+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
398+"Language-Team: LANGUAGE <LL@li.org>\n"
399+"Language: \n"
400+"MIME-Version: 1.0\n"
401+"Content-Type: text/plain; charset=CHARSET\n"
402+"Content-Transfer-Encoding: 8bit\n"
403+
404+#: ubuntu-weather-app.desktop.in.in.h:1
405+msgid "Weather"
406+msgstr ""
407+
408+#: ubuntu-weather-app.desktop.in.in.h:2
409+msgid ""
410+"A weather forecast application for Ubuntu with support for multiple online "
411+"weather data sources"
412+msgstr ""
413+
414+#: ubuntu-weather-app.desktop.in.in.h:3
415+msgid "weather;forecast;twc;openweathermap;the weather channel;"
416+msgstr ""
417
418=== added directory 'tests'
419=== added file 'tests/CMakeLists.txt'
420--- tests/CMakeLists.txt 1970-01-01 00:00:00 +0000
421+++ tests/CMakeLists.txt 2015-01-24 00:41:21 +0000
422@@ -0,0 +1,3 @@
423+if(NOT CLICK_MODE)
424+ add_subdirectory(autopilot)
425+endif(NOT CLICK_MODE)
426
427=== added directory 'tests/autopilot'
428=== added file 'tests/autopilot/CMakeLists.txt'
429--- tests/autopilot/CMakeLists.txt 1970-01-01 00:00:00 +0000
430+++ tests/autopilot/CMakeLists.txt 2015-01-24 00:41:21 +0000
431@@ -0,0 +1,8 @@
432+if(INSTALL_TESTS)
433+execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
434+ OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
435+
436+install(DIRECTORY ${AUTOPILOT_DIR}
437+ DESTINATION ${PYTHON_PACKAGE_DIR}
438+ )
439+endif(INSTALL_TESTS)
440
441=== added directory 'tests/autopilot/ubuntu_weather_app'
442=== renamed file 'click/weather.apparmor' => 'ubuntu-weather-app.apparmor'
443--- click/weather.apparmor 2015-01-22 21:56:55 +0000
444+++ ubuntu-weather-app.apparmor 2015-01-24 00:41:21 +0000
445@@ -1,5 +1,6 @@
446 {
447- "policy_groups": ["networking"
448- ],
449+ "policy_groups": [
450+ "networking"
451+ ],
452 "policy_version": 1.2
453 }
454
455=== renamed file 'com.ubuntu.weather_weather.desktop.in.in' => 'ubuntu-weather-app.desktop.in.in'
456=== removed file 'ubuntu-weather-app.in'
457--- ubuntu-weather-app.in 2015-01-22 21:56:55 +0000
458+++ ubuntu-weather-app.in 1970-01-01 00:00:00 +0000
459@@ -1,3 +0,0 @@
460-#!/bin/bash
461-export QT_SELECT=qt5
462-exec qmlscene @CMAKE_INSTALL_PREFIX@/@DATA_DIR@/@MAIN_QML@
463
464=== removed file 'ubuntu-weather-app.qmlproject'
465--- ubuntu-weather-app.qmlproject 2015-01-22 21:56:55 +0000
466+++ ubuntu-weather-app.qmlproject 1970-01-01 00:00:00 +0000
467@@ -1,32 +0,0 @@
468-/* File generated by Qt Creator, version 2.6.1 */
469-
470-import QmlProject 1.1
471-
472-Project {
473- mainFile: "ubuntu-weather-app.qml"
474-
475- /* Include .qml, .js, and image files from current directory and subdirectories */
476- QmlFiles {
477- directory: "."
478- }
479- JavaScriptFiles {
480- directory: "."
481- }
482- ImageFiles {
483- directory: "."
484- }
485- /* Shows the README files in the project view */
486- Files {
487- filter: "README*"
488- }
489- /* Shows the translation files and the .pro file used to generate the .pot template */
490- Files {
491- filter: "*.po*"
492- }
493- /* Shows the CMake files */
494- Files {
495- filter: "CMakeLists.txt"
496- }
497- /* List of plugin directories passed to QML runtime */
498- importPaths: [ "." ,"/usr/lib/x86_64-linux-gnu/qt5/qml" ]
499-}

Subscribers

People subscribed via source and target branches

to all changes: