From 8ee9d59d7aa3a599a77bf45791116221757aea83 Mon Sep 17 00:00:00 2001 From: Marc Froehlich Date: Mon, 20 Jul 2026 23:18:03 +0200 Subject: [PATCH] manual refactoring + versioninfo xml refactoring --- .../view/Kst4ContestApplication.java | 2 +- website/src/_data/versionInfo.js | 31 ++++++++++++++----- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/src/main/java/kst4contest/view/Kst4ContestApplication.java b/src/main/java/kst4contest/view/Kst4ContestApplication.java index 059dd35..1ec2dea 100644 --- a/src/main/java/kst4contest/view/Kst4ContestApplication.java +++ b/src/main/java/kst4contest/view/Kst4ContestApplication.java @@ -8095,7 +8095,7 @@ public class Kst4ContestApplication extends Application implements StatusUpdateL vbxUpdateWindow.getChildren().add(upd_gridPaneUpd); upd_gridPaneUpd.add(lblUpdateInfo, 0,0,1,1); upd_gridPaneUpd.add(lblUpdateInfo2, 0,1,1,1); - upd_gridPaneUpd.add(new Label("kst4Contest " + ApplicationConstants.APPLICATION_CURRENT_VERSION), 1,1,1,1); + upd_gridPaneUpd.add(new Label("KST4Contest " + ApplicationConstants.APPLICATION_CURRENT_VERSION), 1,1,1,1); upd_gridPaneUpd.add(lblUpdateInfo3, 0,2,1,1); upd_gridPaneUpd.add(new Label("KST4Contest " + chatcontroller.getUpdateInformation().getLatestVersionForDisplay()), 1,2,1,1); upd_gridPaneUpd.add(lblUpdateInfoChanges, 0,3,1,1); diff --git a/website/src/_data/versionInfo.js b/website/src/_data/versionInfo.js index b123900..6a624fd 100644 --- a/website/src/_data/versionInfo.js +++ b/website/src/_data/versionInfo.js @@ -133,20 +133,35 @@ module.exports = async function () { parts.push(""); const latestTag = stable ? stable.tagName : null; - const winFilename = latestTag ? `praktiKST-${latestTag}-windows-x64.zip` : ""; parts.push(" "); if (stable) { - const latestIssues = await getIssuesForRelease("1970-01-01T00:00:00Z", stable.publishedAt); - parts.push(` ${escapeXml(toAppVersionNumber(latestTag))}`); + const latestIssues = await getIssuesForRelease( + "1970-01-01T00:00:00Z", + stable.publishedAt + ); + + // Kept for application versions that still expect the old numeric format. + parts.push( + ` ${escapeXml(toAppVersionNumber(latestTag))}` + ); + + // Used by current application versions for correct semantic comparison + // and display, for example 1.41.1 instead of 1.411. + parts.push( + ` ${escapeXml(toSemanticVersion(latestTag))}` + ); + + parts.push(" "); + parts.push( + ` ${escapeXml(latestIssues.added.slice(0, 300))}` + ); + + // The release page is deliberately platform-neutral. The application + // cannot know whether the user needs Windows, Linux or macOS packages. parts.push( ` https://github.com/${REPO}/releases/tag/${latestTag}` ); - parts.push(" "); - parts.push(` ${escapeXml(latestIssues.added.slice(0, 300))}`); - parts.push( - ` https://github.com/${REPO}/releases/download/${latestTag}/${winFilename}` - ); } parts.push(" ");