diff --git a/ganttproject-builder/HouseBuildingSample.gan b/ganttproject-builder/HouseBuildingSample.gan
index 775a7916b0..faf097d596 100644
--- a/ganttproject-builder/HouseBuildingSample.gan
+++ b/ganttproject-builder/HouseBuildingSample.gan
@@ -38,59 +38,59 @@
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
diff --git a/ganttproject-builder/build.gradle b/ganttproject-builder/build.gradle
index c2ad76621e..b40da885c0 100644
--- a/ganttproject-builder/build.gradle
+++ b/ganttproject-builder/build.gradle
@@ -189,13 +189,13 @@ task runApp(type: JavaExec, dependsOn: distBin) {
workingDir = 'dist-bin'
classpath = fileTree(dir: 'dist-bin', includes: ['eclipsito.jar', '.'])
main = 'org.bardsoftware.eclipsito.Boot'
- args '-app', 'net.sourceforge.ganttproject.GanttProject', '-plugins-dir', "plugins-${semver}"
+ args '-app', 'net.sourceforge.ganttproject.GanttProject', '-plugins-dir', "plugins"
jvmArgs '-ea'
}
task debugApp(type: JavaExec, dependsOn: distBin) {
workingDir = 'dist-bin'
classpath = fileTree(dir: 'dist-bin', includes: ['eclipsito.jar', '.'])
main = 'org.bardsoftware.eclipsito.Boot'
- args '-app', 'net.sourceforge.ganttproject.GanttProject', '-plugins-dir', "plugins-${semver}"
+ args '-app', 'net.sourceforge.ganttproject.GanttProject', '-plugins-dir', "plugins"
jvmArgs '-agentlib:jdwp=transport=dt_socket,address=localhost:9009,server=y,suspend=y'
}
diff --git a/ganttproject-builder/build.xml b/ganttproject-builder/build.xml
index 2c662fbd33..78f6d0da54 100644
--- a/ganttproject-builder/build.xml
+++ b/ganttproject-builder/build.xml
@@ -56,7 +56,7 @@
homepage="https://www.ganttproject.biz/"
section="editors"
priority="optional"
- depends="openjdk-7-jre | openjdk-8-jre | openjdk-9-jre | openjdk-10-jre | openjdk-11-jre | openjdk-7-jdk | openjdk-8-jdk | openjdk-9-jdk | openjdk-10-jdk | openjdk-11-jdk | oracle-java7-jre | oracle-java8-jre | oracle-java9-jre | oracle-java7-jdk | oracle-java8-jdk | oracle-java9-jdk | oracle-java7-installer | oracle-java8-installer | oracle-java10-installer"
+ depends="openjdk-7-jre | openjdk-8-jre | openjdk-9-jre | openjdk-10-jre | openjdk-11-jre | openjdk-7-jdk | openjdk-8-jdk | openjdk-9-jdk | openjdk-10-jdk | openjdk-11-jdk | oracle-java7-jre | oracle-java8-jre | oracle-java9-jre | oracle-java7-jdk | oracle-java8-jdk | oracle-java9-jdk | java7-runtime | java8-runtime | java9-runtime | java10-runtime | java11-runtime"
conflicts="ganttproject-praha"
replaces="ganttproject-praha"
postrm="${distDebWork}/postrm"
diff --git a/ganttproject-builder/ganttproject b/ganttproject-builder/ganttproject
index b16dcae24f..47c6c8cba5 100755
--- a/ganttproject-builder/ganttproject
+++ b/ganttproject-builder/ganttproject
@@ -65,10 +65,10 @@ fi
cd "$GP_HOME"
CLASSPATH="$CLASSPATH:$GP_HOME/eclipsito.jar:$GP_HOME"
export CLASSPATH
-CONFIGURATION_FILE=ganttproject-eclipsito-config.xml
BOOT_CLASS=org.bardsoftware.eclipsito.Boot
+ECLIPSITO_ARGS="-plugins-dir plugins -app net.sourceforge.ganttproject.GanttProject"
-JAVA_ARGS="-Xmx512m -Duser.dir=$GP_HOME $BOOT_CLASS -plugins-dir plugins -app net.sourceforge.ganttproject.GanttProject -log true -log_file $LOG_FILE"
+JAVA_ARGS="-Xmx1024m -Duser.dir=$GP_HOME $BOOT_CLASS $ECLIPSITO_ARGS -log true -log_file $LOG_FILE"
if [ -n "$(echo \"$*\" | sed -n '/\(^\|\s\)-/{p;}')" ]; then
"$JAVA_COMMAND" $JAVA_ARGS "$@"
else
diff --git a/ganttproject-builder/ganttproject-launch4j.xml b/ganttproject-builder/ganttproject-launch4j.xml
index 6e01fdf199..ed6bcc1ee8 100644
--- a/ganttproject-builder/ganttproject-launch4j.xml
+++ b/ganttproject-builder/ganttproject-launch4j.xml
@@ -26,18 +26,15 @@
preferJre
64/32
+ 256
+ 1024
- GanttProject failed to start. Please refer to http://docs.ganttproject.biz/user/troubleshoot-installation to get support.
-
- This application was configured to use a bundled Java Runtime Environment but the runtime is
- missing or corrupted.
+ GanttProject failed to start. Visit https://help.ganttproject.biz to get support.
+ This application was configured to use a bundled Java Runtime Environment but the runtime is missing or corrupted.
- GanttProject needs Java 7 or higher. Please refer to http://docs.ganttproject.biz/user/troubleshoot-installation to get
- support.
-
- Java Runtime not found or is corrupted. Please refer to http://docs.ganttproject.biz/user/troubleshoot-installation to get
- support.
+ GanttProject needs Java 7 or higher. Visit http://docs.ganttproject.biz to learn more.
+ Java Runtime not found or is corrupted. Visit http://docs.ganttproject.biz to learn more.
An application instance is already running.
diff --git a/ganttproject-builder/ganttproject.command b/ganttproject-builder/ganttproject.command
index da0750822b..c5f64be421 100755
--- a/ganttproject-builder/ganttproject.command
+++ b/ganttproject-builder/ganttproject.command
@@ -45,7 +45,7 @@ if [ -e "$LOG_FILE" ] && [ ! -w "$LOG_FILE" ]; then
fi
LOG_TEXT=""
-echo "" > /tmp/ganttproject-launcher.log || LOG_TEXT="----"
+echo "" > /tmp/ganttproject-launcher.log || LOG_TEXT="----"
log() {
if [ ! -z "$LOG_TEXT" ]; then
@@ -67,6 +67,7 @@ check_java() {
VERSION="$( $JAVA_COMMAND -version 2>&1 | head -n 1)"
log "...found $VERSION"
+ [[ "$VERSION" =~ "1.7" ]] && return 0;
[[ "$VERSION" =~ "1.8" ]] && return 0;
[[ "$VERSION" =~ "9." ]] && return 0;
[[ "$VERSION" =~ "10." ]] && return 0;
@@ -76,7 +77,7 @@ check_java() {
[[ "$VERSION" =~ "14." ]] && return 0;
log "... this seems to be an old Java Runtime";
JAVA_COMMAND=""
- return 1
+ return 1
}
find_java() {
@@ -87,7 +88,7 @@ find_java() {
if [ "0" = "$?" ]; then
check_java "$JAVA_COMMAND" && return 0;
fi
-
+
if [ -x /usr/libexec/java_home ]; then
check_java "$(/usr/libexec/java_home)/bin/java" && return 0;
fi
@@ -99,7 +100,7 @@ find_java() {
for f in $(ls /Library/Java/JavaVirtualMachines/); do
check_java "/Library/Java/JavaVirtualMachines/$f/Contents/Home/bin/java" && return 0;
done;
-
+
check_java "/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java" && return 0;
check_java /Library/Java/Home/bin/java && return 0;
@@ -111,8 +112,8 @@ report_java_not_found() {
if [ -z "$LOG_TEXT" ]; then
LOG_TEXT="$(cat /tmp/ganttproject-launcher.log)"
fi
-
- LOG_TEXT=$(echo "$LOG_TEXT" | sed s/\"/\\\\\"/g)
+
+ LOG_TEXT=$(echo "$LOG_TEXT" | sed s/\"/\\\\\"/g)
osascript -e 'tell app "System Events" to display alert "Java Runtime not found" message "GanttProject cannot find a suitable Java Runtime.\n\nWhat we have tried:\n'"$LOG_TEXT"'\n\nYou can find this log in /tmp/ganttproject-launcher.log file\nProceed to http://docs.ganttproject.biz/user/troubleshooting-installation to learn how to fix this."'
}
@@ -121,8 +122,8 @@ CLASSPATH="$CLASSPATH:$GP_HOME/eclipsito.jar:$GP_HOME"
export CLASSPATH
BOOT_CLASS=org.bardsoftware.eclipsito.Boot
ECLIPSITO_ARGS="-plugins-dir plugins -app net.sourceforge.ganttproject.GanttProject"
-
-JAVA_ARGS="-Dapple.laf.useScreenMenuBar=true -Dcom.apple.macos.useScreenMenuBar=true -Dcom.apple.mrj.application.apple.menu.about.name=GanttProject -Xdock:name=GanttProject -Xdock:icon=ganttproject.icns -Xmx512m -ea -Dfile.encoding=UTF-8 $BOOT_CLASS $ECLIPSITO_ARGS -log true -log_file $LOG_FILE"
+MACOS_ARGS="-Dapple.laf.useScreenMenuBar=true -Dcom.apple.macos.useScreenMenuBar=true -Dcom.apple.mrj.application.apple.menu.about.name=GanttProject -Xdock:name=GanttProject -Xdock:icon=ganttproject.icns"
+JAVA_ARGS="-Duser.dir=$GP_HOME -Xmx1024m -ea -Dfile.encoding=UTF-8 $MACOS_ARGS $BOOT_CLASS $ECLIPSITO_ARGS -log true -log_file $LOG_FILE"
if [ -n "$(echo \"$*\" | sed -n '/\(^\|\s\)-/{p;}')" ]; then
"$JAVA_COMMAND" $JAVA_ARGS "$@"
diff --git a/ganttproject-builder/ganttproject.exe b/ganttproject-builder/ganttproject.exe
index 6d0dcc0c23..975a814db7 100755
Binary files a/ganttproject-builder/ganttproject.exe and b/ganttproject-builder/ganttproject.exe differ
diff --git a/ganttproject/lib/core/eclipsito.jar b/ganttproject/lib/core/eclipsito.jar
index f8cae423a5..04ec72ff07 100644
Binary files a/ganttproject/lib/core/eclipsito.jar and b/ganttproject/lib/core/eclipsito.jar differ
diff --git a/ganttproject/src/net/sourceforge/ganttproject/GPVersion.java b/ganttproject/src/net/sourceforge/ganttproject/GPVersion.java
index e6e3aac9ec..9ab5f4bf0c 100644
--- a/ganttproject/src/net/sourceforge/ganttproject/GPVersion.java
+++ b/ganttproject/src/net/sourceforge/ganttproject/GPVersion.java
@@ -19,7 +19,7 @@
package net.sourceforge.ganttproject;
public abstract class GPVersion {
- public static String BUILD = "2391"; // BUILD NUMBER
+ public static String BUILD = "2393"; // BUILD NUMBER
public static String V2_0_1 = "2.0.1";
public static String V2_0_2 = "2.0.2";
public static String V2_0_3 = "2.0.3";