Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated to latest JRE, increased max memory and updated docs to reflect the changes #1115

Merged
merged 3 commits into from
Jun 24, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,17 +111,17 @@ Once the code is cloned into a folder (e.g. `droid`), executing `mvn clean insta

### Linux / OSX users

You will need JAVA 8 to 11 installed to run DROID.
You will need JAVA 8 to 17 installed to run DROID.

Unpack the archive `droid-binary-${VERSION}-bin-unix.zip`, then use the `droid.sh` script to run the application.
Unpack the archive `droid-binary-${VERSION}-bin.zip`, then use the `droid.sh` script to run the application.

### Windows users
Archive `droid-binary-${VERSION}-bin-win64-with-jre.zip`


You will need JAVA 8 to 11 installed to run DROID. For Windows users who might not be able to install JAVA, the provided bundle includes JAVA 11.
You will need JAVA 8 to 17 installed to run DROID. For Windows users who might not be able to install JAVA, the provided bundle includes JAVA 17.

Unpack the archive `droid-binary-${VERSION}-bin-win32-with-jre.zip`, then use the `droid.bat` script to run the application.
Unpack the archive `droid-binary-${VERSION}-bin-win64-with-jre.zip`, then use the `droid.bat` script to run the application.

## Signatures

Expand Down
6 changes: 3 additions & 3 deletions droid-binary/bin/droid.bat
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,14 @@ REM ---------------
REM This is the maximum memory DROID can use in megabytes.
REM Remove the "REM " from the line below and set the maximum memory after the "=".
REM Also configure this property using the environment variable: droidMemory.
REM SET droidMemory=512
REM SET droidMemory=1024



REM Assemble options
REM ================
REM Default to using 512 megabytes of memory if no other settings provided:
SET DROID_OPTIONS="-Xmx512m"
REM Default to using 1024 megabytes of memory if no other settings provided:
SET DROID_OPTIONS="-Xmx1024m"

IF "%droidMemory%"=="" GOTO UserDir
SET DROID_OPTIONS="-Xmx%droidMemory%m"
Expand Down
2 changes: 1 addition & 1 deletion droid-binary/bin/droid.sh
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ logLevel=""
# Max memory: droidMemory
# -----------------------
# The maximum memory for DROID to use in megabytes.
droidMemory="512m"
droidMemory="1024m"


# Run DROID:
Expand Down
6 changes: 3 additions & 3 deletions droid-binary/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</goals>
<configuration>
<!-- To update, retrieve link for 64 bit Windows jre from https://adoptium.net -->
<url>https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.9%2B9.1/OpenJDK17U-jre_x64_windows_hotspot_17.0.9_9.zip</url>
<url>https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_x64_windows_hotspot_17.0.11_9.zip</url>
<unpack>false</unpack>
<outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
Expand All @@ -55,9 +55,9 @@
<configuration>
<target>
<!-- Update binary from https://adoptopenjdk.net/releases.html -->
<unzip dest="${project.build.directory}/jre_tmp/" src="${project.build.directory}/OpenJDK17U-jre_x64_windows_hotspot_17.0.9_9.zip" />
<unzip dest="${project.build.directory}/jre_tmp/" src="${project.build.directory}/OpenJDK17U-jre_x64_windows_hotspot_17.0.11_9.zip" />
<move todir="${project.build.directory}/jre-windows/">
<fileset dir="${project.build.directory}/jre_tmp/jdk-17.0.9+9-jre/">
<fileset dir="${project.build.directory}/jre_tmp/jdk-17.0.11+9-jre/">
<include name="**/*" />
</fileset>
</move>
Expand Down
2 changes: 1 addition & 1 deletion droid-help/src/main/resources/Web pages/FAQ.html
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ <h3>
<a id="JavaVersion" name="JavaVersion">What</a> version of Java do I need?
</h3>
<p>
If you are on Windows, a package is provided which also includes JRE with the droid binary. To use the version without Java bundled, you will need to have Java 8 to 12 installed on your machine in order to run DROID.
If you are on Windows, a package is provided which also includes JRE with the droid binary. To use the version without Java bundled, you will need to have Java 8 to 17 installed on your machine in order to run DROID.
The latest JAVA updates can be obtained from <a href=
"http://www.oracle.com/technetwork/java/index.html">oracle.com/technetwork/java/index.html</a>.
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ <h3>
</h3>
<p>
Java programs can only use as much memory as the&nbsp;Java Runtime Environment sets aside
for them. &nbsp;By default, this value is often quite low. &nbsp;We recommend that DROID runs
with up to 512Mb of memory potentially available, which is the default when DROID runs if no
for them. &nbsp;By default, this value is often quite low. We recommend that DROID runs
with up to 1024MB of memory potentially available, which is the default when DROID runs if no
further configuration is done. &nbsp;
</p>
<p>
Expand All @@ -148,7 +148,7 @@ <h3>
<ul>
<li>
Default value (running through scripts and the DROID.exe file): <b><font face=
"Monospaced, Courier New, Courier, mono">512Mb</font></b>
"Monospaced, Courier New, Courier, mono">1024MB</font></b>
</li>
<li>
Environment variable: <i><b><font face=
Expand Down
Loading