Skip to content

Commit c8e6fae

Browse files
author
Dmitry Barashev
committed
* Launchers update
* Eclipsito update to eclipsito-20200422 * Version update: 2.8.11-r2393, published on 2020-04-22
1 parent 10a0bb5 commit c8e6fae

9 files changed

Lines changed: 41 additions & 43 deletions

File tree

‎ganttproject-builder/HouseBuildingSample.gan‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,59 +38,59 @@
3838
<taskproperty id="tpd8" name="coordinator" type="default" valuetype="text"/>
3939
<taskproperty id="tpd9" name="predecessorsr" type="default" valuetype="text"/>
4040
</taskproperties>
41-
<task id="0" name="Architectural design" color="#99ccff" meeting="false" start="2020-04-17" duration="25" complete="81" expand="true">
42-
<task id="9" name="Create draft of architecture" color="#99ccff" meeting="false" start="2020-04-17" duration="10" complete="100" expand="true">
41+
<task id="0" name="Architectural design" color="#99ccff" meeting="false" start="2020-04-22" duration="25" complete="81" expand="true">
42+
<task id="9" name="Create draft of architecture" color="#99ccff" meeting="false" start="2020-04-22" duration="10" complete="100" expand="true">
4343
<depend id="10" type="2" difference="0" hardness="Strong"/>
4444
<depend id="12" type="2" difference="0" hardness="Strong"/>
4545
</task>
46-
<task id="10" name="Prepare construction documents" color="#99ccff" meeting="false" start="2020-05-01" duration="15" complete="75" expand="true">
46+
<task id="10" name="Prepare construction documents" color="#99ccff" meeting="false" start="2020-05-06" duration="15" complete="75" expand="true">
4747
<depend id="17" type="2" difference="0" hardness="Strong"/>
4848
</task>
49-
<task id="17" name="Agreement on architectural plan " color="#000000" meeting="true" start="2020-05-22" duration="0" complete="0" expand="true">
49+
<task id="17" name="Agreement on architectural plan " color="#000000" meeting="true" start="2020-05-27" duration="0" complete="0" expand="true">
5050
<depend id="1" type="2" difference="0" hardness="Strong"/>
5151
</task>
5252
</task>
53-
<task id="11" name="Interior design" color="#99ccff" meeting="false" start="2020-05-01" duration="10" complete="33" expand="true">
53+
<task id="11" name="Interior design" color="#99ccff" meeting="false" start="2020-05-06" duration="10" complete="33" expand="true">
5454
<depend id="6" type="2" difference="0" hardness="Strong"/>
55-
<task id="12" name="Pre-design" color="#99ccff" meeting="false" start="2020-05-01" duration="5" complete="100" expand="true">
55+
<task id="12" name="Pre-design" color="#99ccff" meeting="false" start="2020-05-06" duration="5" complete="100" expand="true">
5656
<depend id="13" type="2" difference="0" hardness="Strong"/>
5757
<depend id="14" type="2" difference="0" hardness="Strong"/>
5858
</task>
59-
<task id="13" name="Furniture selection" color="#99ccff" meeting="false" start="2020-05-08" duration="5" complete="0" expand="true"/>
60-
<task id="14" name="Equipment planning" color="#99ccff" meeting="false" start="2020-05-08" duration="5" complete="0" expand="true">
59+
<task id="13" name="Furniture selection" color="#99ccff" meeting="false" start="2020-05-13" duration="5" complete="0" expand="true"/>
60+
<task id="14" name="Equipment planning" color="#99ccff" meeting="false" start="2020-05-13" duration="5" complete="0" expand="true">
6161
<notes><![CDATA[Embedded devices, kitchen, washing machine, dryer etc]]></notes>
6262
</task>
6363
</task>
64-
<task id="7" name="Construction phase" color="#99ccff" meeting="false" start="2020-05-22" duration="75" complete="0" expand="true">
64+
<task id="7" name="Construction phase" color="#99ccff" meeting="false" start="2020-05-27" duration="75" complete="0" expand="true">
6565
<depend id="20" type="2" difference="0" hardness="Strong"/>
66-
<task id="1" name="Foundation building" color="#99ccff" meeting="false" start="2020-05-22" duration="15" complete="0" expand="false">
66+
<task id="1" name="Foundation building" color="#99ccff" meeting="false" start="2020-05-27" duration="15" complete="0" expand="false">
6767
<depend id="2" type="2" difference="0" hardness="Strong"/>
6868
</task>
69-
<task id="2" name="Ground Floor building" color="#99ccff" meeting="false" start="2020-06-12" duration="20" complete="0" expand="false">
69+
<task id="2" name="Ground Floor building" color="#99ccff" meeting="false" start="2020-06-17" duration="20" complete="0" expand="false">
7070
<depend id="4" type="2" difference="0" hardness="Strong"/>
7171
</task>
72-
<task id="4" name="First Floor building" color="#99ccff" meeting="false" start="2020-07-10" duration="20" complete="0" expand="false">
72+
<task id="4" name="First Floor building" color="#99ccff" meeting="false" start="2020-07-15" duration="20" complete="0" expand="false">
7373
<depend id="5" type="2" difference="0" hardness="Strong"/>
7474
</task>
75-
<task id="5" name="Roof" color="#99ccff" meeting="false" start="2020-08-07" duration="10" complete="0" expand="false">
75+
<task id="5" name="Roof" color="#99ccff" meeting="false" start="2020-08-12" duration="10" complete="0" expand="false">
7676
<depend id="18" type="2" difference="0" hardness="Strong"/>
7777
</task>
78-
<task id="16" name="Connect to communications" color="#99ccff" meeting="false" start="2020-08-21" duration="10" complete="0" expand="true"/>
79-
<task id="18" name="Construction completed " color="#000000" meeting="true" start="2020-08-21" duration="0" complete="0" expand="true">
78+
<task id="16" name="Connect to communications" color="#99ccff" meeting="false" start="2020-08-26" duration="10" complete="0" expand="true"/>
79+
<task id="18" name="Construction completed " color="#000000" meeting="true" start="2020-08-26" duration="0" complete="0" expand="true">
8080
<depend id="6" type="2" difference="0" hardness="Strong"/>
8181
<depend id="16" type="2" difference="0" hardness="Strong"/>
8282
</task>
8383
</task>
84-
<task id="8" name="Decoration phase" color="#99ccff" meeting="false" start="2020-08-21" duration="10" complete="0" expand="true">
85-
<task id="6" name="Walls" color="#99ccff" meeting="false" start="2020-08-21" duration="5" complete="0" expand="false">
84+
<task id="8" name="Decoration phase" color="#99ccff" meeting="false" start="2020-08-26" duration="10" complete="0" expand="true">
85+
<task id="6" name="Walls" color="#99ccff" meeting="false" start="2020-08-26" duration="5" complete="0" expand="false">
8686
<depend id="15" type="2" difference="0" hardness="Strong"/>
8787
</task>
88-
<task id="15" name="Furniture" color="#99ccff" meeting="false" start="2020-08-28" duration="3" complete="0" expand="true">
88+
<task id="15" name="Furniture" color="#99ccff" meeting="false" start="2020-09-02" duration="3" complete="0" expand="true">
8989
<depend id="20" type="2" difference="0" hardness="Strong"/>
9090
</task>
91-
<task id="20" name="Bring your family here" color="#000000" meeting="true" start="2020-09-04" duration="0" complete="0" expand="true"/>
91+
<task id="20" name="Bring your family here" color="#000000" meeting="true" start="2020-09-09" duration="0" complete="0" expand="true"/>
9292
</task>
93-
<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">
93+
<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">
9494
<depend id="0" type="2" difference="0" hardness="Rubber"/>
9595
</task>
9696
</tasks>

‎ganttproject-builder/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,13 +189,13 @@ task runApp(type: JavaExec, dependsOn: distBin) {
189189
workingDir = 'dist-bin'
190190
classpath = fileTree(dir: 'dist-bin', includes: ['eclipsito.jar', '.'])
191191
main = 'org.bardsoftware.eclipsito.Boot'
192-
args '-app', 'net.sourceforge.ganttproject.GanttProject', '-plugins-dir', "plugins-${semver}"
192+
args '-app', 'net.sourceforge.ganttproject.GanttProject', '-plugins-dir', "plugins"
193193
jvmArgs '-ea'
194194
}
195195
task debugApp(type: JavaExec, dependsOn: distBin) {
196196
workingDir = 'dist-bin'
197197
classpath = fileTree(dir: 'dist-bin', includes: ['eclipsito.jar', '.'])
198198
main = 'org.bardsoftware.eclipsito.Boot'
199-
args '-app', 'net.sourceforge.ganttproject.GanttProject', '-plugins-dir', "plugins-${semver}"
199+
args '-app', 'net.sourceforge.ganttproject.GanttProject', '-plugins-dir', "plugins"
200200
jvmArgs '-agentlib:jdwp=transport=dt_socket,address=localhost:9009,server=y,suspend=y'
201201
}

‎ganttproject-builder/build.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
homepage="https://www.ganttproject.biz/"
5757
section="editors"
5858
priority="optional"
59-
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"
59+
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"
6060
conflicts="ganttproject-praha"
6161
replaces="ganttproject-praha"
6262
postrm="${distDebWork}/postrm"

‎ganttproject-builder/ganttproject‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ fi
6565
cd "$GP_HOME"
6666
CLASSPATH="$CLASSPATH:$GP_HOME/eclipsito.jar:$GP_HOME"
6767
export CLASSPATH
68-
CONFIGURATION_FILE=ganttproject-eclipsito-config.xml
6968
BOOT_CLASS=org.bardsoftware.eclipsito.Boot
69+
ECLIPSITO_ARGS="-plugins-dir plugins -app net.sourceforge.ganttproject.GanttProject"
7070

71-
JAVA_ARGS="-Xmx512m -Duser.dir=$GP_HOME $BOOT_CLASS -plugins-dir plugins -app net.sourceforge.ganttproject.GanttProject -log true -log_file $LOG_FILE"
71+
JAVA_ARGS="-Xmx1024m -Duser.dir=$GP_HOME $BOOT_CLASS $ECLIPSITO_ARGS -log true -log_file $LOG_FILE"
7272
if [ -n "$(echo \"$*\" | sed -n '/\(^\|\s\)-/{p;}')" ]; then
7373
"$JAVA_COMMAND" $JAVA_ARGS "$@"
7474
else

‎ganttproject-builder/ganttproject-launch4j.xml‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,15 @@
2626
<maxVersion></maxVersion>
2727
<jdkPreference>preferJre</jdkPreference>
2828
<runtimeBits>64/32</runtimeBits>
29+
<initialHeapSize>256</initialHeapSize>
30+
<maxHeapSize>1024</maxHeapSize>
2931
</jre>
3032
<messages>
31-
<startupErr>GanttProject failed to start. Please refer to http://docs.ganttproject.biz/user/troubleshoot-installation to get support.
32-
</startupErr>
33-
<bundledJreErr>This application was configured to use a bundled Java Runtime Environment but the runtime is
34-
missing or corrupted.
33+
<startupErr>GanttProject failed to start. Visit https://help.ganttproject.biz to get support.</startupErr>
34+
<bundledJreErr>This application was configured to use a bundled Java Runtime Environment but the runtime is missing or corrupted.
3535
</bundledJreErr>
36-
<jreVersionErr>GanttProject needs Java 7 or higher. Please refer to http://docs.ganttproject.biz/user/troubleshoot-installation to get
37-
support.
38-
</jreVersionErr>
39-
<launcherErr>Java Runtime not found or is corrupted. Please refer to http://docs.ganttproject.biz/user/troubleshoot-installation to get
40-
support.
36+
<jreVersionErr>GanttProject needs Java 7 or higher. Visit http://docs.ganttproject.biz to learn more.</jreVersionErr>
37+
<launcherErr>Java Runtime not found or is corrupted. Visit http://docs.ganttproject.biz to learn more.
4138
</launcherErr>
4239
<instanceAlreadyExistsMsg>An application instance is already running.</instanceAlreadyExistsMsg>
4340
</messages>

‎ganttproject-builder/ganttproject.command‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ if [ -e "$LOG_FILE" ] && [ ! -w "$LOG_FILE" ]; then
4545
fi
4646

4747
LOG_TEXT=""
48-
echo "" > /tmp/ganttproject-launcher.log || LOG_TEXT="----"
48+
echo "" > /tmp/ganttproject-launcher.log || LOG_TEXT="----"
4949

5050
log() {
5151
if [ ! -z "$LOG_TEXT" ]; then
@@ -67,6 +67,7 @@ check_java() {
6767

6868
VERSION="$( $JAVA_COMMAND -version 2>&1 | head -n 1)"
6969
log "...found $VERSION"
70+
[[ "$VERSION" =~ "1.7" ]] && return 0;
7071
[[ "$VERSION" =~ "1.8" ]] && return 0;
7172
[[ "$VERSION" =~ "9." ]] && return 0;
7273
[[ "$VERSION" =~ "10." ]] && return 0;
@@ -76,7 +77,7 @@ check_java() {
7677
[[ "$VERSION" =~ "14." ]] && return 0;
7778
log "... this seems to be an old Java Runtime";
7879
JAVA_COMMAND=""
79-
return 1
80+
return 1
8081
}
8182

8283
find_java() {
@@ -87,7 +88,7 @@ find_java() {
8788
if [ "0" = "$?" ]; then
8889
check_java "$JAVA_COMMAND" && return 0;
8990
fi
90-
91+
9192
if [ -x /usr/libexec/java_home ]; then
9293
check_java "$(/usr/libexec/java_home)/bin/java" && return 0;
9394
fi
@@ -99,7 +100,7 @@ find_java() {
99100
for f in $(ls /Library/Java/JavaVirtualMachines/); do
100101
check_java "/Library/Java/JavaVirtualMachines/$f/Contents/Home/bin/java" && return 0;
101102
done;
102-
103+
103104
check_java "/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java" && return 0;
104105
check_java /Library/Java/Home/bin/java && return 0;
105106

@@ -111,8 +112,8 @@ report_java_not_found() {
111112
if [ -z "$LOG_TEXT" ]; then
112113
LOG_TEXT="$(cat /tmp/ganttproject-launcher.log)"
113114
fi
114-
115-
LOG_TEXT=$(echo "$LOG_TEXT" | sed s/\"/\\\\\"/g)
115+
116+
LOG_TEXT=$(echo "$LOG_TEXT" | sed s/\"/\\\\\"/g)
116117
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."'
117118
}
118119

@@ -121,8 +122,8 @@ CLASSPATH="$CLASSPATH:$GP_HOME/eclipsito.jar:$GP_HOME"
121122
export CLASSPATH
122123
BOOT_CLASS=org.bardsoftware.eclipsito.Boot
123124
ECLIPSITO_ARGS="-plugins-dir plugins -app net.sourceforge.ganttproject.GanttProject"
124-
125-
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"
125+
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"
126+
JAVA_ARGS="-Duser.dir=$GP_HOME -Xmx1024m -ea -Dfile.encoding=UTF-8 $MACOS_ARGS $BOOT_CLASS $ECLIPSITO_ARGS -log true -log_file $LOG_FILE"
126127

127128
if [ -n "$(echo \"$*\" | sed -n '/\(^\|\s\)-/{p;}')" ]; then
128129
"$JAVA_COMMAND" $JAVA_ARGS "$@"

‎ganttproject-builder/ganttproject.exe‎

-512 Bytes
Binary file not shown.

‎ganttproject/lib/core/eclipsito.jar‎

159 Bytes
Binary file not shown.

‎ganttproject/src/net/sourceforge/ganttproject/GPVersion.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
package net.sourceforge.ganttproject;
2020

2121
public abstract class GPVersion {
22-
public static String BUILD = "2391"; // BUILD NUMBER
22+
public static String BUILD = "2393"; // BUILD NUMBER
2323
public static String V2_0_1 = "2.0.1";
2424
public static String V2_0_2 = "2.0.2";
2525
public static String V2_0_3 = "2.0.3";

0 commit comments

Comments
 (0)