diff --git a/WindowsInstaller/Install Files/AppData/settings.json b/WindowsInstaller/Install Files/AppData/settings.json index 088afef42..0d66e4e8b 100755 --- a/WindowsInstaller/Install Files/AppData/settings.json +++ b/WindowsInstaller/Install Files/AppData/settings.json @@ -1,3 +1,4 @@ { - "apiDocumentationEnabled": true + "apiDocumentationEnabled": true, + "apiWhitelistEnabled": false } diff --git a/WindowsInstaller/Nice-Qortal-Logo-crop.bmp b/WindowsInstaller/Nice-Qortal-Logo-crop.bmp new file mode 100644 index 000000000..0b9f457b7 Binary files /dev/null and b/WindowsInstaller/Nice-Qortal-Logo-crop.bmp differ diff --git a/WindowsInstaller/Nice-Qortal-Logo-crop.png b/WindowsInstaller/Nice-Qortal-Logo-crop.png new file mode 100644 index 000000000..0cea3c922 Binary files /dev/null and b/WindowsInstaller/Nice-Qortal-Logo-crop.png differ diff --git a/WindowsInstaller/Qortal.aip b/WindowsInstaller/Qortal.aip index 1b0c944b5..a3dbd88a4 100755 --- a/WindowsInstaller/Qortal.aip +++ b/WindowsInstaller/Qortal.aip @@ -4,10 +4,12 @@ - - + + + + @@ -16,19 +18,22 @@ - + + + + + - + - + - - + @@ -40,6 +45,7 @@ + @@ -133,232 +139,239 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + @@ -368,497 +381,505 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -869,8 +890,11 @@ + + + - + @@ -899,19 +923,19 @@ - - - - - + + + + + + - + - - - + + @@ -941,175 +965,76 @@ + + + + + + + + - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -1129,6 +1054,7 @@ + @@ -1145,6 +1071,8 @@ + + @@ -1162,6 +1090,7 @@ + @@ -1180,11 +1109,6 @@ - - - - - @@ -1195,15 +1119,20 @@ + + + + + @@ -1217,7 +1146,7 @@ - + @@ -1239,6 +1168,7 @@ + @@ -1279,9 +1209,15 @@ - + + + + + + + @@ -1297,13 +1233,6 @@ - - - - - - - @@ -1327,86 +1256,87 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1428,12 +1358,12 @@ - + - + @@ -1462,6 +1392,8 @@ + + @@ -1469,7 +1401,7 @@ - + @@ -1477,6 +1409,8 @@ + + @@ -1491,15 +1425,13 @@ - - - - - - + + + + @@ -1508,6 +1440,7 @@ + @@ -1559,8 +1492,11 @@ + + + - + diff --git a/WindowsInstaller/README.md b/WindowsInstaller/README.md index 29a7b64a0..4431564e4 100644 --- a/WindowsInstaller/README.md +++ b/WindowsInstaller/README.md @@ -2,7 +2,9 @@ ## Prerequisites -* AdvancedInstaller v19.4 or better, and enterprise licence if translations are required +* AdvancedInstaller v19.4 or better, and enterprise licence. +* Qortal has an open source license, however it currently (as of December 2024) only supports up to version 19. (We may need to reach out to Advanced Installer again to obtain a new license at some point, if needed. +* Reach out to @crowetic for links to the installer install files, and license. * Installed AdoptOpenJDK v17 64bit, full JDK *not* JRE ## General build instructions @@ -10,6 +12,12 @@ If this is your first time opening the `qortal.aip` file then you might need to adjust configured paths, or create a dummy `D:` drive with the expected layout. +Opening the aip file from within a clone of the qortal repo also works, if you have a separate windows machine setup to do the build. + +You May need to change the location of the 'jre64' files inside Advanced Installer, if it is set to a path that your build machine doesn't have. + +The Java Memory Arguments can be set manually, but as of December 2024 they have been reset back to system defaults. This should include G1GC Garbage Collector. + Typical build procedure: * Place the `qortal.jar` file in `Install-Files\`