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

Proposed by Victor Thompson on 2015-01-23
Status: Superseded
Proposed branch: lp:~vthompson/ubuntu-weather-app/build-reboot
Merge into: lp:ubuntu-weather-app/obsolete.trunk
Diff against target: 1103 lines (+1000/-0) (has conflicts)
16 files modified
.bzrignore (+19/-0)
CMakeLists.txt (+95/-0)
COPYING (+674/-0)
README (+11/-0)
README.translations (+40/-0)
click/CMakeLists.txt (+15/-0)
click/manifest.json.in (+23/-0)
click/weather.apparmor (+5/-0)
com.ubuntu.weather_weather.desktop.in.in (+12/-0)
components/CMakeLists.txt (+2/-0)
plugins/CMakeLists.txt (+27/-0)
po/CMakeLists.txt (+33/-0)
tests/CMakeLists.txt (+1/-0)
tests/autopilot/CMakeLists.txt (+8/-0)
ubuntu-weather-app.in (+3/-0)
ubuntu-weather-app.qmlproject (+32/-0)
Conflict adding file .bzrignore.  Moved existing file to .bzrignore.moved.
Conflict adding file CMakeLists.txt.  Moved existing file to CMakeLists.txt.moved.
Conflict adding file COPYING.  Moved existing file to COPYING.moved.
Conflict adding file README.  Moved existing file to README.moved.
Conflict adding file README.translations.  Moved existing file to README.translations.moved.
Conflict adding file click.  Moved existing file to click.moved.
Conflict adding file com.ubuntu.weather_weather.desktop.in.in.  Moved existing file to com.ubuntu.weather_weather.desktop.in.in.moved.
Conflict adding file components.  Moved existing file to components.moved.
Conflict adding file plugins.  Moved existing file to plugins.moved.
Conflict adding file po.  Moved existing file to po.moved.
Conflict adding file tests.  Moved existing file to tests.moved.
Conflict adding file ubuntu-weather-app.in.  Moved existing file to ubuntu-weather-app.in.moved.
Conflict adding file ubuntu-weather-app.qmlproject.  Moved existing file to ubuntu-weather-app.qmlproject.moved.
Conflict adding file weather-app@30.png.  Moved existing file to weather-app@30.png.moved.
To merge this branch: bzr merge lp:~vthompson/ubuntu-weather-app/build-reboot
Reviewer Review Type Date Requested Status
Ubuntu Weather Developers 2015-01-23 Pending
Review via email: mp+247371@code.launchpad.net

This proposal has been superseded by a proposal from 2015-01-23.

Commit message

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

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.
3. By Victor Thompson on 2015-01-23

Update file structure

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

Unmerged revisions

5. By Victor Thompson on 2015-01-24

Remove last Clock app reference

4. By Victor Thompson on 2015-01-24

Merge nik90's changes

3. By Victor Thompson on 2015-01-23

Update file structure

2. By Victor Thompson on 2015-01-23

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

1. By Andrew Hayzen on 2015-01-22

* Initial commit

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file '.bzrignore'
2--- .bzrignore 1970-01-01 00:00:00 +0000
3+++ .bzrignore 2015-01-23 02:36:47 +0000
4@@ -0,0 +1,19 @@
5+*.user*
6+debian/files
7+debian/tmp
8+debian/ubuntu-weather-app*
9+debian/app-template/
10+debian/*.debhelper.log
11+debian/*.substvars
12+.build
13+Makefile
14+CMakeCache.txt
15+CMakeFiles/
16+*.cmake
17+*.gmo
18+*.mo
19+*.desktop
20+*.desktop.in
21+*.desktop.in.in.h
22+.excludes
23+ubuntu-weather-app.json
24
25=== renamed file '.bzrignore' => '.bzrignore.moved'
26=== added file 'CMakeLists.txt'
27--- CMakeLists.txt 1970-01-01 00:00:00 +0000
28+++ CMakeLists.txt 2015-01-23 02:36:47 +0000
29@@ -0,0 +1,95 @@
30+project(com.ubuntu.weather)
31+cmake_minimum_required(VERSION 2.8.9)
32+find_program(INTLTOOL_MERGE intltool-merge)
33+find_program(INTLTOOL_EXTRACT intltool-extract)
34+
35+find_package(Qt5Core REQUIRED)
36+find_package(Qt5Qml REQUIRED)
37+find_package(Qt5Quick REQUIRED)
38+set(CMAKE_AUTOMOC ON)
39+
40+# Standard install paths
41+include(GNUInstallDirs)
42+
43+option(INSTALL_TESTS "Install the tests on make install" on)
44+option(CLICK_MODE "Installs to a contained location" on)
45+
46+set(APP_NAME weather)
47+set(DESKTOP_FILE "${PROJECT_NAME}_${APP_NAME}.desktop")
48+set(APP_HARDCODE ubuntu-weather-app)
49+set(MAIN_QML ubuntu-weather-app.qml)
50+set(ICON_FILE weather-app@30.png)
51+set(AUTOPILOT_DIR ubuntu_weather_app)
52+set(UBUNTU_MANIFEST_PATH "click/manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
53+
54+# components PATH
55+execute_process(
56+ COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
57+ OUTPUT_VARIABLE ARCH_TRIPLET
58+ OUTPUT_STRIP_TRAILING_WHITESPACE
59+)
60+set(QT_IMPORTS_DIR "lib/${ARCH_TRIPLET}")
61+execute_process(
62+ COMMAND dpkg-architecture -qDEB_HOST_ARCH
63+ OUTPUT_VARIABLE CLICK_ARCH
64+ OUTPUT_STRIP_TRAILING_WHITESPACE
65+)
66+
67+if(CLICK_MODE)
68+ if(NOT DEFINED BZR_SOURCE)
69+ set(BZR_SOURCE "lp:${APP_HARDCODE}")
70+ message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
71+ endif(NOT DEFINED BZR_SOURCE)
72+ set(CMAKE_INSTALL_PREFIX /)
73+ set(CMAKE_INSTALL_BINDIR /)
74+ set(DATA_DIR /)
75+ set(ICON ${ICON_FILE})
76+ set(EXEC "qmlscene $@ ${MAIN_QML}")
77+ set(DESKTOP_DIR ${DATA_DIR})
78+else(CLICK_MODE)
79+ set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
80+ set(EXEC ${APP_HARDCODE})
81+ set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE})
82+ configure_file(${APP_HARDCODE}.in
83+ ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
84+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}
85+ DESTINATION ${CMAKE_INSTALL_BINDIR})
86+ set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
87+endif(CLICK_MODE)
88+
89+file(GLOB_RECURSE I18N_SRC_FILES
90+ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po
91+ components/*.qml components/*.js *.qml)
92+list(APPEND I18N_SRC_FILES ${DESKTOP_FILE}.in.in.h)
93+list(SORT I18N_SRC_FILES)
94+message("Found ${I18N_SRC_FILES}")
95+
96+file(GLOB SRC_FILES
97+ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
98+ *.qml *.js *.png *.js)
99+install(DIRECTORY components resources DESTINATION ${DATA_DIR})
100+install(FILES key.js DESTINATION ${DATA_DIR})
101+install(FILES ${MAIN_QML} ${ICON_FILE} DESTINATION ${DATA_DIR})
102+
103+configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
104+
105+add_custom_target(${DESKTOP_FILE} ALL
106+ COMMENT "Merging translations into ${DESKTOP_FILE}"
107+ COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${DESKTOP_FILE}.in ${DESKTOP_FILE} >/dev/null
108+)
109+
110+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
111+ DESTINATION ${DESKTOP_DIR})
112+
113+# Tests
114+enable_testing()
115+
116+file(GLOB QML_JS_FILES *.qml *.js)
117+add_custom_target(ubuntu-weather-app_QMlFiles ALL SOURCES ${QML_JS_FILES})
118+
119+add_subdirectory(click)
120+add_subdirectory(po)
121+add_subdirectory(tests)
122+add_subdirectory(components)
123+add_subdirectory(plugins)
124+
125
126=== renamed file 'CMakeLists.txt' => 'CMakeLists.txt.moved'
127=== added file 'COPYING'
128--- COPYING 1970-01-01 00:00:00 +0000
129+++ COPYING 2015-01-23 02:36:47 +0000
130@@ -0,0 +1,674 @@
131+ GNU GENERAL PUBLIC LICENSE
132+ Version 3, 29 June 2007
133+
134+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
135+ Everyone is permitted to copy and distribute verbatim copies
136+ of this license document, but changing it is not allowed.
137+
138+ Preamble
139+
140+ The GNU General Public License is a free, copyleft license for
141+software and other kinds of works.
142+
143+ The licenses for most software and other practical works are designed
144+to take away your freedom to share and change the works. By contrast,
145+the GNU General Public License is intended to guarantee your freedom to
146+share and change all versions of a program--to make sure it remains free
147+software for all its users. We, the Free Software Foundation, use the
148+GNU General Public License for most of our software; it applies also to
149+any other work released this way by its authors. You can apply it to
150+your programs, too.
151+
152+ When we speak of free software, we are referring to freedom, not
153+price. Our General Public Licenses are designed to make sure that you
154+have the freedom to distribute copies of free software (and charge for
155+them if you wish), that you receive source code or can get it if you
156+want it, that you can change the software or use pieces of it in new
157+free programs, and that you know you can do these things.
158+
159+ To protect your rights, we need to prevent others from denying you
160+these rights or asking you to surrender the rights. Therefore, you have
161+certain responsibilities if you distribute copies of the software, or if
162+you modify it: responsibilities to respect the freedom of others.
163+
164+ For example, if you distribute copies of such a program, whether
165+gratis or for a fee, you must pass on to the recipients the same
166+freedoms that you received. You must make sure that they, too, receive
167+or can get the source code. And you must show them these terms so they
168+know their rights.
169+
170+ Developers that use the GNU GPL protect your rights with two steps:
171+(1) assert copyright on the software, and (2) offer you this License
172+giving you legal permission to copy, distribute and/or modify it.
173+
174+ For the developers' and authors' protection, the GPL clearly explains
175+that there is no warranty for this free software. For both users' and
176+authors' sake, the GPL requires that modified versions be marked as
177+changed, so that their problems will not be attributed erroneously to
178+authors of previous versions.
179+
180+ Some devices are designed to deny users access to install or run
181+modified versions of the software inside them, although the manufacturer
182+can do so. This is fundamentally incompatible with the aim of
183+protecting users' freedom to change the software. The systematic
184+pattern of such abuse occurs in the area of products for individuals to
185+use, which is precisely where it is most unacceptable. Therefore, we
186+have designed this version of the GPL to prohibit the practice for those
187+products. If such problems arise substantially in other domains, we
188+stand ready to extend this provision to those domains in future versions
189+of the GPL, as needed to protect the freedom of users.
190+
191+ Finally, every program is threatened constantly by software patents.
192+States should not allow patents to restrict development and use of
193+software on general-purpose computers, but in those that do, we wish to
194+avoid the special danger that patents applied to a free program could
195+make it effectively proprietary. To prevent this, the GPL assures that
196+patents cannot be used to render the program non-free.
197+
198+ The precise terms and conditions for copying, distribution and
199+modification follow.
200+
201+ TERMS AND CONDITIONS
202+
203+ 0. Definitions.
204+
205+ "This License" refers to version 3 of the GNU General Public License.
206+
207+ "Copyright" also means copyright-like laws that apply to other kinds of
208+works, such as semiconductor masks.
209+
210+ "The Program" refers to any copyrightable work licensed under this
211+License. Each licensee is addressed as "you". "Licensees" and
212+"recipients" may be individuals or organizations.
213+
214+ To "modify" a work means to copy from or adapt all or part of the work
215+in a fashion requiring copyright permission, other than the making of an
216+exact copy. The resulting work is called a "modified version" of the
217+earlier work or a work "based on" the earlier work.
218+
219+ A "covered work" means either the unmodified Program or a work based
220+on the Program.
221+
222+ To "propagate" a work means to do anything with it that, without
223+permission, would make you directly or secondarily liable for
224+infringement under applicable copyright law, except executing it on a
225+computer or modifying a private copy. Propagation includes copying,
226+distribution (with or without modification), making available to the
227+public, and in some countries other activities as well.
228+
229+ To "convey" a work means any kind of propagation that enables other
230+parties to make or receive copies. Mere interaction with a user through
231+a computer network, with no transfer of a copy, is not conveying.
232+
233+ An interactive user interface displays "Appropriate Legal Notices"
234+to the extent that it includes a convenient and prominently visible
235+feature that (1) displays an appropriate copyright notice, and (2)
236+tells the user that there is no warranty for the work (except to the
237+extent that warranties are provided), that licensees may convey the
238+work under this License, and how to view a copy of this License. If
239+the interface presents a list of user commands or options, such as a
240+menu, a prominent item in the list meets this criterion.
241+
242+ 1. Source Code.
243+
244+ The "source code" for a work means the preferred form of the work
245+for making modifications to it. "Object code" means any non-source
246+form of a work.
247+
248+ A "Standard Interface" means an interface that either is an official
249+standard defined by a recognized standards body, or, in the case of
250+interfaces specified for a particular programming language, one that
251+is widely used among developers working in that language.
252+
253+ The "System Libraries" of an executable work include anything, other
254+than the work as a whole, that (a) is included in the normal form of
255+packaging a Major Component, but which is not part of that Major
256+Component, and (b) serves only to enable use of the work with that
257+Major Component, or to implement a Standard Interface for which an
258+implementation is available to the public in source code form. A
259+"Major Component", in this context, means a major essential component
260+(kernel, window system, and so on) of the specific operating system
261+(if any) on which the executable work runs, or a compiler used to
262+produce the work, or an object code interpreter used to run it.
263+
264+ The "Corresponding Source" for a work in object code form means all
265+the source code needed to generate, install, and (for an executable
266+work) run the object code and to modify the work, including scripts to
267+control those activities. However, it does not include the work's
268+System Libraries, or general-purpose tools or generally available free
269+programs which are used unmodified in performing those activities but
270+which are not part of the work. For example, Corresponding Source
271+includes interface definition files associated with source files for
272+the work, and the source code for shared libraries and dynamically
273+linked subprograms that the work is specifically designed to require,
274+such as by intimate data communication or control flow between those
275+subprograms and other parts of the work.
276+
277+ The Corresponding Source need not include anything that users
278+can regenerate automatically from other parts of the Corresponding
279+Source.
280+
281+ The Corresponding Source for a work in source code form is that
282+same work.
283+
284+ 2. Basic Permissions.
285+
286+ All rights granted under this License are granted for the term of
287+copyright on the Program, and are irrevocable provided the stated
288+conditions are met. This License explicitly affirms your unlimited
289+permission to run the unmodified Program. The output from running a
290+covered work is covered by this License only if the output, given its
291+content, constitutes a covered work. This License acknowledges your
292+rights of fair use or other equivalent, as provided by copyright law.
293+
294+ You may make, run and propagate covered works that you do not
295+convey, without conditions so long as your license otherwise remains
296+in force. You may convey covered works to others for the sole purpose
297+of having them make modifications exclusively for you, or provide you
298+with facilities for running those works, provided that you comply with
299+the terms of this License in conveying all material for which you do
300+not control copyright. Those thus making or running the covered works
301+for you must do so exclusively on your behalf, under your direction
302+and control, on terms that prohibit them from making any copies of
303+your copyrighted material outside their relationship with you.
304+
305+ Conveying under any other circumstances is permitted solely under
306+the conditions stated below. Sublicensing is not allowed; section 10
307+makes it unnecessary.
308+
309+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
310+
311+ No covered work shall be deemed part of an effective technological
312+measure under any applicable law fulfilling obligations under article
313+11 of the WIPO copyright treaty adopted on 20 December 1996, or
314+similar laws prohibiting or restricting circumvention of such
315+measures.
316+
317+ When you convey a covered work, you waive any legal power to forbid
318+circumvention of technological measures to the extent such circumvention
319+is effected by exercising rights under this License with respect to
320+the covered work, and you disclaim any intention to limit operation or
321+modification of the work as a means of enforcing, against the work's
322+users, your or third parties' legal rights to forbid circumvention of
323+technological measures.
324+
325+ 4. Conveying Verbatim Copies.
326+
327+ You may convey verbatim copies of the Program's source code as you
328+receive it, in any medium, provided that you conspicuously and
329+appropriately publish on each copy an appropriate copyright notice;
330+keep intact all notices stating that this License and any
331+non-permissive terms added in accord with section 7 apply to the code;
332+keep intact all notices of the absence of any warranty; and give all
333+recipients a copy of this License along with the Program.
334+
335+ You may charge any price or no price for each copy that you convey,
336+and you may offer support or warranty protection for a fee.
337+
338+ 5. Conveying Modified Source Versions.
339+
340+ You may convey a work based on the Program, or the modifications to
341+produce it from the Program, in the form of source code under the
342+terms of section 4, provided that you also meet all of these conditions:
343+
344+ a) The work must carry prominent notices stating that you modified
345+ it, and giving a relevant date.
346+
347+ b) The work must carry prominent notices stating that it is
348+ released under this License and any conditions added under section
349+ 7. This requirement modifies the requirement in section 4 to
350+ "keep intact all notices".
351+
352+ c) You must license the entire work, as a whole, under this
353+ License to anyone who comes into possession of a copy. This
354+ License will therefore apply, along with any applicable section 7
355+ additional terms, to the whole of the work, and all its parts,
356+ regardless of how they are packaged. This License gives no
357+ permission to license the work in any other way, but it does not
358+ invalidate such permission if you have separately received it.
359+
360+ d) If the work has interactive user interfaces, each must display
361+ Appropriate Legal Notices; however, if the Program has interactive
362+ interfaces that do not display Appropriate Legal Notices, your
363+ work need not make them do so.
364+
365+ A compilation of a covered work with other separate and independent
366+works, which are not by their nature extensions of the covered work,
367+and which are not combined with it such as to form a larger program,
368+in or on a volume of a storage or distribution medium, is called an
369+"aggregate" if the compilation and its resulting copyright are not
370+used to limit the access or legal rights of the compilation's users
371+beyond what the individual works permit. Inclusion of a covered work
372+in an aggregate does not cause this License to apply to the other
373+parts of the aggregate.
374+
375+ 6. Conveying Non-Source Forms.
376+
377+ You may convey a covered work in object code form under the terms
378+of sections 4 and 5, provided that you also convey the
379+machine-readable Corresponding Source under the terms of this License,
380+in one of these ways:
381+
382+ a) Convey the object code in, or embodied in, a physical product
383+ (including a physical distribution medium), accompanied by the
384+ Corresponding Source fixed on a durable physical medium
385+ customarily used for software interchange.
386+
387+ b) Convey the object code in, or embodied in, a physical product
388+ (including a physical distribution medium), accompanied by a
389+ written offer, valid for at least three years and valid for as
390+ long as you offer spare parts or customer support for that product
391+ model, to give anyone who possesses the object code either (1) a
392+ copy of the Corresponding Source for all the software in the
393+ product that is covered by this License, on a durable physical
394+ medium customarily used for software interchange, for a price no
395+ more than your reasonable cost of physically performing this
396+ conveying of source, or (2) access to copy the
397+ Corresponding Source from a network server at no charge.
398+
399+ c) Convey individual copies of the object code with a copy of the
400+ written offer to provide the Corresponding Source. This
401+ alternative is allowed only occasionally and noncommercially, and
402+ only if you received the object code with such an offer, in accord
403+ with subsection 6b.
404+
405+ d) Convey the object code by offering access from a designated
406+ place (gratis or for a charge), and offer equivalent access to the
407+ Corresponding Source in the same way through the same place at no
408+ further charge. You need not require recipients to copy the
409+ Corresponding Source along with the object code. If the place to
410+ copy the object code is a network server, the Corresponding Source
411+ may be on a different server (operated by you or a third party)
412+ that supports equivalent copying facilities, provided you maintain
413+ clear directions next to the object code saying where to find the
414+ Corresponding Source. Regardless of what server hosts the
415+ Corresponding Source, you remain obligated to ensure that it is
416+ available for as long as needed to satisfy these requirements.
417+
418+ e) Convey the object code using peer-to-peer transmission, provided
419+ you inform other peers where the object code and Corresponding
420+ Source of the work are being offered to the general public at no
421+ charge under subsection 6d.
422+
423+ A separable portion of the object code, whose source code is excluded
424+from the Corresponding Source as a System Library, need not be
425+included in conveying the object code work.
426+
427+ A "User Product" is either (1) a "consumer product", which means any
428+tangible personal property which is normally used for personal, family,
429+or household purposes, or (2) anything designed or sold for incorporation
430+into a dwelling. In determining whether a product is a consumer product,
431+doubtful cases shall be resolved in favor of coverage. For a particular
432+product received by a particular user, "normally used" refers to a
433+typical or common use of that class of product, regardless of the status
434+of the particular user or of the way in which the particular user
435+actually uses, or expects or is expected to use, the product. A product
436+is a consumer product regardless of whether the product has substantial
437+commercial, industrial or non-consumer uses, unless such uses represent
438+the only significant mode of use of the product.
439+
440+ "Installation Information" for a User Product means any methods,
441+procedures, authorization keys, or other information required to install
442+and execute modified versions of a covered work in that User Product from
443+a modified version of its Corresponding Source. The information must
444+suffice to ensure that the continued functioning of the modified object
445+code is in no case prevented or interfered with solely because
446+modification has been made.
447+
448+ If you convey an object code work under this section in, or with, or
449+specifically for use in, a User Product, and the conveying occurs as
450+part of a transaction in which the right of possession and use of the
451+User Product is transferred to the recipient in perpetuity or for a
452+fixed term (regardless of how the transaction is characterized), the
453+Corresponding Source conveyed under this section must be accompanied
454+by the Installation Information. But this requirement does not apply
455+if neither you nor any third party retains the ability to install
456+modified object code on the User Product (for example, the work has
457+been installed in ROM).
458+
459+ The requirement to provide Installation Information does not include a
460+requirement to continue to provide support service, warranty, or updates
461+for a work that has been modified or installed by the recipient, or for
462+the User Product in which it has been modified or installed. Access to a
463+network may be denied when the modification itself materially and
464+adversely affects the operation of the network or violates the rules and
465+protocols for communication across the network.
466+
467+ Corresponding Source conveyed, and Installation Information provided,
468+in accord with this section must be in a format that is publicly
469+documented (and with an implementation available to the public in
470+source code form), and must require no special password or key for
471+unpacking, reading or copying.
472+
473+ 7. Additional Terms.
474+
475+ "Additional permissions" are terms that supplement the terms of this
476+License by making exceptions from one or more of its conditions.
477+Additional permissions that are applicable to the entire Program shall
478+be treated as though they were included in this License, to the extent
479+that they are valid under applicable law. If additional permissions
480+apply only to part of the Program, that part may be used separately
481+under those permissions, but the entire Program remains governed by
482+this License without regard to the additional permissions.
483+
484+ When you convey a copy of a covered work, you may at your option
485+remove any additional permissions from that copy, or from any part of
486+it. (Additional permissions may be written to require their own
487+removal in certain cases when you modify the work.) You may place
488+additional permissions on material, added by you to a covered work,
489+for which you have or can give appropriate copyright permission.
490+
491+ Notwithstanding any other provision of this License, for material you
492+add to a covered work, you may (if authorized by the copyright holders of
493+that material) supplement the terms of this License with terms:
494+
495+ a) Disclaiming warranty or limiting liability differently from the
496+ terms of sections 15 and 16 of this License; or
497+
498+ b) Requiring preservation of specified reasonable legal notices or
499+ author attributions in that material or in the Appropriate Legal
500+ Notices displayed by works containing it; or
501+
502+ c) Prohibiting misrepresentation of the origin of that material, or
503+ requiring that modified versions of such material be marked in
504+ reasonable ways as different from the original version; or
505+
506+ d) Limiting the use for publicity purposes of names of licensors or
507+ authors of the material; or
508+
509+ e) Declining to grant rights under trademark law for use of some
510+ trade names, trademarks, or service marks; or
511+
512+ f) Requiring indemnification of licensors and authors of that
513+ material by anyone who conveys the material (or modified versions of
514+ it) with contractual assumptions of liability to the recipient, for
515+ any liability that these contractual assumptions directly impose on
516+ those licensors and authors.
517+
518+ All other non-permissive additional terms are considered "further
519+restrictions" within the meaning of section 10. If the Program as you
520+received it, or any part of it, contains a notice stating that it is
521+governed by this License along with a term that is a further
522+restriction, you may remove that term. If a license document contains
523+a further restriction but permits relicensing or conveying under this
524+License, you may add to a covered work material governed by the terms
525+of that license document, provided that the further restriction does
526+not survive such relicensing or conveying.
527+
528+ If you add terms to a covered work in accord with this section, you
529+must place, in the relevant source files, a statement of the
530+additional terms that apply to those files, or a notice indicating
531+where to find the applicable terms.
532+
533+ Additional terms, permissive or non-permissive, may be stated in the
534+form of a separately written license, or stated as exceptions;
535+the above requirements apply either way.
536+
537+ 8. Termination.
538+
539+ You may not propagate or modify a covered work except as expressly
540+provided under this License. Any attempt otherwise to propagate or
541+modify it is void, and will automatically terminate your rights under
542+this License (including any patent licenses granted under the third
543+paragraph of section 11).
544+
545+ However, if you cease all violation of this License, then your
546+license from a particular copyright holder is reinstated (a)
547+provisionally, unless and until the copyright holder explicitly and
548+finally terminates your license, and (b) permanently, if the copyright
549+holder fails to notify you of the violation by some reasonable means
550+prior to 60 days after the cessation.
551+
552+ Moreover, your license from a particular copyright holder is
553+reinstated permanently if the copyright holder notifies you of the
554+violation by some reasonable means, this is the first time you have
555+received notice of violation of this License (for any work) from that
556+copyright holder, and you cure the violation prior to 30 days after
557+your receipt of the notice.
558+
559+ Termination of your rights under this section does not terminate the
560+licenses of parties who have received copies or rights from you under
561+this License. If your rights have been terminated and not permanently
562+reinstated, you do not qualify to receive new licenses for the same
563+material under section 10.
564+
565+ 9. Acceptance Not Required for Having Copies.
566+
567+ You are not required to accept this License in order to receive or
568+run a copy of the Program. Ancillary propagation of a covered work
569+occurring solely as a consequence of using peer-to-peer transmission
570+to receive a copy likewise does not require acceptance. However,
571+nothing other than this License grants you permission to propagate or
572+modify any covered work. These actions infringe copyright if you do
573+not accept this License. Therefore, by modifying or propagating a
574+covered work, you indicate your acceptance of this License to do so.
575+
576+ 10. Automatic Licensing of Downstream Recipients.
577+
578+ Each time you convey a covered work, the recipient automatically
579+receives a license from the original licensors, to run, modify and
580+propagate that work, subject to this License. You are not responsible
581+for enforcing compliance by third parties with this License.
582+
583+ An "entity transaction" is a transaction transferring control of an
584+organization, or substantially all assets of one, or subdividing an
585+organization, or merging organizations. If propagation of a covered
586+work results from an entity transaction, each party to that
587+transaction who receives a copy of the work also receives whatever
588+licenses to the work the party's predecessor in interest had or could
589+give under the previous paragraph, plus a right to possession of the
590+Corresponding Source of the work from the predecessor in interest, if
591+the predecessor has it or can get it with reasonable efforts.
592+
593+ You may not impose any further restrictions on the exercise of the
594+rights granted or affirmed under this License. For example, you may
595+not impose a license fee, royalty, or other charge for exercise of
596+rights granted under this License, and you may not initiate litigation
597+(including a cross-claim or counterclaim in a lawsuit) alleging that
598+any patent claim is infringed by making, using, selling, offering for
599+sale, or importing the Program or any portion of it.
600+
601+ 11. Patents.
602+
603+ A "contributor" is a copyright holder who authorizes use under this
604+License of the Program or a work on which the Program is based. The
605+work thus licensed is called the contributor's "contributor version".
606+
607+ A contributor's "essential patent claims" are all patent claims
608+owned or controlled by the contributor, whether already acquired or
609+hereafter acquired, that would be infringed by some manner, permitted
610+by this License, of making, using, or selling its contributor version,
611+but do not include claims that would be infringed only as a
612+consequence of further modification of the contributor version. For
613+purposes of this definition, "control" includes the right to grant
614+patent sublicenses in a manner consistent with the requirements of
615+this License.
616+
617+ Each contributor grants you a non-exclusive, worldwide, royalty-free
618+patent license under the contributor's essential patent claims, to
619+make, use, sell, offer for sale, import and otherwise run, modify and
620+propagate the contents of its contributor version.
621+
622+ In the following three paragraphs, a "patent license" is any express
623+agreement or commitment, however denominated, not to enforce a patent
624+(such as an express permission to practice a patent or covenant not to
625+sue for patent infringement). To "grant" such a patent license to a
626+party means to make such an agreement or commitment not to enforce a
627+patent against the party.
628+
629+ If you convey a covered work, knowingly relying on a patent license,
630+and the Corresponding Source of the work is not available for anyone
631+to copy, free of charge and under the terms of this License, through a
632+publicly available network server or other readily accessible means,
633+then you must either (1) cause the Corresponding Source to be so
634+available, or (2) arrange to deprive yourself of the benefit of the
635+patent license for this particular work, or (3) arrange, in a manner
636+consistent with the requirements of this License, to extend the patent
637+license to downstream recipients. "Knowingly relying" means you have
638+actual knowledge that, but for the patent license, your conveying the
639+covered work in a country, or your recipient's use of the covered work
640+in a country, would infringe one or more identifiable patents in that
641+country that you have reason to believe are valid.
642+
643+ If, pursuant to or in connection with a single transaction or
644+arrangement, you convey, or propagate by procuring conveyance of, a
645+covered work, and grant a patent license to some of the parties
646+receiving the covered work authorizing them to use, propagate, modify
647+or convey a specific copy of the covered work, then the patent license
648+you grant is automatically extended to all recipients of the covered
649+work and works based on it.
650+
651+ A patent license is "discriminatory" if it does not include within
652+the scope of its coverage, prohibits the exercise of, or is
653+conditioned on the non-exercise of one or more of the rights that are
654+specifically granted under this License. You may not convey a covered
655+work if you are a party to an arrangement with a third party that is
656+in the business of distributing software, under which you make payment
657+to the third party based on the extent of your activity of conveying
658+the work, and under which the third party grants, to any of the
659+parties who would receive the covered work from you, a discriminatory
660+patent license (a) in connection with copies of the covered work
661+conveyed by you (or copies made from those copies), or (b) primarily
662+for and in connection with specific products or compilations that
663+contain the covered work, unless you entered into that arrangement,
664+or that patent license was granted, prior to 28 March 2007.
665+
666+ Nothing in this License shall be construed as excluding or limiting
667+any implied license or other defenses to infringement that may
668+otherwise be available to you under applicable patent law.
669+
670+ 12. No Surrender of Others' Freedom.
671+
672+ If conditions are imposed on you (whether by court order, agreement or
673+otherwise) that contradict the conditions of this License, they do not
674+excuse you from the conditions of this License. If you cannot convey a
675+covered work so as to satisfy simultaneously your obligations under this
676+License and any other pertinent obligations, then as a consequence you may
677+not convey it at all. For example, if you agree to terms that obligate you
678+to collect a royalty for further conveying from those to whom you convey
679+the Program, the only way you could satisfy both those terms and this
680+License would be to refrain entirely from conveying the Program.
681+
682+ 13. Use with the GNU Affero General Public License.
683+
684+ Notwithstanding any other provision of this License, you have
685+permission to link or combine any covered work with a work licensed
686+under version 3 of the GNU Affero General Public License into a single
687+combined work, and to convey the resulting work. The terms of this
688+License will continue to apply to the part which is the covered work,
689+but the special requirements of the GNU Affero General Public License,
690+section 13, concerning interaction through a network will apply to the
691+combination as such.
692+
693+ 14. Revised Versions of this License.
694+
695+ The Free Software Foundation may publish revised and/or new versions of
696+the GNU General Public License from time to time. Such new versions will
697+be similar in spirit to the present version, but may differ in detail to
698+address new problems or concerns.
699+
700+ Each version is given a distinguishing version number. If the
701+Program specifies that a certain numbered version of the GNU General
702+Public License "or any later version" applies to it, you have the
703+option of following the terms and conditions either of that numbered
704+version or of any later version published by the Free Software
705+Foundation. If the Program does not specify a version number of the
706+GNU General Public License, you may choose any version ever published
707+by the Free Software Foundation.
708+
709+ If the Program specifies that a proxy can decide which future
710+versions of the GNU General Public License can be used, that proxy's
711+public statement of acceptance of a version permanently authorizes you
712+to choose that version for the Program.
713+
714+ Later license versions may give you additional or different
715+permissions. However, no additional obligations are imposed on any
716+author or copyright holder as a result of your choosing to follow a
717+later version.
718+
719+ 15. Disclaimer of Warranty.
720+
721+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
722+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
723+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
724+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
725+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
726+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
727+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
728+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
729+
730+ 16. Limitation of Liability.
731+
732+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
733+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
734+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
735+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
736+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
737+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
738+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
739+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
740+SUCH DAMAGES.
741+
742+ 17. Interpretation of Sections 15 and 16.
743+
744+ If the disclaimer of warranty and limitation of liability provided
745+above cannot be given local legal effect according to their terms,
746+reviewing courts shall apply local law that most closely approximates
747+an absolute waiver of all civil liability in connection with the
748+Program, unless a warranty or assumption of liability accompanies a
749+copy of the Program in return for a fee.
750+
751+ END OF TERMS AND CONDITIONS
752+
753+ How to Apply These Terms to Your New Programs
754+
755+ If you develop a new program, and you want it to be of the greatest
756+possible use to the public, the best way to achieve this is to make it
757+free software which everyone can redistribute and change under these terms.
758+
759+ To do so, attach the following notices to the program. It is safest
760+to attach them to the start of each source file to most effectively
761+state the exclusion of warranty; and each file should have at least
762+the "copyright" line and a pointer to where the full notice is found.
763+
764+ <one line to give the program's name and a brief idea of what it does.>
765+ Copyright (C) <year> <name of author>
766+
767+ This program is free software: you can redistribute it and/or modify
768+ it under the terms of the GNU General Public License as published by
769+ the Free Software Foundation, either version 3 of the License, or
770+ (at your option) any later version.
771+
772+ This program is distributed in the hope that it will be useful,
773+ but WITHOUT ANY WARRANTY; without even the implied warranty of
774+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
775+ GNU General Public License for more details.
776+
777+ You should have received a copy of the GNU General Public License
778+ along with this program. If not, see <http://www.gnu.org/licenses/>.
779+
780+Also add information on how to contact you by electronic and paper mail.
781+
782+ If the program does terminal interaction, make it output a short
783+notice like this when it starts in an interactive mode:
784+
785+ <program> Copyright (C) <year> <name of author>
786+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
787+ This is free software, and you are welcome to redistribute it
788+ under certain conditions; type `show c' for details.
789+
790+The hypothetical commands `show w' and `show c' should show the appropriate
791+parts of the General Public License. Of course, your program's commands
792+might be different; for a GUI interface, you would use an "about box".
793+
794+ You should also get your employer (if you work as a programmer) or school,
795+if any, to sign a "copyright disclaimer" for the program, if necessary.
796+For more information on this, and how to apply and follow the GNU GPL, see
797+<http://www.gnu.org/licenses/>.
798+
799+ The GNU General Public License does not permit incorporating your program
800+into proprietary programs. If your program is a subroutine library, you
801+may consider it more useful to permit linking proprietary applications with
802+the library. If this is what you want to do, use the GNU Lesser General
803+Public License instead of this License. But first, please read
804+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
805
806=== renamed file 'COPYING' => 'COPYING.moved'
807=== added file 'README'
808--- README 1970-01-01 00:00:00 +0000
809+++ README 2015-01-23 02:36:47 +0000
810@@ -0,0 +1,11 @@
811+Weather app for Ubuntu devices
812+
813+To contribute:
814+ https://wiki.ubuntu.com/Touch/CoreApps/Weather
815+ https://wiki.ubuntu.com/Touch/CoreApps/DevelopmentGuide
816+
817+The following essential packages are required to develop this app:
818+- ubuntu-sdk (see http://developer.ubuntu.com/start)
819+- intltool - run the `sudo apt-get install intltool` command for installation
820+
821+See the debian/control file for an up-to-date list of dependencies
822
823=== renamed file 'README' => 'README.moved'
824=== added file 'README.translations'
825--- README.translations 1970-01-01 00:00:00 +0000
826+++ README.translations 2015-01-23 02:36:47 +0000
827@@ -0,0 +1,40 @@
828+# Updating translations
829+
830+Translations for the Weather app happen in [Launchpad Translations][] and
831+are automatically committed daily on the trunk branch in the po/ folder.
832+
833+They are then built and installed as part of the package build, so that
834+developers don't really need to worry about them.
835+
836+However, there is one task that needs to be taken care of: exposing new
837+translatable messages to translators. So whenever you add new translatable
838+messages in the code, make sure to follow these steps:
839+
840+ 1. Run click-buddy retaining the build directory:
841+ `click-buddy --dir . --no-clean`
842+ 2. Copy the .pot file from the <build dir> mentioned in the output to your
843+ original source:
844+ `cp <build dir>/po/*.pot po/`
845+ 3. Commit the generated .pot file:
846+ `bzr commit -m"Updated translation template"`
847+ 4. Push the branch and send a merge proposal as usual
848+
849+And that's it, once the branch lands Launchpad should take care of all the rest!
850+
851+# Behind the scenes
852+
853+Behind the scenes, whenever the po/*.pot file (also known as translations template)
854+is committed to trunk Launchpad reads it and updates the translatable strings
855+exposed in the web UI. This will enable translators to work on the new strings.
856+The translations template contains all translatable strings that have been
857+extracted from the source code files.
858+
859+Launchpad will then store translations in its database and will commit them daily
860+in the form of textual po/*.po files to trunk. The PO files are also usually
861+referred to as the translations files. You'll find a translation file for each
862+language the app has got at least a translated message available for.
863+
864+Translations for core apps follow the standard [gettext format].
865+
866+ [Launchpad Translations]: https://translations.launchpad.net/ubuntu-weather-app
867+ [gettext format]: https://www.gnu.org/software/gettext/
868
869=== renamed file 'README.translations' => 'README.translations.moved'
870=== added directory 'click'
871=== renamed directory 'click' => 'click.moved'
872=== added file 'click/CMakeLists.txt'
873--- click/CMakeLists.txt 1970-01-01 00:00:00 +0000
874+++ click/CMakeLists.txt 2015-01-23 02:36:47 +0000
875@@ -0,0 +1,15 @@
876+if(CLICK_MODE)
877+ if(NOT BZR_REVNO)
878+ set(BZR_REVNO "latest")
879+ endif(NOT BZR_REVNO)
880+ configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
881+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json weather.apparmor
882+ DESTINATION ${CMAKE_INSTALL_PREFIX})
883+
884+ # make the click files visible in qtcreator
885+ file(GLOB CLICK_FILES
886+ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
887+ *.json *.json.in *.apparmor)
888+
889+ add_custom_target(com_ubuntu_weather_CLICKFiles ALL SOURCES ${CLICK_FILES})
890+endif(CLICK_MODE)
891
892=== added file 'click/manifest.json.in'
893--- click/manifest.json.in 1970-01-01 00:00:00 +0000
894+++ click/manifest.json.in 2015-01-23 02:36:47 +0000
895@@ -0,0 +1,23 @@
896+{
897+ "architecture": "@CLICK_ARCH@",
898+ "description": "A weather forecast application for Ubuntu with support for multiple online weather data sources",
899+ "framework": "ubuntu-sdk-14.10",
900+ "hooks": {
901+ "weather": {
902+ "apparmor": "weather.apparmor",
903+ "desktop": "@DESKTOP_FILE@"
904+ }
905+ },
906+ "icon": "@ICON@",
907+ "maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>",
908+ "name": "@PROJECT_NAME@",
909+ "title": "Weather",
910+ "version": "2.0.@BZR_REVNO@",
911+ "x-source": {
912+ "vcs-bzr": "@BZR_SOURCE@",
913+ "vcs-bzr-revno": "@BZR_REVNO@"
914+ },
915+ "x-test": {
916+ "autopilot": "@AUTOPILOT_DIR@"
917+ }
918+}
919
920=== added file 'click/weather.apparmor'
921--- click/weather.apparmor 1970-01-01 00:00:00 +0000
922+++ click/weather.apparmor 2015-01-23 02:36:47 +0000
923@@ -0,0 +1,5 @@
924+{
925+ "policy_groups": ["networking"
926+ ],
927+ "policy_version": 1.2
928+}
929
930=== added file 'com.ubuntu.weather_weather.desktop.in.in'
931--- com.ubuntu.weather_weather.desktop.in.in 1970-01-01 00:00:00 +0000
932+++ com.ubuntu.weather_weather.desktop.in.in 2015-01-23 02:36:47 +0000
933@@ -0,0 +1,12 @@
934+[Desktop Entry]
935+Version=1.0
936+Type=Application
937+Terminal=false
938+Exec=@EXEC@
939+Icon=@ICON@
940+_Name=Weather
941+_Comment=A weather forecast application for Ubuntu with support for multiple online weather data sources
942+_Keywords=weather;forecast;twc;openweathermap;the weather channel;
943+X-Ubuntu-Touch=true
944+X-Ubuntu-Default-Department-ID=accessories
945+X-Ubuntu-Splash-Color=#F5F5F5
946
947=== renamed file 'com.ubuntu.weather_weather.desktop.in.in' => 'com.ubuntu.weather_weather.desktop.in.in.moved'
948=== added directory 'components'
949=== renamed directory 'components' => 'components.moved'
950=== added file 'components/CMakeLists.txt'
951--- components/CMakeLists.txt 1970-01-01 00:00:00 +0000
952+++ components/CMakeLists.txt 2015-01-23 02:36:47 +0000
953@@ -0,0 +1,2 @@
954+file(GLOB COMPONENTS_QML_JS_FILES *.qml *.js)
955+add_custom_target(ubuntu-weather-app_components_QMlFiles ALL SOURCES ${COMPONENTS_QML_JS_FILES})
956
957=== added directory 'plugins'
958=== renamed directory 'plugins' => 'plugins.moved'
959=== added file 'plugins/CMakeLists.txt'
960--- plugins/CMakeLists.txt 1970-01-01 00:00:00 +0000
961+++ plugins/CMakeLists.txt 2015-01-23 02:36:47 +0000
962@@ -0,0 +1,27 @@
963+include_directories(
964+ ${CMAKE_CURRENT_SOURCE_DIR}
965+)
966+
967+set(
968+ timeZone_SRCS
969+ TimeZone/timezone.cpp
970+ TimeZone/timezone_plugin.cpp
971+)
972+
973+#add_library(TimeZoneBackend MODULE
974+# ${timeZone_SRCS}
975+#)
976+#set_target_properties(TimeZoneBackend PROPERTIES
977+# LIBRARY_OUTPUT_DIRECTORY TimeZone)
978+
979+#qt5_use_modules(TimeZoneBackend Gui Qml Quick)
980+
981+# Copy qmldir file to build dir for running in QtCreator
982+#add_custom_target(TimeZoneBackend-qmldir ALL
983+# COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/TimeZone/qmldir ${CMAKE_CURRENT_BINARY_DIR}/TimeZone
984+# DEPENDS ${QML_JS_FILES}
985+#)
986+
987+# Install plugin file
988+#install(TARGETS TimeZoneBackend DESTINATION ${QT_IMPORTS_DIR}/qt5/qml/UbuntuWeather/TimeZone/)
989+#install(FILES TimeZone/qmldir DESTINATION ${QT_IMPORTS_DIR}/qt5/qml/UbuntuWeather/TimeZone/)
990
991=== added directory 'po'
992=== renamed directory 'po' => 'po.moved'
993=== added file 'po/CMakeLists.txt'
994--- po/CMakeLists.txt 1970-01-01 00:00:00 +0000
995+++ po/CMakeLists.txt 2015-01-23 02:36:47 +0000
996@@ -0,0 +1,33 @@
997+include(FindGettext)
998+find_program(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
999+
1000+set(DOMAIN ${PROJECT_NAME})
1001+set(POT_FILE ${DOMAIN}.pot)
1002+file(GLOB PO_FILES *.po)
1003+
1004+# Creates the .pot file containing the translations template
1005+add_custom_target(${POT_FILE} ALL
1006+ COMMENT "Generating translation template"
1007+ COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
1008+ --srcdir=${CMAKE_SOURCE_DIR} ${DESKTOP_FILE}.in.in
1009+ COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}
1010+ -D ${CMAKE_CURRENT_SOURCE_DIR}
1011+ -D ${CMAKE_CURRENT_BINARY_DIR}
1012+ --from-code=UTF-8
1013+ --c++ --qt --add-comments=TRANSLATORS
1014+ --keyword=tr --keyword=tr:1,2 --keyword=N_
1015+ --package-name='${APP_HARDCODE}'
1016+ --copyright-holder='Canonical Ltd.'
1017+ ${I18N_SRC_FILES}
1018+ COMMAND ${CMAKE_COMMAND} -E copy ${POT_FILE} ${CMAKE_CURRENT_SOURCE_DIR})
1019+
1020+# Builds the binary translations catalog for each language
1021+# it finds source translations (*.po) for
1022+foreach(PO_FILE ${PO_FILES})
1023+ get_filename_component(LANG ${PO_FILE} NAME_WE)
1024+ gettext_process_po_files(${LANG} ALL PO_FILES ${PO_FILE})
1025+ set(INSTALL_DIR ${CMAKE_INSTALL_LOCALEDIR}/${LANG}/LC_MESSAGES)
1026+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LANG}.gmo
1027+ DESTINATION ${INSTALL_DIR}
1028+ RENAME ${DOMAIN}.mo)
1029+endforeach(PO_FILE)
1030
1031=== added directory 'tests'
1032=== renamed directory 'tests' => 'tests.moved'
1033=== added file 'tests/CMakeLists.txt'
1034--- tests/CMakeLists.txt 1970-01-01 00:00:00 +0000
1035+++ tests/CMakeLists.txt 2015-01-23 02:36:47 +0000
1036@@ -0,0 +1,1 @@
1037+add_subdirectory(autopilot)
1038
1039=== added directory 'tests/autopilot'
1040=== added file 'tests/autopilot/CMakeLists.txt'
1041--- tests/autopilot/CMakeLists.txt 1970-01-01 00:00:00 +0000
1042+++ tests/autopilot/CMakeLists.txt 2015-01-23 02:36:47 +0000
1043@@ -0,0 +1,8 @@
1044+if(INSTALL_TESTS)
1045+execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
1046+ OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
1047+
1048+install(DIRECTORY ${AUTOPILOT_DIR}
1049+ DESTINATION ${PYTHON_PACKAGE_DIR}
1050+ )
1051+endif(INSTALL_TESTS)
1052
1053=== added directory 'tests/autopilot/ubuntu_weather_app'
1054=== added file 'ubuntu-weather-app.in'
1055--- ubuntu-weather-app.in 1970-01-01 00:00:00 +0000
1056+++ ubuntu-weather-app.in 2015-01-23 02:36:47 +0000
1057@@ -0,0 +1,3 @@
1058+#!/bin/bash
1059+export QT_SELECT=qt5
1060+exec qmlscene @CMAKE_INSTALL_PREFIX@/@DATA_DIR@/@MAIN_QML@
1061
1062=== renamed file 'ubuntu-weather-app.in' => 'ubuntu-weather-app.in.moved'
1063=== added file 'ubuntu-weather-app.qmlproject'
1064--- ubuntu-weather-app.qmlproject 1970-01-01 00:00:00 +0000
1065+++ ubuntu-weather-app.qmlproject 2015-01-23 02:36:47 +0000
1066@@ -0,0 +1,32 @@
1067+/* File generated by Qt Creator, version 2.6.1 */
1068+
1069+import QmlProject 1.1
1070+
1071+Project {
1072+ mainFile: "ubuntu-weather-app.qml"
1073+
1074+ /* Include .qml, .js, and image files from current directory and subdirectories */
1075+ QmlFiles {
1076+ directory: "."
1077+ }
1078+ JavaScriptFiles {
1079+ directory: "."
1080+ }
1081+ ImageFiles {
1082+ directory: "."
1083+ }
1084+ /* Shows the README files in the project view */
1085+ Files {
1086+ filter: "README*"
1087+ }
1088+ /* Shows the translation files and the .pro file used to generate the .pot template */
1089+ Files {
1090+ filter: "*.po*"
1091+ }
1092+ /* Shows the CMake files */
1093+ Files {
1094+ filter: "CMakeLists.txt"
1095+ }
1096+ /* List of plugin directories passed to QML runtime */
1097+ importPaths: [ "." ,"/usr/lib/x86_64-linux-gnu/qt5/qml" ]
1098+}
1099
1100=== renamed file 'ubuntu-weather-app.qmlproject' => 'ubuntu-weather-app.qmlproject.moved'
1101=== added file 'weather-app@30.png'
1102Binary files weather-app@30.png 1970-01-01 00:00:00 +0000 and weather-app@30.png 2015-01-23 02:36:47 +0000 differ
1103=== renamed file 'weather-app@30.png' => 'weather-app@30.png.moved'

Subscribers

People subscribed via source and target branches