mirror of
https://github.com/apple/pkl.git
synced 2026-05-04 22:24:43 +02:00
Add support for Windows (#492)
This adds support for Windows. The in-language path separator is still `/`, to ensure Pkl programs are cross-platform. Log lines are written using CRLF endings on Windows. Modules that are combined with `--module-output-separator` uses LF endings to ensure consistent rendering across platforms. `jpkl` does not work on Windows as a direct executable. However, it can work with `java -jar jpkl`. Additional details: * Adjust git settings for Windows * Add native executable for pkl cli * Add jdk17 windows Gradle check in CI * Adjust CI test reports to be staged within Gradle rather than by shell script. * Fix: encode more characters that are not safe Windows paths * Skip running tests involving symbolic links on Windows (these require administrator privileges to run). * Introduce custom implementation of `IoUtils.relativize` * Allow Gradle to initialize ExecutableJar `Property` values * Add Gradle flag to enable remote JVM debugging Co-authored-by: Philip K.F. Hölzenspies <holzensp@gmail.com>
This commit is contained in:
@@ -28,6 +28,9 @@ import org.junit.jupiter.api.AfterAll
|
||||
import org.junit.jupiter.api.AfterEach
|
||||
import org.junit.jupiter.api.Test
|
||||
import org.junit.jupiter.api.assertThrows
|
||||
import org.junit.jupiter.api.condition.DisabledOnOs
|
||||
import org.junit.jupiter.api.condition.EnabledOnOs
|
||||
import org.junit.jupiter.api.condition.OS
|
||||
import org.junit.jupiter.api.io.TempDir
|
||||
import org.junit.jupiter.params.ParameterizedTest
|
||||
import org.junit.jupiter.params.provider.EnumSource
|
||||
@@ -424,7 +427,10 @@ result = someLib.x
|
||||
checkOutputFile(outputFiles[0], "result.pcf", contents)
|
||||
}
|
||||
|
||||
// Can't reliably create symlinks on Windows.
|
||||
// Might get errors like "A required privilege is not held by the client".
|
||||
@Test
|
||||
@DisabledOnOs(OS.WINDOWS)
|
||||
fun `moduleDir is relative to workingDir even through symlinks`() {
|
||||
val contents = "foo = 42"
|
||||
val realWorkingDir = tempDir.resolve("workingDir").createDirectories()
|
||||
@@ -978,6 +984,56 @@ result = someLib.x
|
||||
.hasMessageContaining("resolve to the same file path")
|
||||
}
|
||||
|
||||
@Test
|
||||
@EnabledOnOs(OS.WINDOWS)
|
||||
fun `multiple-file output throws when using invalid Windows characters`() {
|
||||
val moduleUri =
|
||||
writePklFile(
|
||||
"test.pkl",
|
||||
"""
|
||||
output {
|
||||
files {
|
||||
["foo:bar"] { text = "bar" }
|
||||
}
|
||||
}
|
||||
"""
|
||||
.trimIndent()
|
||||
)
|
||||
|
||||
val options =
|
||||
CliEvaluatorOptions(
|
||||
CliBaseOptions(sourceModules = listOf(moduleUri), workingDir = tempDir),
|
||||
multipleFileOutputPath = ".output"
|
||||
)
|
||||
assertThatCode { evalToConsole(options) }
|
||||
.hasMessageContaining("Path spec `foo:bar` contains illegal character `:`.")
|
||||
}
|
||||
|
||||
@Test
|
||||
@EnabledOnOs(OS.WINDOWS)
|
||||
fun `multiple-file output - cannot use backslash as dir separator on Windows`() {
|
||||
val moduleUri =
|
||||
writePklFile(
|
||||
"test.pkl",
|
||||
"""
|
||||
output {
|
||||
files {
|
||||
["foo\\bar"] { text = "bar" }
|
||||
}
|
||||
}
|
||||
"""
|
||||
.trimIndent()
|
||||
)
|
||||
|
||||
val options =
|
||||
CliEvaluatorOptions(
|
||||
CliBaseOptions(sourceModules = listOf(moduleUri), workingDir = tempDir),
|
||||
multipleFileOutputPath = ".output"
|
||||
)
|
||||
assertThatCode { evalToConsole(options) }
|
||||
.hasMessageContaining("Path spec `foo\\bar` contains illegal character `\\`.")
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `evaluate output expression`() {
|
||||
val moduleUri =
|
||||
|
||||
@@ -24,6 +24,8 @@ import org.assertj.core.api.Assertions.assertThat
|
||||
import org.assertj.core.api.AssertionsForClassTypes.assertThatCode
|
||||
import org.junit.jupiter.api.Test
|
||||
import org.junit.jupiter.api.assertThrows
|
||||
import org.junit.jupiter.api.condition.DisabledOnOs
|
||||
import org.junit.jupiter.api.condition.OS
|
||||
import org.junit.jupiter.api.io.TempDir
|
||||
import org.pkl.cli.commands.EvalCommand
|
||||
import org.pkl.cli.commands.RootCommand
|
||||
@@ -54,7 +56,10 @@ class CliMainTest {
|
||||
assertThatCode { cmd.parse(arrayOf("eval")) }.hasMessage("""Missing argument "<modules>"""")
|
||||
}
|
||||
|
||||
// Can't reliably create symlinks on Windows.
|
||||
// Might get errors like "A required privilege is not held by the client".
|
||||
@Test
|
||||
@DisabledOnOs(OS.WINDOWS)
|
||||
fun `output to symlinked directory works`(@TempDir tempDir: Path) {
|
||||
val code =
|
||||
"""
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
*/
|
||||
package org.pkl.cli
|
||||
|
||||
import java.io.File
|
||||
import java.io.StringWriter
|
||||
import java.net.URI
|
||||
import java.nio.file.FileSystems
|
||||
@@ -27,6 +28,8 @@ import org.assertj.core.api.Assertions.assertThatCode
|
||||
import org.junit.jupiter.api.AfterAll
|
||||
import org.junit.jupiter.api.Test
|
||||
import org.junit.jupiter.api.assertThrows
|
||||
import org.junit.jupiter.api.condition.DisabledOnOs
|
||||
import org.junit.jupiter.api.condition.OS
|
||||
import org.junit.jupiter.api.io.TempDir
|
||||
import org.pkl.commons.cli.CliBaseOptions
|
||||
import org.pkl.commons.cli.CliException
|
||||
@@ -35,6 +38,7 @@ import org.pkl.commons.readString
|
||||
import org.pkl.commons.test.FileTestUtils
|
||||
import org.pkl.commons.test.PackageServer
|
||||
import org.pkl.commons.writeString
|
||||
import org.pkl.core.util.IoUtils
|
||||
|
||||
class CliProjectPackagerTest {
|
||||
companion object {
|
||||
@@ -690,7 +694,11 @@ class CliProjectPackagerTest {
|
||||
)
|
||||
}
|
||||
|
||||
// Absolute path imports on Windows must use an absolute URI (e.g. file:///C:/Foo/Bar), because
|
||||
// they must contain drive letters, which conflict with schemes.
|
||||
// We skip validation for absolute URIs, so effectively we skip this check on Windows.
|
||||
@Test
|
||||
@DisabledOnOs(OS.WINDOWS)
|
||||
fun `import path verification -- absolute import from root dir`(@TempDir tempDir: Path) {
|
||||
tempDir.writeFile(
|
||||
"main.pkl",
|
||||
@@ -738,6 +746,7 @@ class CliProjectPackagerTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
@DisabledOnOs(OS.WINDOWS)
|
||||
fun `import path verification -- absolute read from root dir`(@TempDir tempDir: Path) {
|
||||
tempDir.writeFile(
|
||||
"main.pkl",
|
||||
@@ -858,17 +867,18 @@ class CliProjectPackagerTest {
|
||||
consoleWriter = out
|
||||
)
|
||||
.run()
|
||||
val sep = File.separatorChar
|
||||
assertThat(out.toString())
|
||||
.isEqualTo(
|
||||
.isEqualToNormalizingNewlines(
|
||||
"""
|
||||
.out/project1@1.0.0/project1@1.0.0.zip
|
||||
.out/project1@1.0.0/project1@1.0.0.zip.sha256
|
||||
.out/project1@1.0.0/project1@1.0.0
|
||||
.out/project1@1.0.0/project1@1.0.0.sha256
|
||||
.out/project2@2.0.0/project2@2.0.0.zip
|
||||
.out/project2@2.0.0/project2@2.0.0.zip.sha256
|
||||
.out/project2@2.0.0/project2@2.0.0
|
||||
.out/project2@2.0.0/project2@2.0.0.sha256
|
||||
.out${sep}project1@1.0.0${sep}project1@1.0.0.zip
|
||||
.out${sep}project1@1.0.0${sep}project1@1.0.0.zip.sha256
|
||||
.out${sep}project1@1.0.0${sep}project1@1.0.0
|
||||
.out${sep}project1@1.0.0${sep}project1@1.0.0.sha256
|
||||
.out${sep}project2@2.0.0${sep}project2@2.0.0.zip
|
||||
.out${sep}project2@2.0.0${sep}project2@2.0.0.zip.sha256
|
||||
.out${sep}project2@2.0.0${sep}project2@2.0.0
|
||||
.out${sep}project2@2.0.0${sep}project2@2.0.0.sha256
|
||||
|
||||
"""
|
||||
.trimIndent()
|
||||
@@ -956,13 +966,14 @@ class CliProjectPackagerTest {
|
||||
consoleWriter = out
|
||||
)
|
||||
.run()
|
||||
val sep = File.separatorChar
|
||||
assertThat(out.toString())
|
||||
.isEqualTo(
|
||||
.isEqualToNormalizingNewlines(
|
||||
"""
|
||||
.out/mangos@1.0.0/mangos@1.0.0.zip
|
||||
.out/mangos@1.0.0/mangos@1.0.0.zip.sha256
|
||||
.out/mangos@1.0.0/mangos@1.0.0
|
||||
.out/mangos@1.0.0/mangos@1.0.0.sha256
|
||||
.out${sep}mangos@1.0.0${sep}mangos@1.0.0.zip
|
||||
.out${sep}mangos@1.0.0${sep}mangos@1.0.0.zip.sha256
|
||||
.out${sep}mangos@1.0.0${sep}mangos@1.0.0
|
||||
.out${sep}mangos@1.0.0${sep}mangos@1.0.0.sha256
|
||||
|
||||
"""
|
||||
.trimIndent()
|
||||
@@ -971,7 +982,7 @@ class CliProjectPackagerTest {
|
||||
|
||||
private fun Path.zipFilePaths(): List<String> {
|
||||
return FileSystems.newFileSystem(URI("jar:${toUri()}"), emptyMap<String, String>()).use { fs ->
|
||||
Files.walk(fs.getPath("/")).map { it.toString() }.collect(Collectors.toList())
|
||||
Files.walk(fs.getPath("/")).map(IoUtils::toNormalizedPathString).collect(Collectors.toList())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
*/
|
||||
package org.pkl.cli
|
||||
|
||||
import java.io.File
|
||||
import java.io.StringWriter
|
||||
import java.nio.file.Path
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
@@ -26,6 +27,7 @@ import org.pkl.commons.cli.CliBaseOptions
|
||||
import org.pkl.commons.cli.CliException
|
||||
import org.pkl.commons.test.FileTestUtils
|
||||
import org.pkl.commons.test.PackageServer
|
||||
import org.pkl.core.util.IoUtils
|
||||
|
||||
class CliProjectResolverTest {
|
||||
companion object {
|
||||
@@ -354,7 +356,7 @@ class CliProjectResolverTest {
|
||||
)
|
||||
assertThat(errOut.toString())
|
||||
.isEqualTo(
|
||||
"WARN: local dependency `package://localhost:0/fruit@1.0.0` was overridden to remote dependency `package://localhost:0/fruit@1.0.5`.\n"
|
||||
"WARN: local dependency `package://localhost:0/fruit@1.0.0` was overridden to remote dependency `package://localhost:0/fruit@1.0.5`.${IoUtils.getLineSeparator()}"
|
||||
)
|
||||
}
|
||||
|
||||
@@ -401,11 +403,12 @@ class CliProjectResolverTest {
|
||||
errWriter = errOut
|
||||
)
|
||||
.run()
|
||||
val sep = File.separatorChar
|
||||
assertThat(consoleOut.toString())
|
||||
.isEqualTo(
|
||||
.isEqualToNormalizingNewlines(
|
||||
"""
|
||||
$tempDir/project1/PklProject.deps.json
|
||||
$tempDir/project2/PklProject.deps.json
|
||||
$tempDir${sep}project1${sep}PklProject.deps.json
|
||||
$tempDir${sep}project2${sep}PklProject.deps.json
|
||||
|
||||
"""
|
||||
.trimIndent()
|
||||
|
||||
Reference in New Issue
Block a user