[build] Fix stdlib caches in the light distribution

Latest changes in the cache layout has added a new bitcode_deps file
to a cache directory. But a task building a light distribution
bundle doesn't handle this. So such files for stdlib and
kotlinx.cli are missing in the light distribution. This causes
failures when building platform libs and caches at the user side.

This patch fixes this issue by taking the new cache layout into
account in the bundle task.
This commit is contained in:
Ilya Matveev
2020-09-16 20:37:26 +07:00
committed by Ilya Matveev
parent 83b8240dbb
commit 2c821351df
+2 -5
View File
@@ -583,11 +583,8 @@ task bundleRegular(type: (isWindows()) ? Zip : Tar) {
exclude 'klib/testLibrary'
// Don't include platform libraries into the bundle (generate them at the user side instead).
exclude 'klib/platform'
exclude {
// Exclude platform libraries caches too.
!it.isDirectory() && it.relativePath.startsWithAny("klib/cache") &&
it.name != "libstdlib-cache.a" && it.name != "libkotlinx-cli-cache.a"
}
// Exclude platform libraries caches too. Keep caches for stdlib and endorsed libs.
exclude 'klib/cache/*/org.jetbrains.kotlin.native.platform.*/**'
into archiveBaseName
}
from(project.rootDir) {