From 7c855272f417d8f646b154373a2ed115812e219a Mon Sep 17 00:00:00 2001 From: pokkst Date: Fri, 10 Feb 2023 21:15:35 -0600 Subject: [PATCH] Update build instructions and other shit --- .gitignore | 1 - app/src/main/AndroidManifest.xml | 3 +-- build.gradle | 2 +- doc/BUILDING-external-libs.md | 13 ++++++------- external-libs/android32.Dockerfile | 4 ++-- external-libs/android32_x86.Dockerfile | 4 ++-- external-libs/android64.Dockerfile | 4 ++-- external-libs/android64_x86.Dockerfile | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 5 +++-- mynero.id | 0 10 files changed, 19 insertions(+), 21 deletions(-) create mode 100644 mynero.id diff --git a/.gitignore b/.gitignore index 5879a5a..3386632 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,3 @@ /app/alphaStagenet /app/prodStagenet /app/.cxx -/mynero.id diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3fea99b..0a6ebea 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/build.gradle b/build.gradle index 91380e1..3673219 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.0' + classpath 'com.android.tools.build:gradle:7.4.1' classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.2" } diff --git a/doc/BUILDING-external-libs.md b/doc/BUILDING-external-libs.md index 2c0a41d..9b59f55 100644 --- a/doc/BUILDING-external-libs.md +++ b/doc/BUILDING-external-libs.md @@ -4,22 +4,21 @@ 1. Docker -2. `make` (sudo apt install make, little tricky to get it on Windows, https://stackoverflow.com/questions/32127524/how-to-install-and-use-make-in-windows) +2. `sudo apt install make automake libtinfo5` 3. Huge amount of RAM and free disk space ## Building: -1. Clone https://github.com/pokkst/monero repo. +1. Clone the Monero repo required for this app to function. A specific fork for UTXO management is hosted here: http://git.mynero.i2p/pokkst/monero.git +Clone a specific branch, and shorten I2P download time with `git clone -b release-v0.18.1.2-mynero --single-branch --depth 1 http://git.mynero.i2p/pokkst/monero.git` -2. Change repo to correct branch (example: `git checkout release-v0.18.1.1-mynero`). +2. Update submodules: `git submodule update --init --force`. -3. Update submodules: `git submodule update --init --force`. - -4. Then go to folder with monero-wallet repo, then external-libs. Here you need to create symbol link to `monero` folder: +3. Then go to folder with monero-wallet repo, then external-libs. Here you need to create symbol link to `monero` folder: Linux: `ln -s ~/monero ~/monero-wallet/external-libs/monero` Windows: `mklink /D "C:\Users\\monero-wallet\external-libs\monero" "C:\Users\\monero"` -5. Start Docker and then run `make` in `external-libs` folder. It will fail at end on Windows, but if `wallet2_api.h` exists in `include` folder, the build was successful. +5. Start Docker and then run `sudo make` in `external-libs` folder. It will fail at end on Windows, but if `wallet2_api.h` exists in `include` folder, the build was successful. diff --git a/external-libs/android32.Dockerfile b/external-libs/android32.Dockerfile index 254f3a1..83d68a5 100644 --- a/external-libs/android32.Dockerfile +++ b/external-libs/android32.Dockerfile @@ -80,8 +80,8 @@ RUN set -x \ && ./b2 --build-type=minimal link=static runtime-link=static --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization --with-system --with-thread --with-locale --build-dir=android --stagedir=android toolset=clang threading=multi threadapi=pthread target-os=android -sICONV_PATH=${PREFIX} install -j${NPROC} # download, configure and make Zlib -ENV ZLIB_VERSION 1.2.12 -ENV ZLIB_HASH 91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9 +ENV ZLIB_VERSION 1.2.13 +ENV ZLIB_HASH b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30 RUN set -x \ && curl -O https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz \ && echo "${ZLIB_HASH} zlib-${ZLIB_VERSION}.tar.gz" | sha256sum -c \ diff --git a/external-libs/android32_x86.Dockerfile b/external-libs/android32_x86.Dockerfile index 76f2efe..f6207ec 100644 --- a/external-libs/android32_x86.Dockerfile +++ b/external-libs/android32_x86.Dockerfile @@ -80,8 +80,8 @@ RUN set -x \ && ./b2 --build-type=minimal link=static runtime-link=static --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization --with-system --with-thread --with-locale --build-dir=android --stagedir=android toolset=clang threading=multi threadapi=pthread target-os=android -sICONV_PATH=${PREFIX} install -j${NPROC} # download, configure and make Zlib -ENV ZLIB_VERSION 1.2.12 -ENV ZLIB_HASH 91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9 +ENV ZLIB_VERSION 1.2.13 +ENV ZLIB_HASH b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30 RUN set -x \ && curl -O https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz \ && echo "${ZLIB_HASH} zlib-${ZLIB_VERSION}.tar.gz" | sha256sum -c \ diff --git a/external-libs/android64.Dockerfile b/external-libs/android64.Dockerfile index 5e24fce..e48494c 100644 --- a/external-libs/android64.Dockerfile +++ b/external-libs/android64.Dockerfile @@ -80,8 +80,8 @@ RUN set -x \ && ./b2 --build-type=minimal link=static runtime-link=static --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization --with-system --with-thread --with-locale --build-dir=android --stagedir=android toolset=clang threading=multi threadapi=pthread target-os=android -sICONV_PATH=${PREFIX} install -j${NPROC} # download, configure and make Zlib -ENV ZLIB_VERSION 1.2.12 -ENV ZLIB_HASH 91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9 +ENV ZLIB_VERSION 1.2.13 +ENV ZLIB_HASH b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30 RUN set -x \ && curl -O https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz \ && echo "${ZLIB_HASH} zlib-${ZLIB_VERSION}.tar.gz" | sha256sum -c \ diff --git a/external-libs/android64_x86.Dockerfile b/external-libs/android64_x86.Dockerfile index 142fc3a..60328b1 100644 --- a/external-libs/android64_x86.Dockerfile +++ b/external-libs/android64_x86.Dockerfile @@ -80,8 +80,8 @@ RUN set -x \ && ./b2 --build-type=minimal link=static runtime-link=static --with-chrono --with-date_time --with-filesystem --with-program_options --with-regex --with-serialization --with-system --with-thread --with-locale --build-dir=android --stagedir=android toolset=clang threading=multi threadapi=pthread target-os=android -sICONV_PATH=${PREFIX} install -j${NPROC} # download, configure and make Zlib -ENV ZLIB_VERSION 1.2.12 -ENV ZLIB_HASH 91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9 +ENV ZLIB_VERSION 1.2.13 +ENV ZLIB_HASH b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30 RUN set -x \ && curl -O https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz \ && echo "${ZLIB_HASH} zlib-${ZLIB_VERSION}.tar.gz" | sha256sum -c \ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 669386b..c5f98ef 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Fri Feb 10 17:24:42 CST 2023 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/mynero.id b/mynero.id new file mode 100644 index 0000000..e69de29