Fix passing relative path main jar to jpackage

JetBrains · Apr 4, 2023 · ddc300f · ddc300f
1 parent 8d78c4a
commit ddc300f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/...ose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/files/fileUtils.kt b/...ose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/files/fileUtils.kt
@@ -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
+    }
+}
diff --git a/...e/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractJPackageTask.kt b/...e/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractJPackageTask.kt
@@ -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) {