* Launchers update

* Eclipsito update to eclipsito-20200422 * Version update: 2.8.11-r2393, published on 2020-04-22
bardsoftware · Apr 23, 2020 · c8e6fae · c8e6fae
1 parent 10a0bb5
commit c8e6fae
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 43 deletions.
diff --git a/ganttproject-builder/HouseBuildingSample.gan b/ganttproject-builder/HouseBuildingSample.gan
@@ -38,59 +38,59 @@
             <taskproperty id="tpd8" name="coordinator" type="default" valuetype="text"/>
             <taskproperty id="tpd9" name="predecessorsr" type="default" valuetype="text"/>
         </taskproperties>
-        <task id="0" name="Architectural design" color="#99ccff" meeting="false" start="2020-04-17" duration="25" complete="81" expand="true">
-            <task id="9" name="Create draft of architecture" color="#99ccff" meeting="false" start="2020-04-17" duration="10" complete="100" expand="true">
+        <task id="0" name="Architectural design" color="#99ccff" meeting="false" start="2020-04-22" duration="25" complete="81" expand="true">
+            <task id="9" name="Create draft of architecture" color="#99ccff" meeting="false" start="2020-04-22" duration="10" complete="100" expand="true">
                 <depend id="10" type="2" difference="0" hardness="Strong"/>
                 <depend id="12" type="2" difference="0" hardness="Strong"/>
             </task>
-            <task id="10" name="Prepare construction documents" color="#99ccff" meeting="false" start="2020-05-01" duration="15" complete="75" expand="true">
+            <task id="10" name="Prepare construction documents" color="#99ccff" meeting="false" start="2020-05-06" duration="15" complete="75" expand="true">
                 <depend id="17" type="2" difference="0" hardness="Strong"/>
             </task>
-            <task id="17" name="Agreement on architectural plan " color="#000000" meeting="true" start="2020-05-22" duration="0" complete="0" expand="true">
+            <task id="17" name="Agreement on architectural plan " color="#000000" meeting="true" start="2020-05-27" duration="0" complete="0" expand="true">
                 <depend id="1" type="2" difference="0" hardness="Strong"/>
             </task>
         </task>
-        <task id="11" name="Interior design" color="#99ccff" meeting="false" start="2020-05-01" duration="10" complete="33" expand="true">
+        <task id="11" name="Interior design" color="#99ccff" meeting="false" start="2020-05-06" duration="10" complete="33" expand="true">
             <depend id="6" type="2" difference="0" hardness="Strong"/>
-            <task id="12" name="Pre-design" color="#99ccff" meeting="false" start="2020-05-01" duration="5" complete="100" expand="true">
+            <task id="12" name="Pre-design" color="#99ccff" meeting="false" start="2020-05-06" duration="5" complete="100" expand="true">
                 <depend id="13" type="2" difference="0" hardness="Strong"/>
                 <depend id="14" type="2" difference="0" hardness="Strong"/>
             </task>
-            <task id="13" name="Furniture selection" color="#99ccff" meeting="false" start="2020-05-08" duration="5" complete="0" expand="true"/>
-            <task id="14" name="Equipment planning" color="#99ccff" meeting="false" start="2020-05-08" duration="5" complete="0" expand="true">
+            <task id="13" name="Furniture selection" color="#99ccff" meeting="false" start="2020-05-13" duration="5" complete="0" expand="true"/>
+            <task id="14" name="Equipment planning" color="#99ccff" meeting="false" start="2020-05-13" duration="5" complete="0" expand="true">
                 <notes><![CDATA[Embedded devices, kitchen, washing machine, dryer etc]]></notes>
             </task>
         </task>
-        <task id="7" name="Construction phase" color="#99ccff" meeting="false" start="2020-05-22" duration="75" complete="0" expand="true">
+        <task id="7" name="Construction phase" color="#99ccff" meeting="false" start="2020-05-27" duration="75" complete="0" expand="true">
             <depend id="20" type="2" difference="0" hardness="Strong"/>
-            <task id="1" name="Foundation building" color="#99ccff" meeting="false" start="2020-05-22" duration="15" complete="0" expand="false">
+            <task id="1" name="Foundation building" color="#99ccff" meeting="false" start="2020-05-27" duration="15" complete="0" expand="false">
                 <depend id="2" type="2" difference="0" hardness="Strong"/>
             </task>
-            <task id="2" name="Ground Floor building" color="#99ccff" meeting="false" start="2020-06-12" duration="20" complete="0" expand="false">
+            <task id="2" name="Ground Floor building" color="#99ccff" meeting="false" start="2020-06-17" duration="20" complete="0" expand="false">
                 <depend id="4" type="2" difference="0" hardness="Strong"/>
             </task>
-            <task id="4" name="First Floor building" color="#99ccff" meeting="false" start="2020-07-10" duration="20" complete="0" expand="false">
+            <task id="4" name="First Floor building" color="#99ccff" meeting="false" start="2020-07-15" duration="20" complete="0" expand="false">
                 <depend id="5" type="2" difference="0" hardness="Strong"/>
             </task>
-            <task id="5" name="Roof" color="#99ccff" meeting="false" start="2020-08-07" duration="10" complete="0" expand="false">
+            <task id="5" name="Roof" color="#99ccff" meeting="false" start="2020-08-12" duration="10" complete="0" expand="false">
                 <depend id="18" type="2" difference="0" hardness="Strong"/>
             </task>
-            <task id="16" name="Connect to communications" color="#99ccff" meeting="false" start="2020-08-21" duration="10" complete="0" expand="true"/>
-            <task id="18" name="Construction completed " color="#000000" meeting="true" start="2020-08-21" duration="0" complete="0" expand="true">
+            <task id="16" name="Connect to communications" color="#99ccff" meeting="false" start="2020-08-26" duration="10" complete="0" expand="true"/>
+            <task id="18" name="Construction completed " color="#000000" meeting="true" start="2020-08-26" duration="0" complete="0" expand="true">
                 <depend id="6" type="2" difference="0" hardness="Strong"/>
                 <depend id="16" type="2" difference="0" hardness="Strong"/>
             </task>
         </task>
-        <task id="8" name="Decoration phase" color="#99ccff" meeting="false" start="2020-08-21" duration="10" complete="0" expand="true">
-            <task id="6" name="Walls" color="#99ccff" meeting="false" start="2020-08-21" duration="5" complete="0" expand="false">
+        <task id="8" name="Decoration phase" color="#99ccff" meeting="false" start="2020-08-26" duration="10" complete="0" expand="true">
+            <task id="6" name="Walls" color="#99ccff" meeting="false" start="2020-08-26" duration="5" complete="0" expand="false">
                 <depend id="15" type="2" difference="0" hardness="Strong"/>
             </task>
-            <task id="15" name="Furniture" color="#99ccff" meeting="false" start="2020-08-28" duration="3" complete="0" expand="true">
+            <task id="15" name="Furniture" color="#99ccff" meeting="false" start="2020-09-02" duration="3" complete="0" expand="true">
                 <depend id="20" type="2" difference="0" hardness="Strong"/>
             </task>
-            <task id="20" name="Bring your family here" color="#000000" meeting="true" start="2020-09-04" duration="0" complete="0" expand="true"/>
+            <task id="20" name="Bring your family here" color="#000000" meeting="true" start="2020-09-09" duration="0" complete="0" expand="true"/>
         </task>
-        <task id="49" name="GanttProject 2.8.11" color="#ff3333" meeting="true" start="2020-04-17" duration="0" complete="0" thirdDate="2018-02-06" thirdDate-constraint="0" expand="true">
+        <task id="49" name="GanttProject 2.8.11" color="#ff3333" meeting="true" start="2020-04-22" duration="0" complete="0" thirdDate="2018-02-06" thirdDate-constraint="0" expand="true">
             <depend id="0" type="2" difference="0" hardness="Rubber"/>
         </task>
     </tasks>

diff --git 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
@@ -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
@@ -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
@@ -26,18 +26,15 @@
     <maxVersion></maxVersion>
     <jdkPreference>preferJre</jdkPreference>
     <runtimeBits>64/32</runtimeBits>
+    <initialHeapSize>256</initialHeapSize>
+    <maxHeapSize>1024</maxHeapSize>
   </jre>
   <messages>
-    <startupErr>GanttProject failed to start. Please refer to http://docs.ganttproject.biz/user/troubleshoot-installation to get support.
-        </startupErr>
-    <bundledJreErr>This application was configured to use a bundled Java Runtime Environment but the runtime is
-            missing or corrupted.
+    <startupErr>GanttProject failed to start. Visit https://help.ganttproject.biz to get support.</startupErr>
+    <bundledJreErr>This application was configured to use a bundled Java Runtime Environment but the runtime is missing or corrupted.
         </bundledJreErr>
-    <jreVersionErr>GanttProject needs Java 7 or higher. Please refer to http://docs.ganttproject.biz/user/troubleshoot-installation to get
-            support.
-        </jreVersionErr>
-    <launcherErr>Java Runtime not found or is corrupted. Please refer to http://docs.ganttproject.biz/user/troubleshoot-installation to get
-            support.
+    <jreVersionErr>GanttProject needs Java 7 or higher. Visit http://docs.ganttproject.biz to learn more.</jreVersionErr>
+    <launcherErr>Java Runtime not found or is corrupted. Visit http://docs.ganttproject.biz to learn more.
         </launcherErr>
     <instanceAlreadyExistsMsg>An application instance is already running.</instanceAlreadyExistsMsg>
   </messages>

diff --git 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
diff --git a/ganttproject/lib/core/eclipsito.jar b/ganttproject/lib/core/eclipsito.jar
diff --git 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";