MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-149716 cleanup

Browse Source 
GitOrigin-RevId: 3f94c11e7f898f907b40a333d3b0f6b437ef3901
This commit is contained in:
Vladimir Krivosheev
2024-05-15 09:00:46 +02:00
committed by intellij-monorepo-bot
parent 01f0a08374
commit 8943e52acf
7 changed files with 8 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build/src/OpenSourceCommunityInstallersBuildTarget.kt
View File

@@ -2,11 +2,14 @@
import com.intellij.platform.diagnostic.telemetry.helpers.useWithScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking
import org.jetbrains.intellij.build.*
import org.jetbrains.intellij.build.BuildOptions
import org.jetbrains.intellij.build.CompilationTasks
import org.jetbrains.intellij.build.TraceManager.spanBuilder
import org.jetbrains.intellij.build.buildCommunityStandaloneJpsBuilder
import org.jetbrains.intellij.build.createCommunityBuildContext
import org.jetbrains.intellij.build.impl.buildDistributions
object OpenSourceCommunityInstallersBuildTarget {
internal object OpenSourceCommunityInstallersBuildTarget {
@JvmStatic
fun main(args: Array<String>) {
val options = BuildOptions().apply {
@@ -19,7 +22,7 @@ object OpenSourceCommunityInstallersBuildTarget {
runBlocking(Dispatchers.Default) {
val context = createCommunityBuildContext(options)
createBuildTasks(context).compileProjectAndTests(listOf("intellij.platform.jps.build.tests"))
CompilationTasks.create(context).compileModules(moduleNames = null, includingTestsInModules = listOf("intellij.platform.jps.build.tests"))
buildDistributions(context)
spanBuilder("build standalone JPS").useWithScope {
buildCommunityStandaloneJpsBuilder(targetDir = context.paths.artifactDir.resolve("jps"), context = context)

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

@@ -22,13 +22,5 @@ interface BuildTasks {
*/
suspend fun buildNonBundledPlugins(mainPluginModules: List<String>)
fun compileProjectAndTests(includingTestsInModules: List<String>)
fun compileModules(moduleNames: Collection<String>?, includingTestsInModules: List<String>)
fun compileModules(moduleNames: Collection<String>?) {
compileModules(moduleNames = moduleNames, includingTestsInModules = java.util.List.of())
}
suspend fun buildUnpackedDistribution(targetDirectory: Path, includeBinAndRuntime: Boolean)
}

1
platform/build-scripts/src/org/jetbrains/intellij/build/CompilationContext.kt
View File

@@ -65,7 +65,6 @@ interface CompilationContext {
interface CompilationTasks {
companion object {
@JvmStatic
fun create(context: CompilationContext): CompilationTasks = CompilationTasksImpl(context)
}

4
platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildContextImpl.kt
View File

@@ -173,9 +173,7 @@ class BuildContextImpl internal constructor(
}
override val bundledPluginModules: List<String>
get() {
return bundledPluginModulesForModularLoader ?: productProperties.productLayout.bundledPluginModules
}
get() = bundledPluginModulesForModularLoader ?: productProperties.productLayout.bundledPluginModules
private val bundledPluginModulesForModularLoader by lazy {
productProperties.rootModuleForModularLoader?.let { rootModule ->

12
platform/build-scripts/src/org/jetbrains/intellij/build/impl/BuildTasksImpl.kt
View File

@@ -85,18 +85,6 @@ internal class BuildTasksImpl(private val context: BuildContextImpl) : BuildTask
)
}
override fun compileProjectAndTests(includingTestsInModules: List<String>) {
compileModules(moduleNames = null, includingTestsInModules = includingTestsInModules)
}
override fun compileModules(moduleNames: Collection<String>?, includingTestsInModules: List<String>) {
CompilationTasks.create(context).compileModules(moduleNames, includingTestsInModules)
}
override fun compileModules(moduleNames: Collection<String>?) {
CompilationTasks.create(context).compileModules(moduleNames)
}
override suspend fun buildUnpackedDistribution(targetDirectory: Path, includeBinAndRuntime: Boolean) {
val currentOs = OsFamily.currentOs
context.paths.distAllDir = targetDirectory

1
platform/build-scripts/src/org/jetbrains/intellij/build/searchableOptions.kt
View File

@@ -11,7 +11,6 @@ import kotlinx.serialization.Serializable
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.decodeFromStream
import org.jetbrains.intellij.build.impl.BundledMavenDownloader
import org.jetbrains.intellij.build.impl.getLocalizationDir
import org.jetbrains.intellij.build.productRunner.IntellijProductRunner
import java.nio.file.Files
import java.nio.file.Path

2
python/build/src/org/jetbrains/intellij/build/pycharm/PyCharmPropertiesBase.kt
View File

@@ -5,7 +5,7 @@ import org.jetbrains.intellij.build.BuildContext
import org.jetbrains.intellij.build.JetBrainsProductProperties
import org.jetbrains.intellij.build.TEST_FRAMEWORK_WITH_JAVA_RT
import org.jetbrains.intellij.build.impl.copyDirWithFileFilter
import org.jetbrains.intellij.build.impl.zipSourcesOfModules
import org.jetbrains.intellij.build.zipSourcesOfModules
import java.nio.file.Path
import java.util.function.Predicate