Merge lp:~whosdaz/ubuntu-filemanager-app/gci6198315054006272 into lp:ubuntu-filemanager-app

Proposed by Matthew Allen
Status: Superseded
Proposed branch: lp:~whosdaz/ubuntu-filemanager-app/gci6198315054006272
Merge into: lp:ubuntu-filemanager-app
Diff against target: 447 lines (+237/-175)
4 files modified
README (+14/-169)
README.autopilot (+55/-0)
README.developers (+154/-0)
README.translations (+14/-6)
To merge this branch: bzr merge lp:~whosdaz/ubuntu-filemanager-app/gci6198315054006272
Reviewer Review Type Date Requested Status
Andrew Hayzen (community) Needs Fixing
Ubuntu File Manager Developers Pending
Review via email: mp+281280@code.launchpad.net

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

To post a comment you must log in.
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

This looks good so far, however for the other READMEs we have opted to use the markdown format, so to remain consistent with the other coreapps could this be updated? Also the web links should be in the format [title](url), you can use the weather mp [0] for reference. Sorry this should have been mentioned in the code-in task, but it hadn't been updated.

0 - https://code.launchpad.net/~emailgirishrawat/ubuntu-weather-app/markdown-readmes/+merge/280787

review: Needs Fixing
513. By Matthew Allen

Fixed Markdown Syntax

514. By Matthew Allen

Changed file extensions to .md

515. By Matthew Allen

Fixed minor syntax issues

Unmerged revisions

515. By Matthew Allen

Fixed minor syntax issues

514. By Matthew Allen

Changed file extensions to .md

513. By Matthew Allen

Fixed Markdown Syntax

512. By Matthew Allen

removed old readme text

511. By Matthew Allen

fixed readmes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'README'
--- README 2014-11-11 19:20:57 +0000
+++ README 2015-12-23 17:04:52 +0000
@@ -1,169 +1,14 @@
1# Ubuntu File Manager1ReadMe - Ubuntu Filemanager
22===========================
3File manager app for Ubuntu on the desktop and on mobile devices.3
44File Manager is a powerful but familiar tool for managing files. File Manager supports typical operations like cut/copy/paste and supports removable storage where available. File Manager makes effective use of space on small form factor devices, and expands to use more space on larger displays.
5## Building the app5
66File Manager is written in QML and C++ using the Ubuntu SDK and is licensed under the GPLv3.
7### For the desktop7
88Useful Links
9Install the following build dependencies:9============
1010
11 sudo apt-get install libtag1-dev libpam0g-dev python311Here are some useful links with regards to the Filemanager development.
1212
13Then open the CMakeLists.txt file in Qt Creator, and ensure that the kit13* [Home Page](https://developer.ubuntu.com/en/community/core-apps/file-manager/)
14selected on the left sidebar (just above the green "Run" button) is "Desktop"14* [Project Page](https://code.launchpad.net/ubuntu-filemanager-app)
15
16### For a device
17
18If you don't have one already, you'll need to create an armhf chroot to
19cross-compile the app (also do this if you have an older armhf chroot, for
20example 14.04 and current target is 14.10. You can first delete the old target
21and then create a current one). Here's how:
22
231. In Qt Creator, open the CMakeLists.txt file
242. Go to Tools > Options > Ubuntu > Click
252. Click on Create Click Target
263. Follow the prompts to generate the chroot. You will be asked for your sudo
27 password
284. Once created, you'll need to add the build dependencies for the app:
29 - Click on the Maintain button on your chroot
30 - On the terminal prompt that is started, type
31 apt-get install libtag1-dev:armhf libpam0g-dev:armhf python3
32 - Close the terminal when the installation finishes
335. Now you can either do a clean checkout and wait to be prompted by Qt Creator
34 to add the armhf kit, or alternatively:
356. Go to the Projects tab > Add kit and then select the UbuntuSDK armhf kit
36
37Additionally, you'll have to tell Qt Creator that you are doing a build for a
38device to ultimately create a click package for installation:
39
401. In Qt Creator, go to the Projects tab on the sidebar
412. Click on the "Build" subtab of the "UbuntuSDK for armhf..." tab
423. Then go to the "CMake arguments" text field and add "-DCLICK_MODE=on"
43 without the quotes
44
45Before starting the build make sure to select the "UbuntuSDK" kit on Qt
46Creator's left sidebar (just above the green "Run" button).
47
48### Doing the build
49
50Ensure you've selected the kit you want for your build and press the build
51button on Qt Creator's left sidebar (or alternatively Ctrl+B).
52
53## Running the app
54
55### On the desktop
56
57No additional steps are required before running the app on the desktop.
58
59You can pass two switches to run in phone or tablet mode from the desktop:
60
61-p for phone mode
62-t for tablet mode
63
64
65### On a device
66
67Due to Qt Creator's bug #1312094 in launchpad.net, there needs to be a manual
68workaround done before the app can run on the device:
69
701. Modify the desktop.in file: change the Exec line to read:
71 Exec=lib/arm-linux-gnueabihf/bin/@EXEC@
72
73Remember to revert this temporary change if you are building a click package or
74if you're making other changes to be committed to the code!
75
76### Starting the app
77
78Ensure you've selected the kit you want for your build and press the run
79button on Qt Creator's left sidebar (or alternatively Ctrl+R).
80
81If the app hasn't been built yet, or if there are pending changes that require
82a build, the app will automatically be built first before running.
83
84If you're starting the app on a device, the build will be copied over and the
85code will run unconfined.
86
87## Building a click package
88
89There are two alternative ways of building a click package.
90
91### Using Qt Creator
92
931. Ensure you've selected the UbuntuSDK for armhf kit on Qt Creator's sidebar
942. Click on Publish on the sidebar
953. Click on "Create package"
964. If all goes well, you'll find the final click package in the build directory
97
98Notes:
99- You can see the output of the click build if you click on Edit on the sidebar
100 and then "Application Output" at the bottom. This is useful to identify any
101 failures during the build
102- Run `sudo apt-get install click-reviewers-tools` to enable click package
103 validation in Qt Creator. You might need to restart Qt Creator after you've
104 installed them for it to detect them
105
106### Using click-buddy
107
1081. Install phablet-tools: `sudo apt-get install phablet-tools`
1092. Run click-buddy in your source tree:
110 click-buddy --dir . --arch armhf --framework ubuntu-sdk-14.04
1113. Once finished, click-buddy will tell you the location of your source package
112
113## Installing a click package
114
115First of all, ensure you've got a working Ubuntu device attached over USB to
116your host computer
117
118### Manually
119
120Run the following commands to manually install the click package (replace 0.5
121with the version of your package):
122
123 adb push com.ubuntu.filemanager_0.3.latest_armhf.click /home/phablet/
124 adb shell
125 sudo -H -u phablet pkcon install-local /home/phablet/com.ubuntu.filemanager_0.3_armhf.click
126
127### Using click-buddy
128
129You can add the --provision argument to the previous command to install the
130click package on the device.
131
132### Starting the app
133
1341. Either kill unity8 with `pkill unity8` or restart the system for the Apps
135 (click) scope to pick up your newly installed click package
1362. Search for Reminders in the Apps scope and tap on its icon to start it
1373. You'll find the runtime logs at ~/.cache/upstart/application-click/
138
139## Uninstalling a click package
140
141Run the following commands, replacing the version of the click package you want
142to uninstall:
143
144 adb shell
145 sudo -iu phablet
146 sudo click unregister com.ubuntu.filemanager 0.3
147
148## Run the autopilot tests
149
150Prerequisites:
151 sudo apt-get install ubuntu-ui-toolkit-autopilot
152
153Once the app has been built, you can go to the build directory and run:
154
155 cd tests/autopilot
156 autopilot3 run filemanager
157
158You can run filemanager in phone or tablet mode passing one of these two switches:
159
160-p for phone mode
161-t for tablet mode
162
163so:
164
165autopilot3 launch ../../src/app/filemanager -p
166
167will launch filemanager with autopilot in phone mode.
168
169
17015
=== added file 'README.autopilot'
--- README.autopilot 1970-01-01 00:00:00 +0000
+++ README.autopilot 2015-12-23 17:04:52 +0000
@@ -0,0 +1,55 @@
1Running Autopilot tests
2=======================
3
4Ubuntu Clock App follows a test driven development where autopilot tests are
5run before every merge into trunk. If you are submitting your bugfix/patch to
6the clock app, please follow the following steps below to ensure that all tests
7pass before proposing a merge request.
8
9If you are looking for more info about Autopilot or writing AP tests for the
10clock app, here are some useful links to help you:
11
12* (Quality - Ubuntu Developers)[http://developer.ubuntu.com/start/quality]
13* (Python Autopilot for 1.5.0)[https://developer.ubuntu.com/api/autopilot/python/1.5.0/]
14
15For help and options on running tests, [see here](https://developer.ubuntu.com/en/start/platform/guides/running-autopilot-tests/)
16
17Prerequisites
18=============
19
20Install the following autopilot packages required to run the tests,
21 $ sudo apt-get install python3-autopilot libautopilot-qt ubuntu-ui-toolkit-autopilot python3-autopilot-vis
22
23Running tests on the desktop
24============================
25
26Using terminal:
27
28* Branch the filemanager app code,
29 $ bzr branch lp:ubuntu-filemanager-app
30
31* Build the filemanager app as outlined in README.developers
32
33* Navigate to the tests/autopilot directory.
34 $ cd tests/autopilot
35
36* run all tests.
37 $ autopilot3 run -vv filemanager
38
39 to list all tests:
40 $ autopilot3 list filemanager
41
42
43Running tests on the desktop in phone or tablet mode
44====================================================
45
46You can run filemanager in phone or tablet mode passing one of these two switches:
47
48-p for phone mode
49-t for tablet mode
50
51so:
52
53 $ autopilot3 launch ../../src/app/filemanager -p
54
55will launch filemanager with autopilot in phone mode.
0\ No newline at end of file56\ No newline at end of file
157
=== added file 'README.developers'
--- README.developers 1970-01-01 00:00:00 +0000
+++ README.developers 2015-12-23 17:04:52 +0000
@@ -0,0 +1,154 @@
1ReadMe Developers - Ubuntu Filemanager
2===========================
3
4Building and running on Desktop
5===============================
6
7Obtain the source:
8
9 $ bzr branch lp:ubuntu-filemanager-app
10
11Install the following build dependencies:
12
13 $ sudo apt-get install libtag1-dev libpam0g-dev python3
14
15Then open the CMakeLists.txt file in Qt Creator, and ensure that the kit
16selected on the left sidebar (just above the green "Run" button) is "Desktop"
17
18# Starting the App
19
20No additional steps are required before running the app on the desktop.
21
22You can pass two switches to run in phone or tablet mode from the desktop:
23
24-p for phone mode
25-t for tablet mode
26
27Due to Qt Creator's bug #1312094 in launchpad.net, there needs to be a manual
28workaround done before the app can run on the device:
29
301. Modify the desktop.in file: change the Exec line to read:
31 Exec=lib/arm-linux-gnueabihf/bin/@EXEC@
32
33Remember to revert this temporary change if you are building a click package or
34if you're making other changes to be committed to the code!
35
36Building and running on a Device
37================================
38
39If you don't have one already, you'll need to create an armhf chroot to
40cross-compile the app (also do this if you have an older armhf chroot, for
41example 14.04 and current target is 14.10. You can first delete the old target
42and then create a current one). Here's how:
43
441. In Qt Creator, open the CMakeLists.txt file
452. Go to Tools > Options > Ubuntu > Click
462. Click on Create Click Target
473. Follow the prompts to generate the chroot. You will be asked for your sudo
48 password
494. Once created, you'll need to add the build dependencies for the app:
50 - Click on the Maintain button on your chroot
51 - On the terminal prompt that is started, type
52 apt-get install libtag1-dev:armhf libpam0g-dev:armhf python3
53 - Close the terminal when the installation finishes
545. Now you can either do a clean checkout and wait to be prompted by Qt Creator
55 to add the armhf kit, or alternatively:
566. Go to the Projects tab > Add kit and then select the UbuntuSDK armhf kit
57
58Additionally, you'll have to tell Qt Creator that you are doing a build for a
59device to ultimately create a click package for installation:
60
611. In Qt Creator, go to the Projects tab on the sidebar
622. Click on the "Build" subtab of the "UbuntuSDK for armhf..." tab
633. Then go to the "CMake arguments" text field and add "-DCLICK_MODE=on"
64 without the quotes
65
66Before starting the build make sure to select the "UbuntuSDK" kit on Qt
67Creator's left sidebar (just above the green "Run" button).
68
69Ensure you've selected the kit you want for your build and press the build
70button on Qt Creator's left sidebar (or alternatively Ctrl+B).
71
72# Starting the App
73
74Ensure you've selected the kit you want for your build and press the run
75button on Qt Creator's left sidebar (or alternatively Ctrl+R).
76
77If the app hasn't been built yet, or if there are pending changes that require
78a build, the app will automatically be built first before running.
79
80If you're starting the app on a device, the build will be copied over and the
81code will run unconfined.
82
83
84Building a click package
85========================
86
87There are two alternative ways of building a click package.
88
89### Using Qt Creator
90
911. Ensure you've selected the UbuntuSDK for armhf kit on Qt Creator's sidebar
922. Click on Publish on the sidebar
933. Click on "Create package"
944. If all goes well, you'll find the final click package in the build directory
95
96Notes:
97- You can see the output of the click build if you click on Edit on the sidebar
98 and then "Application Output" at the bottom. This is useful to identify any
99 failures during the build
100- Run `sudo apt-get install click-reviewers-tools` to enable click package
101 validation in Qt Creator. You might need to restart Qt Creator after you've
102 installed them for it to detect them
103
104### Using click-buddy
105
106 1. Install phablet-tools:
107
108 $ sudo apt-get install phablet-tools
109
110 2. Run click-buddy in your source tree:
111
112 $ click-buddy --dir . --arch armhf --framework ubuntu-sdk-14.04
113
114 3. Once finished, click-buddy will tell you the location of your source package
115
116### Installing a click package
117
118First of all, ensure you've got a working Ubuntu device attached over USB to
119your host computer
120
121#### Manually
122
123Run the following commands to manually install the click package (replace 0.5
124with the version of your package):
125
126 $ adb push com.ubuntu.filemanager_0.3.latest_armhf.click /home/phablet/
127 $ adb shell
128 $ sudo -H -u phablet pkcon install-local /home/phablet/com.ubuntu.filemanager_0.3_armhf.click
129
130#### Using click-buddy
131
132You can add the --provision argument to the previous command to install the
133click package on the device.
134
135### Starting the app
136
1371. Either kill unity8 with `pkill unity8` or restart the system for the Apps
138 (click) scope to pick up your newly installed click package
1392. Search for Reminders in the Apps scope and tap on its icon to start it
1403. You'll find the runtime logs at ~/.cache/upstart/application-click/
141
142### Uninstalling a click package
143
144Run the following commands, replacing the version of the click package you want
145to uninstall:
146
147 $ adb shell
148 $ sudo -iu phablet
149 $ sudo click unregister com.ubuntu.filemanager 0.3
150
151Running Tests
152=============
153
154Please check README.autopilot on how to run tests.
0\ No newline at end of file155\ No newline at end of file
1156
=== modified file 'README.translations'
--- README.translations 2014-08-16 07:04:04 +0000
+++ README.translations 2015-12-23 17:04:52 +0000
@@ -1,3 +1,6 @@
1ReadMe Translations - Ubuntu Filemanager
2===========================
3
1# Updating translations4# Updating translations
25
3Translations for the Filemanager app happen in [Launchpad Translations][] and6Translations for the Filemanager app happen in [Launchpad Translations][] and
@@ -10,10 +13,15 @@
10translatable messages to translators. So whenever you add new translatable13translatable messages to translators. So whenever you add new translatable
11messages in the code, make sure to follow these steps:14messages in the code, make sure to follow these steps:
1215
13 1. Run click-buddy retaining the build directory:16 1. Run click-buddy retaining the build directory:
14 `click-buddy --dir . --no-clean`17
15 2. Commit the generated .pot file: `bzr commit -m"Updated translation template"`18 $ click-buddy --dir . --no-clean
16 3. Push the branch and send a merge proposal as usual19
20 2. Commit the generated .pot file:
21
22 $ bzr commit -m"Updated translation template"
23
24 3. Push the branch and send a merge proposal as usual
1725
18And that's it, once the branch lands Launchpad should take care of all the rest!26And that's it, once the branch lands Launchpad should take care of all the rest!
1927
@@ -32,5 +40,5 @@
3240
33Translations for core apps follow the standard [gettext format].41Translations for core apps follow the standard [gettext format].
3442
35 [Launchpad Translations]: https://translations.launchpad.net/ubuntu-filemanager-app43 [Launchpad Translations](https://translations.launchpad.net/ubuntu-filemanager-app)
36 [gettext format]: https://www.gnu.org/software/gettext/44 [gettext format](https://www.gnu.org/software/gettext/)

Subscribers

People subscribed via source and target branches