Skip to content

Commit b79c424

Browse files
authored
Merge pull request #1946 from WalcoFPV/cordova
2 parents ea88084 + 4f93e54 commit b79c424

File tree

99 files changed

+9111
-3031
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+9111
-3031
lines changed

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ debug/
1313
release/
1414
testresults/
1515

16+
# Cordova
17+
cordova/www/
18+
cordova/platforms/
19+
cordova/plugins/
20+
cordova/resources/
21+
cordova/package-lock.json
22+
1623
# OSX
1724
.DS_store
1825

README.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,15 @@ Unstable testing versions of the lates builds of the configurator for most platf
4848

4949
**Be aware that these versions are intended for testing / feedback only, and may be buggy or broken, and can cause flight controller settings to be corrupted. Caution is advised when using these versions.**
5050

51-
## Native app build via NW.js
51+
## Native app build via NW.js (windows/linux/macos) or Cordova (android)
5252

5353
### Development
5454

5555
1. Install node.js (version 10 required)
5656
2. Install yarn: `npm install yarn -g`
57-
3. Change to project folder and run `yarn install`.
58-
4. Run `yarn start`.
57+
3. (For Android platform only) Install Java JDK 8, Gradle and Android Studio (Android SDK at least level 19)
58+
4. Change to project folder and run `yarn install`.
59+
5. Run `yarn start`.
5960

6061
### Running tests
6162

@@ -69,12 +70,14 @@ yarn gulp <taskname> [[platform] [platform] ...]
6970
```
7071

7172
List of possible values of `<task-name>`:
72-
* **dist** copies all the JS and CSS files in the `./dist` folder.
73+
* **dist** copies all the JS and CSS files in the `./dist` folder [2].
7374
* **apps** builds the apps in the `./apps` folder [1].
74-
* **debug** builds debug version of the apps in the `./debug` folder [1].
75+
* **debug** builds debug version of the apps in the `./debug` folder [1][3].
7576
* **release** zips up the apps into individual archives in the `./release` folder [1].
7677

7778
[1] Running this task on macOS or Linux requires Wine, since it's needed to set the icon for the Windows app (build for specific platform to avoid errors).
79+
[2] For Android platform, **dist** task will generate the `./cordova` folder
80+
[3] For Android platform, you need to configure an emulator or to plug an Android device with USB debugging enabled
7881

7982
#### Build or release app for one specific platform
8083
To build or release only for one specific platform you can append the plaform after the `task-name`.
@@ -84,6 +87,7 @@ If no platform is provided, all the platforms will be done in sequence.
8487
* **Linux** use `yarn gulp <task-name> --linux64`
8588
* **Windows** use `yarn gulp <task-name> --win32`
8689
* **ChromeOS** use `yarn gulp <task-name> --chromeos`
90+
* **Android** use `yarn gulp <task-name> --android`
8791

8892
You can also use multiple platforms e.g. `yarn gulp <taskname> --osx64 --linux64`.
8993

3.95 KB
Loading
1.58 KB
Loading
2.38 KB
Loading
5.78 KB
Loading
9.94 KB
Loading
14.9 KB
Loading
71.8 KB
Loading
38.3 KB
Loading

0 commit comments

Comments
 (0)