jlengrand/compose-multiplatform
1
0
Fork 0
mirror of https://github.com/jlengrand/compose-multiplatform.git synced 2026-03-10 08:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix passing relative path main jar to jpackage

Browse Source
This commit is contained in:
Alexey Tsvetkov
2023-04-04 13:59:55 +02:00
parent 8d78c4ac67
commit ddc300f0fe
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/files/fileUtils.kt
View File

@@ -108,5 +108,10 @@ internal fun File.checkExistingFile(): File =
internal val File.isJarFile: Boolean
get() = name.endsWith(".jar", ignoreCase = true) && isFile
internal fun File.normalizedPath() =
if (currentOS == OS.Windows) absolutePath.replace("\\", "\\\\") else absolutePath
internal fun File.normalizedPath(base: File? = null): String {
val path = base?.let { relativeToOrNull(it)?.path } ?: absolutePath
return when (currentOS) {
OS.Windows -> path.replace("\\", "\\\\")
else -> path
}
}

4
gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractJPackageTask.kt
View File

@@ -321,8 +321,8 @@ abstract class AbstractJPackageTask @Inject constructor(
val mappedJar = libsMapping[launcherMainJar.ioFile]?.singleOrNull()
?: error("Main jar was not processed correctly: ${launcherMainJar.ioFile}")
val mainJarRelative = (if (currentTarget.os == OS.Windows) "\\" else "/") + mappedJar.relativeTo(libsDir.ioFile).toString()
cliArg("--main-jar", mainJarRelative)
val mainJarPath = mappedJar.normalizedPath(base = libsDir.ioFile)
cliArg("--main-jar", mainJarPath)
cliArg("--main-class", launcherMainClass)
if (currentOS == OS.Windows) {