Commit a43e971b authored by Alexey Tsvetkov's avatar Alexey Tsvetkov

Fix build

parent ebb55205
...@@ -379,7 +379,7 @@ val createChecksums by project.tasks.registering(org.gradle.crypto.checksum.Chec ...@@ -379,7 +379,7 @@ val createChecksums by project.tasks.registering(org.gradle.crypto.checksum.Chec
val linkTask = project.tasks.named("linkRelease${target.capitalize()}") val linkTask = project.tasks.named("linkRelease${target.capitalize()}")
dependsOn(linkTask) dependsOn(linkTask)
files = linkTask.get().outputs.files.filter { it.isFile } + files = linkTask.get().outputs.files.filter { it.isFile } +
if (target == "windows") files("$skiaDir/out/Release-x64/icudtl.dat") else files() if (target == "windows") files(skiaDir.map { it.resolve("out/Release-x64/icudtl.dat") }) else files()
algorithm = Checksum.Algorithm.SHA256 algorithm = Checksum.Algorithm.SHA256
outputDir = file("$buildDir/checksums") outputDir = file("$buildDir/checksums")
} }
...@@ -392,7 +392,7 @@ val skikoJvmRuntimeJar by project.tasks.registering(Jar::class) { ...@@ -392,7 +392,7 @@ val skikoJvmRuntimeJar by project.tasks.registering(Jar::class) {
it.outputs.files.filter { it.isFile } it.outputs.files.filter { it.isFile }
}) })
if (target == "windows") { if (target == "windows") {
from(files("$skiaDir/out/Release-x64/icudtl.dat")) from(files(skiaDir.map { it.resolve("out/Release-x64/icudtl.dat") }))
} }
from(createChecksums.get().outputs.files) from(createChecksums.get().outputs.files)
} }
...@@ -516,8 +516,7 @@ class SkikoProperties(private val myProject: Project) { ...@@ -516,8 +516,7 @@ class SkikoProperties(private val myProject: Project) {
get() = myProject.property("dependencies.skija.git.commit") as String get() = myProject.property("dependencies.skija.git.commit") as String
val skiaReleaseForCurrentOS: String val skiaReleaseForCurrentOS: String
get() = (myProject.property("dependencies.skia.release.pattern") as String) get() = (myProject.property("dependencies.skia.$target") as String)
.replace("<TARGET_OS>", target)
val visualStudioBuildToolsDir: File? val visualStudioBuildToolsDir: File?
get() = System.getenv()["SKIKO_VSBT_PATH"]?.let { File(it) }?.takeIf { it.isDirectory } get() = System.getenv()["SKIKO_VSBT_PATH"]?.let { File(it) }?.takeIf { it.isDirectory }
......
kotlin.code.style=official kotlin.code.style=official
deploy.version=0.1 deploy.version=0.1
dependencies.skija.git.commit=c3faf18878a0ad3244e4119a69b555b5b77a21d0 dependencies.skija.git.commit=c3faf18878a0ad3244e4119a69b555b5b77a21d0
dependencies.skia.release.pattern=Skia-85-<TARGET_OS>-Release-x64 dependencies.skia.windows= Skia-85-windows-Release-x64
\ No newline at end of file dependencies.skia.linux=Skia-m85-linux-Release-x64
dependencies.skia.macos=Skia-85-macos-Release-x64
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment