Skip to content

Commit acc3d21

Browse files
committed
Improve formatting and phrasing
1 parent 866aab0 commit acc3d21

File tree

2 files changed

+57
-57
lines changed

2 files changed

+57
-57
lines changed

main/docs/technical/build-osmand/how-to-compile-the-ios-version.md

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,22 @@ sidebar_position: 6
44

55
# How to Compile the iOS Version
66

7-
1. First setup the **[development environment](setup-the-dev-environment.md)**.
8-
2. Install Xcode from AppStore (Last tested 14.2)
9-
3. Install Xcode command-line tools
7+
1. Setup the **[development environment](setup-the-dev-environment.md)**
8+
2. Install Xcode from the App Store (the last tested version is `14.2`)
9+
3. Install Command Line Tools for Xcode
1010
```
1111
$ xcode-select --install
1212
```
13-
Or in case of errors try to download and install it from Apple site: <https://developer.apple.com/download/all/?q=xcode>.
13+
Orin case of an error—try to download and install it from Apple's website: <https://developer.apple.com/download/all/?q=xcode>.
1414

1515
4. Log in into Xcode account (optional)
16-
In case if you don't have Apple Developer account. Open Xcode and go to preferences (via top menu)
17-
```
18-
Preferences -> Accounts
19-
```
20-
Press `+` button. You can log in with your AppleID (login and password from your iOS/macOS devices). Follow Xcode instructions.
21-
For OsmAnd team members: send your AppleID login, so you will be added to to developers list. When you'll get email with invite message activate it.
22-
Close Xcode.
16+
In case you don't have Apple Developer account.
17+
1. Open Xcode and go to _Preferences_ -> _Accounts_ (via the top menu)
18+
2. Press the `+` button. You can log in with your Apple ID (login and password from your iOS/macOS devices). Follow Xcode instructions.
19+
3. _For OsmAnd team members:_ send your Apple ID login, so you will be added to the list of developers. You'll get email with an invite message—activate it.
20+
4. Close Xcode.
2321

24-
5. Install command-line tools- cmake, svn, cocoapods
22+
5. Install command-line tools: `cmake`, `svn`, `cocoapods`
2523
```
2624
$ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
2725
$ brew install svn
@@ -33,51 +31,53 @@ sidebar_position: 6
3331
# for m1
3432
$ brew install cocoapods
3533
```
36-
6. Download and instal Java jdk 17
34+
35+
6. Download and install Java JDK 17
3736
```
38-
# for intel
37+
# For Intel-based Macs
3938
https://download.oracle.com/java/17/archive/jdk-17.0.11_macos-x64_bin.dmg
4039
41-
# for m1
40+
# For Apple silicon Macs
4241
https://download.oracle.com/java/17/archive/jdk-17.0.11_macos-aarch64_bin.dmg
4342
```
4443

45-
7. Create new text file. Or update if it exist.
44+
7. Create a new text file or update if it exists
4645
```
4746
$ mkdir ~/.gradle
4847
$ nano ~/.gradle/gradle.properties
4948
```
5049

51-
Paste this content into it. Save file and restart computer.
50+
1. Paste this content into it:
51+
```
52+
## Project-wide Gradle settings.
53+
#
54+
# For more details on how to configure your build environment visit
55+
# http://www.gradle.org/docs/current/userguide/build_environment.html
56+
#
57+
# Specifies the JVM arguments used for the daemon process.
58+
# The setting is particularly useful for tweaking memory settings.
59+
# Default value: -Xmx10248m -XX:MaxMetaspaceSize=256m
60+
# org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
5261
53-
```
54-
## Project-wide Gradle settings.
55-
#
56-
# For more details on how to configure your build environment visit
57-
# http://www.gradle.org/docs/current/userguide/build_environment.html
58-
#
59-
# Specifies the JVM arguments used for the daemon process.
60-
# The setting is particularly useful for tweaking memory settings.
61-
# Default value: -Xmx10248m -XX:MaxMetaspaceSize=256m
62-
# org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
63-
64-
org.gradle.daemon=true
65-
66-
org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
67-
68-
#
69-
# When configured, Gradle will run in incubating parallel mode.
70-
# This option should only be used with decoupled projects. More details, visit
71-
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
72-
73-
org.gradle.parallel=true
74-
org.gradle.caching=true
75-
76-
#Fri Apr 08 18:47:31 EEST 2016
77-
# android.useDeprecatedNdk=true
78-
```
62+
org.gradle.daemon=true
63+
64+
org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
65+
66+
#
67+
# When configured, Gradle will run in incubating parallel mode.
68+
# This option should only be used with decoupled projects. More details, visit
69+
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
70+
71+
org.gradle.parallel=true
72+
org.gradle.caching=true
73+
74+
#Fri Apr 08 18:47:31 EEST 2016
75+
# android.useDeprecatedNdk=true
76+
```
77+
2. Save the file
78+
3. Restart the computer
7979
80-
8. Run `prepare.sh` to compile Qt library and download external dependencies
80+
8. Run `prepare.sh` to compile the Qt library and download external dependencies
8181
```
8282
$ cd ios
8383
$ ./prepare.sh

main/docs/technical/build-osmand/setup-the-dev-environment.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ sidebar_position: 4
55
# How to Setup the Development Environment
66

77

8-
To setup the development environment, you need to install the [repo utility](https://source.android.com/setup/develop#repo) and use the following [repo manifest](https://github.com/osmandapp/OsmAnd-manifest/blob/master/readonly.xml) or [any other configuration](https://github.com/osmandapp/OsmAnd-manifest).
8+
To setup the development environment, you need to install the [`repo` utility](https://source.android.com/setup/develop#repo) and use the following [`repo` manifest](https://github.com/osmandapp/OsmAnd-manifest/blob/master/readonly.xml) or [any other configuration](https://github.com/osmandapp/OsmAnd-manifest).
99

1010

1111
If you plan to use the `readonly.xml` and the `repo` utility you can run the following:
@@ -15,27 +15,27 @@ repo init -u https://github.com/osmandapp/OsmAnd-manifest -m readonly.xml
1515
repo sync
1616
```
1717

18-
You can also use just git and checkout the following git repositories to correct folder names:
19-
* Folder **android** - **[Osmand](https://github.com/osmandapp/Osmand.git)**
18+
You can also use just `git` and checkout the following `git` repositories to their correct folder names:
19+
* Folder `android` **[Osmand](https://github.com/osmandapp/Osmand.git)**
2020
* ```git clone https://github.com/osmandapp/Osmand.git android```
21-
* Folder **ios** - **[OsmAnd-ios](https://github.com/osmandapp/OsmAnd-ios.git)**
21+
* Folder `ios` **[OsmAnd-ios](https://github.com/osmandapp/OsmAnd-ios.git)**
2222
* ```git clone https://github.com/osmandapp/OsmAnd-ios.git ios```
23-
* Folder **resources** - **[OsmAnd-resources](https://github.com/osmandapp/OsmAnd-resources.git)**
23+
* Folder `resources` **[OsmAnd-resources](https://github.com/osmandapp/OsmAnd-resources.git)**
2424
* ```git clone https://github.com/osmandapp/OsmAnd-resources.git resources```
25-
* Folder **core** - **[OsmAnd-core](https://github.com/osmandapp/OsmAnd-core.git)**
25+
* Folder `core` **[OsmAnd-core](https://github.com/osmandapp/OsmAnd-core.git)**
2626
* ```git clone https://github.com/osmandapp/OsmAnd-core.git core```
27-
* Folder **help** - **[osmandapp.github.io](https://github.com/osmandapp/osmandapp.github.io.git)**
27+
* Folder `help` **[osmandapp.github.io](https://github.com/osmandapp/osmandapp.github.io.git)**
2828
* ```git clone https://github.com/osmandapp/osmandapp.github.io.git help```
29-
* Folder **core-legacy** - **[OsmAnd-core-legacy](https://github.com/osmandapp/OsmAnd-core-legacy.git)**
29+
* Folder `core-legacy` **[OsmAnd-core-legacy](https://github.com/osmandapp/OsmAnd-core-legacy.git)**
3030
* ```git clone https://github.com/osmandapp/OsmAnd-core-legacy.git core-legacy```
31-
* Folder **build** - **[OsmAnd-build](https://github.com/osmandapp/OsmAnd-build.git)**
31+
* Folder `build` **[OsmAnd-build](https://github.com/osmandapp/OsmAnd-build.git)**
3232
* ```git clone https://github.com/osmandapp/OsmAnd-build.git build```
33-
* Folder **tools** - **[OsmAnd-tools](https://github.com/osmandapp/OsmAnd-tools.git)** (servers, map creation)
33+
* Folder `tools` **[OsmAnd-tools](https://github.com/osmandapp/OsmAnd-tools.git)** (servers, map creation)
3434
* ```git clone https://github.com/osmandapp/OsmAnd-tools.git tools```
35-
* Folder **web** - **[web](https://github.com/osmandapp/web.git)** (web-only)
35+
* Folder `web` **[web](https://github.com/osmandapp/web.git)** (web-only)
3636
* ```git clone https://github.com/osmandapp/web.git web```
37-
* Folder **misc** - **[OsmAnd-misc](https://github.com/osmandapp/OsmAnd-misc.git)** (standalone utilities)
37+
* Folder `misc` **[OsmAnd-misc](https://github.com/osmandapp/OsmAnd-misc.git)** (standalone utilities)
3838
* ```git clone https://github.com/osmandapp/OsmAnd-misc.git misc```
3939

4040

41-
You might not need all repositories to get tools / android or ios working. You can always double check corresponding branches in [repo-configurations](https://github.com/osmandapp/OsmAnd-manifest).
41+
You might not need all repositories to get `tools`, `android` or `ios` working, just the ones described in the [`OsmAnd-manifest`](https://github.com/osmandapp/OsmAnd-manifest) `.xml` files.

0 commit comments

Comments
 (0)