mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-09-13 03:24:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace/substitute variables in debug launcher

Browse Source
This commit is contained in:
Armin Schrenk
2023-02-06 12:15:03 +01:00
parent cf9663fc26
commit 1102f73680
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/win/.gitignore
+2 -1
View File
@@ -4,4 +4,5 @@ installer
*.wixobj
*.pdb
*.msi
license.rtf
license.rtf
debug.properties
dist/win/build.ps1
Vendored
+7 -1
View File
@@ -63,6 +63,12 @@ if ($clean -and (Test-Path -Path $appPath)) {
Remove-Item -Path $appPath -Force -Recurse
}
# prepare additional launcher
$debugProps = Get-Content -Path $buildDir\resources\debug-launcher.properties
$debugProps = $debugProps -replace '\${SEM_VER_STR}', "$semVerNo"
$debugProps = $debugProps -replace '\${REVISION_NUM}', "$revisionNo"
Set-Content -Path $buildDir\resources\debug.properties -Value $debugProps
# create app dir
& "$Env:JAVA_HOME\bin\jpackage" `
--verbose `
@@ -93,7 +99,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 `
--add-launcher debug=$buildDir\resources\debug.properties `
--resource-dir resources `
--icon resources/$AppName.ico
dist/win/resources/jfxDebug.properties → dist/win/resources/debug-launcher.properties
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@ java-options=--enable-preview \
--enable-native-access=org.cryptomator.jfuse.win \
-Xss5m \
-Xmx256m \
-Dcryptomator.appVersion="$semVerNo" \
-Dcryptomator.appVersion="${SEM_VER_STR}" \
-Dfile.encoding="utf-8" \
-Dcryptomator.logDir="~/AppData/Roaming/$AppName" \
-Dcryptomator.pluginDir="~/AppData/Roaming/$AppName/Plugins" \
@@ -15,5 +15,5 @@ java-options=--enable-preview \
-Dcryptomator.integrationsWin.autoStartShellLinkName="$AppName" \
-Dcryptomator.integrationsWin.keychainPaths="~/AppData/Roaming/$AppName/keychain.json" \
-Dcryptomator.showTrayIcon=true \
-Dcryptomator.buildNumber="msi-$revisionNo" \
-Dcryptomator.buildNumber="msi-${REVISION_NUM}" \
-Djavafx.verbose=true