From 00fc2a98379348f1371a8a9ab2756fe7b16eb793 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Thu, 11 Jan 2024 22:59:08 +0100 Subject: [PATCH] remove deprecate compress options and use default ones see also https://bugs.openjdk.org/browse/JDK-8301124?jql=text%20~%20%22compress%22 --- .github/workflows/appimage.yml | 1 - .github/workflows/mac-dmg.yml | 1 - .github/workflows/win-exe.yml | 1 - dist/linux/appimage/build.sh | 3 +-- dist/linux/debian/rules | 3 +-- dist/win/build.ps1 | 3 +-- 6 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 1bb3e694a..80aa111cf 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -84,7 +84,6 @@ jobs: --no-header-files --no-man-pages --strip-debug - --compress=1 - name: Prepare additional launcher run: envsubst '${SEMVER_STR} ${REVISION_NUM}' < dist/linux/launcher-gtk2.properties > launcher-gtk2.properties env: diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index 3b4905a12..f96ded641 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -95,7 +95,6 @@ jobs: --no-header-files --no-man-pages --strip-debug - --compress=1 - name: Run jpackage run: > ${JAVA_HOME}/bin/jpackage diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 74c60e8f2..79be3fd6e 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -89,7 +89,6 @@ jobs: --no-header-files --no-man-pages --strip-debug - --compress=1 - name: Change win-console flag if debug is active if: ${{ inputs.isDebug }} run: echo "WIN_CONSOLE_FLAG=--win-console" >> $GITHUB_ENV diff --git a/dist/linux/appimage/build.sh b/dist/linux/appimage/build.sh index 894e07c70..9b056afa5 100755 --- a/dist/linux/appimage/build.sh +++ b/dist/linux/appimage/build.sh @@ -60,8 +60,7 @@ ${JAVA_HOME}/bin/jlink \ --strip-native-commands \ --no-header-files \ --no-man-pages \ - --strip-debug \ - --compress=1 + --strip-debug # create app dir envsubst '${SEMVER_STR} ${REVISION_NUM}' < ../launcher-gtk2.properties > launcher-gtk2.properties diff --git a/dist/linux/debian/rules b/dist/linux/debian/rules index d0a12e380..2de33e34b 100755 --- a/dist/linux/debian/rules +++ b/dist/linux/debian/rules @@ -31,8 +31,7 @@ override_dh_auto_build: --strip-native-commands \ --no-header-files \ --no-man-pages \ - --strip-debug \ - --compress=2 + --strip-debug $(JAVA_HOME)/bin/jpackage \ --type app-image \ --runtime-image runtime \ diff --git a/dist/win/build.ps1 b/dist/win/build.ps1 index f0fd39482..d05463e65 100644 --- a/dist/win/build.ps1 +++ b/dist/win/build.ps1 @@ -78,8 +78,7 @@ Move-Item -Force -Path ".\resources\javafx-jmods-*" -Destination ".\resources\ja --strip-native-commands ` --no-header-files ` --no-man-pages ` - --strip-debug ` - --compress=1 + --strip-debug $appPath = ".\$AppName" if ($clean -and (Test-Path -Path $appPath)) {