Skip to content

Commit

Permalink
Fix wix toolset download duplication (#3882)
Browse files Browse the repository at this point in the history
Fixes #3876
  • Loading branch information
eymar authored Nov 16, 2023
1 parent 89f21eb commit 62d9dcd
Showing 1 changed file with 9 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,18 @@ internal fun JvmApplicationContext.configureWix() {
val fileName = "wix311"
val zipFile = wixDir.resolve("$fileName.zip")
val unzipDir = root.layout.buildDirectory.dir(fileName)
val download = root.tasks.maybeCreate(DOWNLOAD_WIX_TOOLSET_TASK_NAME, Download::class.java).apply {
val download = root.tasks.findByName(DOWNLOAD_WIX_TOOLSET_TASK_NAME) ?: root.tasks.maybeCreate(
DOWNLOAD_WIX_TOOLSET_TASK_NAME,
Download::class.java
).apply {
onlyIf { !zipFile.isFile }
src("https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311-binaries.zip")
dest(zipFile)
}
val unzip = root.tasks.maybeCreate(UNZIP_WIX_TOOLSET_TASK_NAME, Copy::class.java).apply {
val unzip = root.tasks.findByName(UNZIP_WIX_TOOLSET_TASK_NAME) ?: root.tasks.maybeCreate(
UNZIP_WIX_TOOLSET_TASK_NAME,
Copy::class.java
).apply {
dependsOn(download)
from(project.zipTree(zipFile))
destinationDir = unzipDir.ioFile
Expand All @@ -61,4 +67,4 @@ private fun Project.eachWindowsPackageTask(fn: AbstractJPackageTask.() -> Unit)
packageTask.fn()
}
}
}
}

0 comments on commit 62d9dcd

Please sign in to comment.