From 9cb120f6faab8426849a6a9d00f11f153c40f39f Mon Sep 17 00:00:00 2001 From: woodser Date: Sat, 9 Mar 2024 07:17:58 -0500 Subject: [PATCH] update instructions to use jdk 21 and wix 3.14 --- desktop/package/README.md | 4 ++-- docs/installing.md | 23 +++++++++++------------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/desktop/package/README.md b/desktop/package/README.md index 454650ff59..a6b8376f4d 100644 --- a/desktop/package/README.md +++ b/desktop/package/README.md @@ -40,9 +40,9 @@ Haveno data folder on Mac: `/Users//Library/Application Support/Haveno 6. Click "OK" to save the changes and exit the dialog box. 7. Windows will download and install the required files and components to enable the .NET Framework 3.5. This may take several minutes, depending on your internet connection speed and system configuration. 8. Once the installation is complete, you will need to restart your computer to apply the changes. -2. Install Wix Toolset 3: https://github.com/wixtoolset/wix3/releases/tag/wix3112rtm +2. Install Wix Toolset 3: https://github.com/wixtoolset/wix3/releases/tag/wix314rtm 3. Open MSYS2 for the following commands. -4. `export PATH=$PATH:$JAVA_HOME/bin:"C:\Program Files (x86)\WiX Toolset v3.11\bin"` +4. `export PATH=$PATH:$JAVA_HOME/bin:"C:\Program Files (x86)\WiX Toolset v3.14\bin"` 5. `./gradlew packageInstallers` 6. Confirm prompts. 7. Path to installer printed at end. Execute to install. diff --git a/docs/installing.md b/docs/installing.md index 63bd1dcde1..f31a16c22a 100644 --- a/docs/installing.md +++ b/docs/installing.md @@ -2,28 +2,27 @@ These are the steps needed to build Haveno and test it on our test network or locally. -## Install dependencies (requires Java JDK 11) +## Install dependencies -On Ubuntu: +On Linux and macOS, install Java JDK 21: - 1. `sudo apt install make wget git openjdk-17-jdk`. - 2. If `echo $JAVA_HOME` does not print the path to JDK 17, then `export JAVA_HOME=/path/to/jdk` (e.g. `export JAVA_HOME=/usr/lib/jvm/java-17-openjdk`). +``` +curl -s "https://get.sdkman.io" | bash +sdk install java 21.0.2.fx-librca +``` -On Mac: - 1. Download and install [Java JDK 11](https://adoptium.net/temurin/archive/?version=11). - 2. `export JAVA_HOME=/Library/Java/JavaVirtualMachines/temurin-11.jdk/Contents/Home` +On Windows, install MSYS2 and Java JDK 21: -On Windows: - - 1. Download [Java JDK 17](https://adoptium.net/temurin/archive/?version=17). During installation, enable the option to set the $JAVA_HOME environment variable. - 2. Install [MSYS2](https://www.msys2.org/). - 3. Start MSYS2 MINGW64 or MSYS MINGW32 depending on your system. Use MSYS2 for all commands throughout this document. + 1. Install [MSYS2](https://www.msys2.org/). + 2. Start MSYS2 MINGW64 or MSYS MINGW32 depending on your system. Use MSYS2 for all commands throughout this document. 4. Update pacman: `pacman -Syy` 5. Install dependencies. During installation, use default=all by leaving the input blank and pressing enter. 64-bit: `pacman -S mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake git` 32-bit: `pacman -S mingw-w64-i686-toolchain make mingw-w64-i686-cmake git` + 6. `curl -s "https://get.sdkman.io" | bash` + 7. `sdk install java 21.0.2.fx-librca` ## Build Haveno