MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

rename compressDir to archiveDir

Browse Source 
GitOrigin-RevId: ca53efa38e324a4cc990a1b5efe467ab5c5295e1
This commit is contained in:
Vladimir Krivosheev
2022-09-12 19:32:04 +02:00
committed by intellij-monorepo-bot
parent 491a99b536
commit e93a5c6b4d
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/tasks/src/org/jetbrains/intellij/build/io/zip.kt
View File

@@ -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<PathMatcher>? = emptyList()) {
fun archiveDir(startDir: Path, archiver: ZipArchiver, excludes: List<PathMatcher>? = emptyList()) {
val dirCandidates = ArrayDeque<Path>()
dirCandidates.add(startDir)
val tempList = ArrayList<Path>()

2
build/tasks/src/org/jetbrains/intellij/build/tasks/mergeJars.kt
View File

@@ -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<PathMatcher>::isNotEmpty))
archiveDir(normalizedDir, archiver, excludes = source.excludes.takeIf(List<PathMatcher>::isNotEmpty))
}
is InMemoryContentSource -> {

8
platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuiltInHelpPlugin.kt
View File

@@ -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<Stri
writeNewZip(assetJar, compress = true) { zipCreator ->
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)
}
}
}

2
platform/build-scripts/src/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.kt
View File

@@ -1105,7 +1105,7 @@ private suspend fun bulkZipWithPrefix(items: Collection<Pair<Path, Path>>, 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)