diff --git a/build/tasks/src/org/jetbrains/intellij/build/io/zip.kt b/build/tasks/src/org/jetbrains/intellij/build/io/zip.kt index 54a41a96875c..c06ddea7bfa9 100644 --- a/build/tasks/src/org/jetbrains/intellij/build/io/zip.kt +++ b/build/tasks/src/org/jetbrains/intellij/build/io/zip.kt @@ -79,7 +79,7 @@ else { for ((dir, prefix) in dirs.entries) { val normalizedDir = dir.toAbsolutePath().normalize() archiver.setRootDir(normalizedDir, prefix) - compressDir(normalizedDir, archiver, excludes = null) + archiveDir(normalizedDir, archiver, excludes = null) } for (dir in dirNameSetToAdd) { @@ -127,7 +127,7 @@ class ZipArchiver(private val zipCreator: ZipFileWriter, val fileAdded: ((String } } -fun compressDir(startDir: Path, archiver: ZipArchiver, excludes: List? = emptyList()) { +fun archiveDir(startDir: Path, archiver: ZipArchiver, excludes: List? = emptyList()) { val dirCandidates = ArrayDeque() dirCandidates.add(startDir) val tempList = ArrayList() diff --git a/build/tasks/src/org/jetbrains/intellij/build/tasks/mergeJars.kt b/build/tasks/src/org/jetbrains/intellij/build/tasks/mergeJars.kt index 51fe59a48113..55ae64aa8588 100644 --- a/build/tasks/src/org/jetbrains/intellij/build/tasks/mergeJars.kt +++ b/build/tasks/src/org/jetbrains/intellij/build/tasks/mergeJars.kt @@ -109,7 +109,7 @@ fun buildJar(targetFile: Path, }) val normalizedDir = source.dir.toAbsolutePath().normalize() archiver.setRootDir(normalizedDir, source.prefix) - compressDir(normalizedDir, archiver, excludes = source.excludes.takeIf(List::isNotEmpty)) + archiveDir(normalizedDir, archiver, excludes = source.excludes.takeIf(List::isNotEmpty)) } is InMemoryContentSource -> { diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuiltInHelpPlugin.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuiltInHelpPlugin.kt index 1a264ad56f83..ed1148b0dfdc 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuiltInHelpPlugin.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuiltInHelpPlugin.kt @@ -7,7 +7,7 @@ import org.jetbrains.intellij.build.BuildContext import org.jetbrains.intellij.build.CompilationContext import org.jetbrains.intellij.build.TraceManager.spanBuilder import org.jetbrains.intellij.build.io.ZipArchiver -import org.jetbrains.intellij.build.io.compressDir +import org.jetbrains.intellij.build.io.archiveDir import org.jetbrains.intellij.build.io.writeNewZip import java.nio.file.Files import java.nio.file.Path @@ -89,9 +89,9 @@ private fun buildResourcesForHelpPlugin(resourceRoot: Path, classPath: List val archiver = ZipArchiver(zipCreator) archiver.setRootDir(resourceRoot) - compressDir(resourceRoot.resolve("topics"), archiver) - compressDir(resourceRoot.resolve("images"), archiver) - compressDir(resourceRoot.resolve("search"), archiver) + archiveDir(resourceRoot.resolve("topics"), archiver) + archiveDir(resourceRoot.resolve("images"), archiver) + archiveDir(resourceRoot.resolve("search"), archiver) } } } \ No newline at end of file diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.kt index 67d665b16026..1a242a1e7c08 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.kt @@ -1105,7 +1105,7 @@ private suspend fun bulkZipWithPrefix(items: Collection>, compr ZipArchiver(zipCreator).use { archiver -> if (Files.isDirectory(item.first)) { archiver.setRootDir(item.first, item.first.fileName.toString()) - compressDir(startDir = item.first, archiver = archiver, excludes = null) + archiveDir(startDir = item.first, archiver = archiver, excludes = null) } else { archiver.setRootDir(item.first.parent)