diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 80aa111cf..1c42fcb74 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -74,6 +74,7 @@ jobs: cp LICENSE.txt target cp target/cryptomator-*.jar target/mods - name: Run jlink + #Remark: no compression is applied for improved build compression later (here appimage) run: > ${JAVA_HOME}/bin/jlink --verbose @@ -84,6 +85,7 @@ jobs: --no-header-files --no-man-pages --strip-debug + --compress zip-0 - 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 f96ded641..f0cd01e44 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -85,6 +85,7 @@ jobs: cp LICENSE.txt target cp target/cryptomator-*.jar target/mods - name: Run jlink + #Remark: no compression is applied for improved build compression later (here dmg) run: > ${JAVA_HOME}/bin/jlink --verbose @@ -95,6 +96,7 @@ jobs: --no-header-files --no-man-pages --strip-debug + --compress zip-0 - name: Run jpackage run: > ${JAVA_HOME}/bin/jpackage diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 79be3fd6e..5044d2d35 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -79,6 +79,7 @@ jobs: cp LICENSE.txt target cp target/cryptomator-*.jar target/mods - name: Run jlink + #Remark: no compression is applied for improved build compression later (here msi) run: > ${JAVA_HOME}/bin/jlink --verbose @@ -89,6 +90,7 @@ jobs: --no-header-files --no-man-pages --strip-debug + --compress zip-0 - 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 9b056afa5..0126681f8 100755 --- a/dist/linux/appimage/build.sh +++ b/dist/linux/appimage/build.sh @@ -60,7 +60,8 @@ ${JAVA_HOME}/bin/jlink \ --strip-native-commands \ --no-header-files \ --no-man-pages \ - --strip-debug + --strip-debug \ + --compress zip-0 # 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 2de33e34b..e7d86ef44 100755 --- a/dist/linux/debian/rules +++ b/dist/linux/debian/rules @@ -24,6 +24,7 @@ override_dh_auto_clean: override_dh_auto_build: mkdir resources ln -s ../common/org.cryptomator.Cryptomator512.png resources/cryptomator.png +# Remark: no compression is applied for improved build compression later (here deb) $(JAVA_HOME)/bin/jlink \ --output runtime \ --module-path "${JMODS_PATH}" \ @@ -31,7 +32,8 @@ override_dh_auto_build: --strip-native-commands \ --no-header-files \ --no-man-pages \ - --strip-debug + --strip-debug \ + --compress zip-0 $(JAVA_HOME)/bin/jpackage \ --type app-image \ --runtime-image runtime \ diff --git a/dist/mac/dmg/build.sh b/dist/mac/dmg/build.sh index b2c8d55e3..d55889651 100755 --- a/dist/mac/dmg/build.sh +++ b/dist/mac/dmg/build.sh @@ -76,7 +76,7 @@ ${JAVA_HOME}/bin/jlink \ --no-header-files \ --no-man-pages \ --strip-debug \ - --compress=1 + --compress zip-0 # create app dir ${JAVA_HOME}/bin/jpackage \ diff --git a/dist/win/build.ps1 b/dist/win/build.ps1 index d05463e65..21e3c3506 100644 --- a/dist/win/build.ps1 +++ b/dist/win/build.ps1 @@ -69,7 +69,7 @@ Expand-Archive -Path $jfxJmodsZip -Force -DestinationPath ".\resources\" Remove-Item -Recurse -Force -Path ".\resources\javafx-jmods" Move-Item -Force -Path ".\resources\javafx-jmods-*" -Destination ".\resources\javafx-jmods" -ErrorAction Stop - +## create custom runtime & "$Env:JAVA_HOME\bin\jlink" ` --verbose ` --output runtime ` @@ -78,7 +78,8 @@ Move-Item -Force -Path ".\resources\javafx-jmods-*" -Destination ".\resources\ja --strip-native-commands ` --no-header-files ` --no-man-pages ` - --strip-debug + --strip-debug ` + --compress "zip-0" #do not compress to have improved msi compression $appPath = ".\$AppName" if ($clean -and (Test-Path -Path $appPath)) {