Skip to content

Commit

Permalink
MORTAR v1.2-beta.1 for further testing before official release;
Browse files Browse the repository at this point in the history
  • Loading branch information
JonasSchaub committed Apr 30, 2024
1 parent a92d428 commit 789429d
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cff-version: 1.2.0
title: MORTAR
version: "1.2.0.0-beta"
version: "1.2.0.0-beta.1"
message: "If you use this software, please cite it as below."
type: software
authors:
Expand All @@ -26,7 +26,7 @@ authors:
given-names: "Achim"
orcid: "https://orcid.org/0000-0003-0722-4229"
doi: "10.5281/zenodo.6984804"
date-released: 2024-04-15
date-released: 2024-04-30
url: "https://github.com/FelixBaensch/MORTAR"
license: MIT
references:
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ Pre-compiled and executable MORTAR distributions can be found attached to the

<p>
<b>Windows:</b> A convenient Windows OS installer executable for MORTAR is available
(click <a href="https://github.com/FelixBaensch/MORTAR/releases/download/v1.2.0.0-beta/MORTAR_v1.2.0.0-beta_WINx64_installer.exe">here</a> to
(click <a href="https://github.com/FelixBaensch/MORTAR/releases/download/v1.2.0.0-beta.1/MORTAR_v1.2.0.0-beta.1_WINx64_installer.exe">here</a> to
automatically download the installer .exe of the latest version). Download the installer
executable, start, and follow the instructions to install MORTAR. Note that the installation includes a full
Java Runtime Environment (JRE). After installation, create a shortcut to an appropriate MORTAR start batch file on your
Windows desktop. E.g. for MORTAR to use up to 4 gigabyte of RAM, copy a shortcut to batch file "MORTAR.bat" which is
located in the MORTAR program folder (default "C:\Program Files\MORTAR\MORTARv1.2.0.0-beta\bin" or the path specified at
located in the MORTAR program folder (default "C:\Program Files\MORTAR\MORTARv1.2.0.0-beta.1\bin" or the path specified at
installation). To start MORTAR, double-click the created shortcut. MORTAR can be uninstalled by the provided
Uninstall.exe executable in the MORTAR program folder or standard Windows functions.
<br>
Expand All @@ -89,15 +89,15 @@ with your chosen initially allocated memory (-Xms) and maximum value (-Xmx) acco
described below. As an alternative way, they should also work on Windows.
</p>

<p><b>Linux and macOS:</b> Every release has the executable Java ARchive (JAR) "MORTAR-fat-1.2.0.0-beta.jar"
<p><b>Linux and macOS:</b> Every release has the executable Java ARchive (JAR) "MORTAR-fat-1.2.0.0-beta.1.jar"
attached, which contains the packaged MORTAR code together with all dependencies
(click <a href="https://github.com/FelixBaensch/MORTAR/releases/download/v1.2.0.0-beta/MORTAR-fat-1.2.0.0-beta.jar">here</a>
(click <a href="https://github.com/FelixBaensch/MORTAR/releases/download/v1.2.0.0-beta.1/MORTAR-fat-1.2.0.0-beta.1.jar">here</a>
to automatically download the JAR of the latest version).
To run MORTAR (with up to 4 GB of RAM available, e.g.),
execute the JAR from the command-line using</p>

```shell
java -jar -Xms512m -Xmx4g <path to>MORTAR-fat-1.2.0.0-beta.jar
java -jar -Xms512m -Xmx4g <path to>MORTAR-fat-1.2.0.0-beta.1.jar
```

A JDK or JRE of version 21.0.1 or higher needs to be installed on your system and linked to the "java" command.
Expand All @@ -106,8 +106,8 @@ Execute the command in the directory where the JAR is situated or use its explic
Adjust the initially allocated memory (-Xms) and maximum memory to be used (-Xmx) according to your preferences.

<p>Please note that MORTAR only supports x64 (on all three platforms) and AArch64 (on macOS and Linux) architectures in general.
For the latter, a special "fat JAR" named "MORTAR-fat-aarch64-1.2.0.0-beta.jar" is available from the distributions attached to the releases and must be used
(click <a href="https://github.com/FelixBaensch/MORTAR/releases/download/v1.2.0.0-beta/MORTAR-fat-aarch64-1.2.0.0-beta.jar">here</a> to
For the latter, a special "fat JAR" named "MORTAR-fat-aarch64-1.2.0.0-beta.1.jar" is available from the distributions attached to the releases and must be used
(click <a href="https://github.com/FelixBaensch/MORTAR/releases/download/v1.2.0.0-beta.1/MORTAR-fat-aarch64-1.2.0.0-beta.1.jar">here</a> to
automatically download the AArch64 JAR of the latest version).</p>
Also note that using the Windows Subsystem for Linux (WSL) is not recommended, since a lot of additional configurations
have to be made there to run Java GUI applications.
Expand Down
Binary file modified Tutorial/MORTAR_Tutorial.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
}

group 'de.unijena.cheminf'
version '1.2.0.0-beta'
version '1.2.0.0-beta.1'

sourceCompatibility = 1.21

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ private BasicDefinitions() {
/**
* Version of application.
*/
public static final String MORTAR_VERSION = "1.2.0.0-beta";
public static final String MORTAR_VERSION = "1.2.0.0-beta.1";
//</editor-fold>
//
//<editor-fold defaultstate="collapsed" desc="Model constants and magic numbers">
Expand Down

0 comments on commit 789429d

Please sign in to comment.