prefer to use module output dir as is without packing into jar — reduce IO and reduce write operations

GitOrigin-RevId: 3c086a59614c7adaa89f67c90d7796bedd75394d
This commit is contained in:
Vladimir Krivosheev
2024-01-31 11:47:31 +01:00
committed by intellij-monorepo-bot
parent 1742d30135
commit c8910659b4
39 changed files with 1145 additions and 896 deletions

View File

@@ -1,4 +1,4 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.intellij.build.pycharm
import kotlinx.collections.immutable.persistentMapOf
@@ -6,7 +6,7 @@ import kotlinx.collections.immutable.persistentSetOf
import kotlinx.collections.immutable.plus
import org.jetbrains.intellij.build.*
import org.jetbrains.intellij.build.impl.PluginLayout
import org.jetbrains.intellij.build.io.copyFileToDir
import java.nio.file.Files
import java.nio.file.Path
@@ -61,10 +61,9 @@ class PyCharmCommunityProperties(private val communityHome: Path) : PyCharmPrope
override fun copyAdditionalFilesBlocking(context: BuildContext, targetDirectory: String) {
super.copyAdditionalFilesBlocking(context, targetDirectory)
FileSet(context.paths.communityHomeDir)
.include("LICENSE.txt")
.include("NOTICE.txt")
.copyToDir(Path.of(targetDirectory, "license"))
val targetDir = Path.of(targetDirectory, "license")
copyFileToDir(context.paths.communityHomeDir.resolve("LICENSE.txt"), targetDir)
copyFileToDir(context.paths.communityHomeDir.resolve("NOTICE.txt"), targetDir)
}
override fun getSystemSelector(appInfo: ApplicationInfoProperties, buildNumber: String): String {

View File

@@ -1,8 +1,13 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.intellij.build.pycharm
import org.jetbrains.intellij.build.*
import org.jetbrains.intellij.build.BuildContext
import org.jetbrains.intellij.build.BuildTasks
import org.jetbrains.intellij.build.JetBrainsProductProperties
import org.jetbrains.intellij.build.TEST_FRAMEWORK_WITH_JAVA_RT
import org.jetbrains.intellij.build.impl.copyDirWithFileFilter
import java.nio.file.Path
import java.util.function.Predicate
const val PYDEVD_PACKAGE: String = "pydevd_package"
@@ -27,10 +32,12 @@ abstract class PyCharmPropertiesBase : JetBrainsProductProperties() {
val tasks = BuildTasks.create(context)
tasks.zipSourcesOfModulesBlocking(listOf("intellij.python.community", "intellij.python.psi"), Path.of("$targetDirectory/lib/src/pycharm-openapi-src.zip"))
FileSet(Path.of(getKeymapReferenceDirectory(context)))
.include("*.pdf")
.copyToDir(Path.of(targetDirectory, "help"))
copyDirWithFileFilter(
fromDir = getKeymapReferenceDirectory(context),
targetDir = Path.of(targetDirectory, "help"),
fileFilter = Predicate { it.toString().endsWith(".pdf") }
)
}
open fun getKeymapReferenceDirectory(context: BuildContext) = "${context.paths.projectHome}/python/help"
open fun getKeymapReferenceDirectory(context: BuildContext): Path = context.paths.projectHome.resolve("python/help")
}