From cf9663fc261830184b0e23f74b862bff3f9e5c2f Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Fri, 3 Feb 2023 13:17:06 +0100 Subject: [PATCH] add addiitonal launcher to debug javafx problems --- .github/workflows/win-exe.yml | 1 + dist/win/build.ps1 | 1 + dist/win/resources/jfxDebug.properties | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 dist/win/resources/jfxDebug.properties diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 0a75c44ca..d791842c8 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -166,6 +166,7 @@ jobs: --resource-dir dist/win/resources --license-file dist/win/resources/license.rtf --file-associations dist/win/resources/FAvaultFile.properties + --add-launcher jfxDebug=dist/wind/resources/jfxDebug.properties env: JP_WIXWIZARD_RESOURCES: ${{ github.workspace }}/dist/win/resources # requires abs path, used in resources/main.wxs - name: Codesign MSI diff --git a/dist/win/build.ps1 b/dist/win/build.ps1 index 9973f5c12..1956a05cf 100644 --- a/dist/win/build.ps1 +++ b/dist/win/build.ps1 @@ -93,6 +93,7 @@ if ($clean -and (Test-Path -Path $appPath)) { --java-options "-Dcryptomator.integrationsWin.keychainPaths=`"~/AppData/Roaming/$AppName/keychain.json`"" ` --java-options "-Dcryptomator.showTrayIcon=true" ` --java-options "-Dcryptomator.buildNumber=`"msi-$revisionNo`"" ` + --add-launcher jfxDebug=$buildDir\resources\jfxDebug.properties ` --resource-dir resources ` --icon resources/$AppName.ico diff --git a/dist/win/resources/jfxDebug.properties b/dist/win/resources/jfxDebug.properties new file mode 100644 index 000000000..c576525aa --- /dev/null +++ b/dist/win/resources/jfxDebug.properties @@ -0,0 +1,19 @@ +win-console=true +java-options=--enable-preview \ + --enable-native-access=org.cryptomator.jfuse.win \ + -Xss5m \ + -Xmx256m \ + -Dcryptomator.appVersion="$semVerNo" \ + -Dfile.encoding="utf-8" \ + -Dcryptomator.logDir="~/AppData/Roaming/$AppName" \ + -Dcryptomator.pluginDir="~/AppData/Roaming/$AppName/Plugins" \ + -Dcryptomator.settingsPath="~/AppData/Roaming/$AppName/settings.json" \ + -Dcryptomator.ipcSocketPath="~/AppData/Roaming/$AppName/ipc.socket" \ + -Dcryptomator.p12Path="~/AppData/Roaming/$AppName/key.p12" \ + -Dcryptomator.mountPointsDir="~/$AppName" \ + -Dcryptomator.loopbackAlias="$LoopbackAlias" \ + -Dcryptomator.integrationsWin.autoStartShellLinkName="$AppName" \ + -Dcryptomator.integrationsWin.keychainPaths="~/AppData/Roaming/$AppName/keychain.json" \ + -Dcryptomator.showTrayIcon=true \ + -Dcryptomator.buildNumber="msi-$revisionNo" \ + -Djavafx.verbose=true \ No newline at end of file