From ac6b3304a998fee4950ad0660d85487a5a686321 Mon Sep 17 00:00:00 2001 From: Medley <198984680+maplemedley@users.noreply.github.com> Date: Tue, 18 Feb 2025 12:43:38 +0100 Subject: [PATCH 1/7] Add info about building on Windows --- doc/android.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/doc/android.md b/doc/android.md index 353a7d1c8..078aaa3ba 100644 --- a/doc/android.md +++ b/doc/android.md @@ -92,11 +92,13 @@ Additionally, you'll need to have an Internet connection available on the build system, as the Android build will download some source packages. ## Build + The new build system Luanti Android is fully functional and is designed to speed up and simplify the work, as well as adding the possibility of cross-platform build. + You can use `./gradlew assemblerelease` or `./gradlew assembledebug` from the -command line or use Android Studio and click the build button. +command line or use Android Studio and click the build button. When using gradlew, the newest NDK will be downloaded and installed automatically. Or you can create a `local.properties` file and specify @@ -112,3 +114,9 @@ automatically. Or you can create a `local.properties` file and specify > key.store= > key.alias=Minetest + +* To build on Windows, you might need the external unix dependency [gettext](https://www.gnu.org/software/gettext/) (Also available through [scoop](https://scoop.sh/), + for easier installation). Additionally, the `gradle` command can be used instead of `gradlew`. + + + From e995127bac864ba996299bb78044bced433f8a5f Mon Sep 17 00:00:00 2001 From: Medley <198984680+maplemedley@users.noreply.github.com> Date: Tue, 18 Feb 2025 12:46:47 +0100 Subject: [PATCH 2/7] Improve wording on gradle command note --- doc/android.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/android.md b/doc/android.md index 078aaa3ba..4eebc6a76 100644 --- a/doc/android.md +++ b/doc/android.md @@ -116,7 +116,7 @@ automatically. Or you can create a `local.properties` file and specify > key.alias=Minetest * To build on Windows, you might need the external unix dependency [gettext](https://www.gnu.org/software/gettext/) (Also available through [scoop](https://scoop.sh/), - for easier installation). Additionally, the `gradle` command can be used instead of `gradlew`. + for easier installation). Additionally, if the `gradlew` command is missing, `gradle wrapper` or `gradle` can be used. From 3a0ea8ac13e761e3618964ae365498046e55b13e Mon Sep 17 00:00:00 2001 From: Medley <198984680+maplemedley@users.noreply.github.com> Date: Tue, 18 Feb 2025 13:49:19 +0100 Subject: [PATCH 3/7] Add link to documentation article --- doc/android.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/android.md b/doc/android.md index 4eebc6a76..b45a000e6 100644 --- a/doc/android.md +++ b/doc/android.md @@ -93,6 +93,8 @@ build system, as the Android build will download some source packages. ## Build +_The following is a summary, the full compilation documentation can be found in the Luanti Documentation article, [Compiling Luanti for Android](https://docs.luanti.org/compiling/android/)._ + The new build system Luanti Android is fully functional and is designed to speed up and simplify the work, as well as adding the possibility of cross-platform build. From dfc8e281e6347bc712f9cc249a4c0bbae742b2f2 Mon Sep 17 00:00:00 2001 From: Medley <198984680+maplemedley@users.noreply.github.com> Date: Tue, 18 Feb 2025 13:52:26 +0100 Subject: [PATCH 4/7] Change formatting, add information on program sourcing Adding information about Scoop to have it documented that those sources work, as I haven't documented that installing it directly works, and don't know what might need to be changed if one does it that way. --- doc/android.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/android.md b/doc/android.md index b45a000e6..15fc09d28 100644 --- a/doc/android.md +++ b/doc/android.md @@ -117,8 +117,9 @@ automatically. Or you can create a `local.properties` file and specify > key.store= > key.alias=Minetest -* To build on Windows, you might need the external unix dependency [gettext](https://www.gnu.org/software/gettext/) (Also available through [scoop](https://scoop.sh/), - for easier installation). Additionally, if the `gradlew` command is missing, `gradle wrapper` or `gradle` can be used. +* To build on Windows, you might need the external unix dependency [gettext](https://www.gnu.org/software/gettext/). + +* To build on Windows, both Gradle and Gettext can be installed through [scoop](https://scoop.sh/) for easier installation Additionally. Additionally, if the `gradlew` command is missing, `gradle` or its subcommand `gradle wrapper` can be used. From 5e2731f9336abc970ff26b125acfedc8ddcfdd38 Mon Sep 17 00:00:00 2001 From: Medley <198984680+maplemedley@users.noreply.github.com> Date: Tue, 18 Feb 2025 13:54:29 +0100 Subject: [PATCH 5/7] Fix typo, change order to reduce confusion Moved the gradlew comment away from the scoop installation comment, as it is not suggesting to install `gradlew` from scoop, which isn't a package. --- doc/android.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/android.md b/doc/android.md index 15fc09d28..941697c2a 100644 --- a/doc/android.md +++ b/doc/android.md @@ -117,9 +117,9 @@ automatically. Or you can create a `local.properties` file and specify > key.store= > key.alias=Minetest -* To build on Windows, you might need the external unix dependency [gettext](https://www.gnu.org/software/gettext/). +* To build on Windows, you might need the external unix dependency [gettext](https://www.gnu.org/software/gettext/). Additionally, if the `gradlew` command is missing, `gradle` or its subcommand `gradle wrapper` can be used. -* To build on Windows, both Gradle and Gettext can be installed through [scoop](https://scoop.sh/) for easier installation Additionally. Additionally, if the `gradlew` command is missing, `gradle` or its subcommand `gradle wrapper` can be used. +* When building for Windows, both Gradle and Gettext can be installed and set up by [scoop](https://scoop.sh/) for easier installation. From ec6c90dc93c14b31d985fb333a4b86fb4a3a698e Mon Sep 17 00:00:00 2001 From: Medley <198984680+maplemedley@users.noreply.github.com> Date: Tue, 18 Feb 2025 14:09:24 +0100 Subject: [PATCH 6/7] Merge the points into a single consice point This wording is the same as in my PR for the proper docs: https://github.com/luanti-org/dev.luanti.org/pull/193 --- doc/android.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/android.md b/doc/android.md index 941697c2a..e0817617c 100644 --- a/doc/android.md +++ b/doc/android.md @@ -117,9 +117,8 @@ automatically. Or you can create a `local.properties` file and specify > key.store= > key.alias=Minetest -* To build on Windows, you might need the external unix dependency [gettext](https://www.gnu.org/software/gettext/). Additionally, if the `gradlew` command is missing, `gradle` or its subcommand `gradle wrapper` can be used. +* If you're compiling on Windows, you can use the `gradle` command, so long as you install the additional Unix dependency [gettext](https://www.gnu.org/software/gettext/). Both of these are verified to work when installed by [Scoop](https://scoop.sh). -* When building for Windows, both Gradle and Gettext can be installed and set up by [scoop](https://scoop.sh/) for easier installation. From a0fd60c5d5fc3d8d48437c5fbb50be2242759b29 Mon Sep 17 00:00:00 2001 From: Medley <198984680+maplemedley@users.noreply.github.com> Date: Wed, 19 Feb 2025 13:39:59 +0100 Subject: [PATCH 7/7] Remove trailing whitespace --- doc/android.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/doc/android.md b/doc/android.md index e0817617c..9e49903be 100644 --- a/doc/android.md +++ b/doc/android.md @@ -100,7 +100,7 @@ speed up and simplify the work, as well as adding the possibility of cross-platform build. You can use `./gradlew assemblerelease` or `./gradlew assembledebug` from the -command line or use Android Studio and click the build button. +command line or use Android Studio and click the build button. When using gradlew, the newest NDK will be downloaded and installed automatically. Or you can create a `local.properties` file and specify @@ -118,7 +118,3 @@ automatically. Or you can create a `local.properties` file and specify > key.alias=Minetest * If you're compiling on Windows, you can use the `gradle` command, so long as you install the additional Unix dependency [gettext](https://www.gnu.org/software/gettext/). Both of these are verified to work when installed by [Scoop](https://scoop.sh). - - - -