Skip to content

Commit 1732efb

Browse files
dbarashevdbarashev
committed
- Bugfixes in Windows launchers/installers
- temporarily removed Java runtimes > 21 due to incompatibility with their JavaFX - Updated changelogs and copyrights
1 parent 5bd2b86 commit 1732efb

File tree

9 files changed

+40
-22
lines changed

9 files changed

+40
-22
lines changed

‎.github/workflows/build-packages.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
env:
88
BUILD_NUMBER: 3390
99
VERSION: 3.4.3390
10-
WINDOWS_APP_FOLDER_NAME: GanttProject-3.4-BetaI
10+
WINDOWS_APP_FOLDER_NAME: GanttProject-3.4-Beta-I
1111
MAC_APP_NAME: GanttProject 3.4 Beta I
1212
MACOS_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE }}
1313
MACOS_CERTIFICATE_PWD: ${{ secrets.PROD_MACOS_CERTIFICATE_PWD }}

‎CHANGELOG‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
ganttproject (3.4.3390) unstable; urgency=low
2+
* This is a beta version of GanttProject 3.4
3+
* GanttProject 3.4 key updates:
4+
- Custom filters
5+
- Custom columns are supported in the calculated columns and filters
6+
- Custom column values can be shown on the chart
7+
- Installing updates from ZIP archives
8+
- User interface lifting
9+
- Auto-reopen of the last opened project
10+
- Migration to Java 21
11+
- AppImage package for Linux
12+
13+
The list of closed issues is available at
14+
https://github.com/bardsoftware/ganttproject/milestone/20
15+
16+
-- Dmitry Barashev <contact@ganttproject.biz> Mon, 5 Dec 2022 12:00:00 +0000
17+
118
ganttproject (3.3.3292) unstable; urgency=low
219
* This is a beta version of GanttProject 3.3
320
* GanttProject 3.3 key updates:

‎ganttproject-builder/BUILD-HISTORY-MAJOR‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010
2025-01-29 3316 fixed issue 2569, added group to MSI silent
1111
2025-07-04 3390 Test build of GanttProject 3.4 Beta I ....
1212
2026-01-16 3390 Test build of GanttProject 3.4 Beta I ....
13-
2026-01-17 3390 Test build of GanttProject 3.4 Beta I ....
13+
2026-01-17 3390 Test build of GanttProject 3.4 Beta I .....
1414
--

‎ganttproject-builder/LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
99
GNU General Public License for more details.
1010

11-
Copyright (C) 2003-2022, GanttProject Team
11+
Copyright (C) 2003-2026, GanttProject Team
1212

1313

1414

‎ganttproject-builder/deb/usr/share/doc/ganttproject/copyright‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ Upstream-Contact: Dmitry Barashev <contact@ganttproject.biz>
44
Source: https://www.ganttproject.biz
55

66
Files: *
7-
Copyright: 2003-2020 Dmitry Barashev, Alexandre Thomas, BarD Software s.r.o., GanttProject Contributors
7+
Copyright: 2003-2026 Dmitry Barashev, Alexandre Thomas, BarD Software s.r.o., GanttProject Contributors
88
License: GPL-3+

‎ganttproject-builder/ganttproject‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,11 @@ check_java() {
141141

142142
VERSION="$( $JAVA_COMMAND -version 2>&1 | grep version | head -n 1)"
143143
log "...found $VERSION"
144-
[[ "$VERSION" =~ 21\.? ]] && return 0;
145-
[[ "$VERSION" =~ 22\.? ]] && return 0;
146-
[[ "$VERSION" =~ 23\.? ]] && return 0;
147-
[[ "$VERSION" =~ 24\.? ]] && return 0;
148-
[[ "$VERSION" =~ 25\.? ]] && return 0;
144+
[[ "$VERSION" =~ \"21\. ]] && return 0;
145+
[[ "$VERSION" =~ \"22\. ]] && log "... this is not yet supported, sorry" && set JAVA_COMMAND="" && return 1;
146+
[[ "$VERSION" =~ \"23\. ]] && log "... this is not yet supported, sorry" && set JAVA_COMMAND="" && return 1;
147+
[[ "$VERSION" =~ \"24\. ]] && log "... this is not yet supported, sorry" && set JAVA_COMMAND="" && return 1;
148+
[[ "$VERSION" =~ \"25\. ]] && log "... this is not yet supported, sorry" && set JAVA_COMMAND="" && return 1;
149149
log "...this seems to be an old Java Runtime (or maybe just too new)";
150150
JAVA_COMMAND=""
151151
return 1

‎ganttproject-builder/ganttproject.bat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ IF "%JAVA_HOME%"=="" SET JAVA_COMMAND=java
88
SET LOCAL_CLASSPATH=%GP_HOME%\eclipsito.jar;%GP_HOME%\lib\slf4j-api-2.0.17.jar;%GP_HOME%\lib\slf4j-jdk14-2.0.4.jar;%GP_HOME%\lib\logback-core-1.5.18.jar;%GP_HOME%\lib\logback-classic-1.5.18.jar;%GP_HOME%
99
SET JVM_ARGS=-Dgpcloud=prod -Dorg.jooq.no-logo=true -Xmx2048m -ea -Dsun.java2d.d3d=false
1010
SET "ECLIPSITO_ARGS=--verbosity 4 --version-dirs plugins;~/.ganttproject.d/updates --app net.sourceforge.ganttproject.GanttProject"
11-
SET "JAVA_EXPORTS=--add-exports javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED ^
11+
SET JAVA_EXPORTS=--add-exports javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED ^
1212
--add-exports javafx.base/com.sun.javafx=ALL-UNNAMED ^
1313
--add-exports javafx.base/com.sun.javafx.event=ALL-UNNAMED ^
1414
--add-exports javafx.base/com.sun.javafx.logging=ALL-UNNAMED ^
@@ -22,7 +22,7 @@ SET "JAVA_EXPORTS=--add-exports javafx.controls/com.sun.javafx.scene.control.beh
2222
--add-exports javafx.graphics/com.sun.javafx.scene=ALL-UNNAMED ^
2323
--add-exports javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED ^
2424
--add-exports javafx.graphics/com.sun.javafx.util=ALL-UNNAMED ^
25-
--add-opens java.desktop/sun.swing=ALL-UNNAMED"
25+
--add-opens java.desktop/sun.swing=ALL-UNNAMED
2626

2727
SET BOOT_CLASS=com.bardsoftware.eclipsito.Launch
2828

‎ganttproject-builder/ganttproject.command‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,11 @@ check_java() {
134134

135135
VERSION="$( $JAVA_COMMAND -version 2>&1 | head -n 1)"
136136
log "...found $VERSION"
137-
[[ "$VERSION" =~ 21\.? ]] && return 0;
138-
[[ "$VERSION" =~ 22\.? ]] && return 0;
139-
[[ "$VERSION" =~ 23\.? ]] && return 0;
140-
[[ "$VERSION" =~ 24\.? ]] && return 0;
141-
[[ "$VERSION" =~ 25\.? ]] && return 0;
137+
[[ "$VERSION" =~ \"21\. ]] && return 0;
138+
[[ "$VERSION" =~ \"22\. ]] && log "... this is not yet supported, sorry" && set JAVA_COMMAND="" && return 1;
139+
[[ "$VERSION" =~ \"23\. ]] && log "... this is not yet supported, sorry" && set JAVA_COMMAND="" && return 1;
140+
[[ "$VERSION" =~ \"24\. ]] && log "... this is not yet supported, sorry" && set JAVA_COMMAND="" && return 1;
141+
[[ "$VERSION" =~ \"25\. ]] && log "... this is not yet supported, sorry" && set JAVA_COMMAND="" && return 1;
142142
log "...this seems to be an old Java Runtime (or maybe just too new)";
143143
JAVA_COMMAND=""
144144
return 1

‎ganttproject-builder/ganttproject.nsi.tpl‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ Section "GanttProject"
8484
File HouseBuildingSample.gan
8585
File LICENSE
8686
File logging.properties
87+
File logback.xml
8788

8889
File /r plugins
8990
File /r runtime
@@ -117,12 +118,12 @@ SectionEnd
117118
Section "Start Menu Shortcuts"
118119

119120
SetShellVarContext all
120-
CreateDirectory "$SMPROGRAMS\GanttProject"
121-
CreateShortCut "$SMPROGRAMS\GanttProject\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
122-
CreateShortCut "$SMPROGRAMS\GanttProject\GanttProject.lnk" "$INSTDIR\ganttproject.exe" "" "$INSTDIR\ganttproject.ico"
123-
CreateShortCut "$SMPROGRAMS\GanttProject\HouseBuildingSample.lnk" "$INSTDIR\HouseBuildingSample.gan" "" "$INSTDIR\ganttproject.ico"
121+
CreateDirectory "$SMPROGRAMS\${APPFOLDERNAME}"
122+
CreateShortCut "$SMPROGRAMS\${APPFOLDERNAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
123+
CreateShortCut "$SMPROGRAMS\${APPFOLDERNAME}\GanttProject $VERSION.lnk" "$INSTDIR\ganttproject.exe" "" "$INSTDIR\ganttproject.ico"
124+
CreateShortCut "$SMPROGRAMS\${APPFOLDERNAME}\HouseBuildingSample.lnk" "$INSTDIR\HouseBuildingSample.gan" "" "$INSTDIR\ganttproject.ico"
124125
CreateShortCut "$INSTDIR\Run GanttProject.lnk" "$INSTDIR\ganttproject.exe" "" "$INSTDIR\ganttproject.ico"
125-
CreateShortCut "$DESKTOP\GanttProject.lnk" "$INSTDIR\ganttproject.exe" "" "$INSTDIR\ganttproject.ico"
126+
CreateShortCut "$DESKTOP\GanttProject $VERSION.lnk" "$INSTDIR\ganttproject.exe" "" "$INSTDIR\ganttproject.ico"
126127

127128
SectionEnd
128129

@@ -168,7 +169,7 @@ Section "Uninstall"
168169

169170

170171
; Remove shortcuts, if any
171-
Delete "$SMPROGRAMS\GanttProject\*.*"
172+
Delete "$SMPROGRAMS\${APPFOLDERNAME}\*.*"
172173
Delete "$DESKTOP\GanttProject.lnk"
173174
Delete "$INSTDIR\Run GanttProject.lnk"
174175

0 commit comments

Comments
 (0)