azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Wasm] Use jsshell version in zip and directory names

Browse Source 
Otherwise, it wouldn't rerun the task when downloading new version
This commit is contained in:
Svyatoslav Kuzmich
2023-03-06 17:20:22 +01:00
committed by Space Team
parent 60b8d2b3d9
commit 1603cd11ea
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wasm/wasm.tests/build.gradle.kts
+4 -3
View File
@@ -90,7 +90,8 @@ val currentOsType = run {
OsType(osName, osArch) OsType(osName, osArch)
} }
val jsShellDirectory = "https://archive.mozilla.org/pub/firefox/nightly/2023/03/2023-03-04-09-52-24-mozilla-central" val jsShellVersion = "2023-03-04-09-52-24-mozilla-central"
val jsShellDirectory = "https://archive.mozilla.org/pub/firefox/nightly/2023/03/$jsShellVersion"
val jsShellSuffix = when (currentOsType) { val jsShellSuffix = when (currentOsType) {
OsType(OsName.LINUX, OsArch.X86_32) -> "linux-i686" OsType(OsName.LINUX, OsArch.X86_32) -> "linux-i686"
OsType(OsName.LINUX, OsArch.X86_64) -> "linux-x86_64" OsType(OsName.LINUX, OsArch.X86_64) -> "linux-x86_64"
@@ -106,14 +107,14 @@ val downloadedTools = File(buildDir, "tools")
val downloadJsShell by task<Download> { val downloadJsShell by task<Download> {
src(jsShellLocation) src(jsShellLocation)
dest(File(downloadedTools, "jsshell-$jsShellSuffix.zip")) dest(File(downloadedTools, "jsshell-$jsShellSuffix-$jsShellVersion.zip"))
overwrite(false) overwrite(false)
} }
val unzipJsShell by task<Copy> { val unzipJsShell by task<Copy> {
dependsOn(downloadJsShell) dependsOn(downloadJsShell)
from(zipTree(downloadJsShell.get().dest)) from(zipTree(downloadJsShell.get().dest))
val unpackedDir = File(downloadedTools, "jsshell-$jsShellSuffix") val unpackedDir = File(downloadedTools, "jsshell-$jsShellSuffix-$jsShellVersion")
into(unpackedDir) into(unpackedDir)
} }