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

IJI-1571 Code cleanup

Browse Source 
GitOrigin-RevId: b8ee4a240cb63dde31bda21588ca62f173cd2f1b
This commit is contained in:
Mikhail Filippov
2024-02-12 13:18:59 +04:00
committed by intellij-monorepo-bot
parent 56c46e4945
commit 3fe952d47c
14 changed files with 29 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build/src/CommunityRunTestsBuildTarget.kt
View File

@@ -1,7 +1,7 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking
import org.jetbrains.intellij.build.IdeaProjectLoaderUtil
import org.jetbrains.intellij.build.BuildPaths.Companion.COMMUNITY_ROOT
import org.jetbrains.intellij.build.TestingTasks
import org.jetbrains.intellij.build.impl.createCompilationContext
@@ -17,11 +17,10 @@ import org.jetbrains.intellij.build.impl.createCompilationContext
object CommunityRunTestsBuildTarget {
@JvmStatic
fun main(args: Array<String>) {
val communityHome = IdeaProjectLoaderUtil.guessCommunityHome(javaClass)
runBlocking(Dispatchers.Default) {
val context = createCompilationContext(
projectHome = communityHome.communityRoot,
defaultOutputRoot = communityHome.communityRoot.resolve("out/tests")
projectHome = COMMUNITY_ROOT.communityRoot,
defaultOutputRoot = COMMUNITY_ROOT.communityRoot.resolve("out/tests")
)
TestingTasks.create(context).runTests(defaultMainModule = "intellij.idea.community.main")
}

4
build/src/FullUpdaterBuildTarget.kt
View File

@@ -2,7 +2,7 @@
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking
import org.jetbrains.intellij.build.IdeaProjectLoaderUtil
import org.jetbrains.intellij.build.BuildPaths.Companion.COMMUNITY_ROOT
import org.jetbrains.intellij.build.createBuildTasks
import org.jetbrains.intellij.build.createCommunityBuildContext
@@ -12,7 +12,7 @@ object FullUpdaterBuildTarget {
@JvmStatic
fun main(args: Array<String>) {
runBlocking(Dispatchers.Default) {
val context = createCommunityBuildContext(IdeaProjectLoaderUtil.guessCommunityHome(javaClass))
val context = createCommunityBuildContext()
val tasks = createBuildTasks(context)
tasks.compileModules(listOf(UPDATER_MODULE_NAME))
tasks.buildFullUpdaterJar()

7
build/src/KotlinPluginBuildTarget.kt
View File

@@ -2,17 +2,16 @@
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking
import org.jetbrains.intellij.build.BuildPaths.Companion.COMMUNITY_ROOT
import org.jetbrains.intellij.build.IdeaCommunityProperties
import org.jetbrains.intellij.build.IdeaProjectLoaderUtil
import org.jetbrains.intellij.build.kotlin.KotlinPluginBuilder
internal object KotlinPluginBuildTarget {
@JvmStatic
fun main(args: Array<String>) {
val communityHome = IdeaProjectLoaderUtil.guessCommunityHome(javaClass)
runBlocking(Dispatchers.Default) {
KotlinPluginBuilder.build(home = communityHome.communityRoot,
properties = IdeaCommunityProperties(communityHome.communityRoot))
KotlinPluginBuilder.build(home = COMMUNITY_ROOT.communityRoot,
properties = IdeaCommunityProperties(COMMUNITY_ROOT.communityRoot))
}
}
}

4
build/src/OpenSourceCommunityInstallersBuildTarget.kt
View File

@@ -20,10 +20,8 @@ object OpenSourceCommunityInstallersBuildTarget {
buildStepsToSkip += BuildOptions.MAC_SIGN_STEP
}
val communityHome = IdeaProjectLoaderUtil.guessCommunityHome(javaClass)
runBlocking(Dispatchers.Default) {
val context = createCommunityBuildContext(communityHome, options)
val context = createCommunityBuildContext(options)
createBuildTasks(context).compileProjectAndTests(listOf("intellij.platform.jps.build.tests"))
buildDistributions(context)
spanBuilder("build standalone JPS").useWithScope {

7
build/src/OpenSourceCommunityUpdateFromSourcesBuildTarget.kt
View File

@@ -4,7 +4,7 @@ import com.intellij.util.SystemProperties
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking
import org.jetbrains.intellij.build.BuildOptions
import org.jetbrains.intellij.build.IdeaProjectLoaderUtil
import org.jetbrains.intellij.build.BuildPaths.Companion.COMMUNITY_ROOT
import org.jetbrains.intellij.build.createBuildTasks
import org.jetbrains.intellij.build.createCommunityBuildContext
import java.nio.file.Path
@@ -25,13 +25,12 @@ object OpenSourceCommunityUpdateFromSourcesBuildTarget {
options.buildStepsToSkip.add(BuildOptions.NON_BUNDLED_PLUGINS_STEP)
}
val communityHome = IdeaProjectLoaderUtil.guessCommunityHome(javaClass)
val distOutputRelativePath = System.getProperty("distOutputRelativePath")!!
// when IDEA CE is updated from IDEA, a UE sources project should be loaded from IDEA UE directory
val projectHome = System.getProperty("devIdeaHome")?.let { Path.of(it) } ?: communityHome.communityRoot
val projectHome = System.getProperty("devIdeaHome")?.let { Path.of(it) } ?: COMMUNITY_ROOT.communityRoot
runBlocking(Dispatchers.Default) {
createBuildTasks(context = createCommunityBuildContext(communityHome = communityHome, options = options, projectHome = projectHome))
createBuildTasks(context = createCommunityBuildContext(options = options, projectHome = projectHome))
.buildUnpackedDistribution(targetDirectory = options.outRootDir!!.resolve(distOutputRelativePath), includeBinAndRuntime = false)
}
}

8
build/src/org/jetbrains/intellij/build/IdeaCommunityProperties.kt
View File

@@ -3,21 +3,19 @@ package org.jetbrains.intellij.build
import kotlinx.collections.immutable.persistentListOf
import kotlinx.collections.immutable.plus
import org.jetbrains.intellij.build.dependencies.BuildDependenciesCommunityRoot
import org.jetbrains.intellij.build.BuildPaths.Companion.COMMUNITY_ROOT
import org.jetbrains.intellij.build.impl.BuildContextImpl
import org.jetbrains.intellij.build.io.copyDir
import org.jetbrains.intellij.build.io.copyFileToDir
import org.jetbrains.intellij.build.kotlin.KotlinBinaries
import java.nio.file.Path
internal suspend fun createCommunityBuildContext(
communityHome: BuildDependenciesCommunityRoot,
options: BuildOptions = BuildOptions(),
projectHome: Path = communityHome.communityRoot,
projectHome: Path = COMMUNITY_ROOT.communityRoot,
): BuildContext {
return BuildContextImpl.createContext(projectHome = projectHome,
productProperties = IdeaCommunityProperties(communityHome.communityRoot),
productProperties = IdeaCommunityProperties(COMMUNITY_ROOT.communityRoot),
setupTracer = true,
options = options)
}

8
build/tests/testSrc/org/jetbrains/intellij/build/IdeaCommunityBuildTest.kt
View File

@@ -7,6 +7,7 @@ import com.intellij.platform.buildScripts.testFramework.runTestBuild
import com.intellij.platform.buildScripts.testFramework.spanName
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking
import org.jetbrains.intellij.build.BuildPaths.Companion.COMMUNITY_ROOT
import org.jetbrains.intellij.build.impl.BuildContextImpl
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.TestInfo
@@ -15,12 +16,10 @@ class IdeaCommunityBuildTest {
@Test
fun build(testInfo: TestInfo) {
val homePath = PathManager.getHomeDirFor(javaClass)!!
val communityHomePath = IdeaProjectLoaderUtil.guessCommunityHome(javaClass)
val productProperties = IdeaCommunityProperties(communityHomePath.communityRoot)
val productProperties = IdeaCommunityProperties(COMMUNITY_ROOT.communityRoot)
runTestBuild(
homePath = homePath,
traceSpanName = testInfo.spanName,
communityHomePath = communityHomePath,
productProperties = productProperties,
) {
it.classOutDir = System.getProperty(BuildOptions.PROJECT_CLASSES_OUTPUT_DIRECTORY_PROPERTY) ?: "$homePath/out/classes"
@@ -30,9 +29,8 @@ class IdeaCommunityBuildTest {
@Test
fun jpsStandalone(testInfo: TestInfo) {
val homePath = PathManager.getHomeDirFor(javaClass)!!
val communityHome = IdeaProjectLoaderUtil.guessCommunityHome(javaClass)
runBlocking(Dispatchers.Default) {
val productProperties = IdeaCommunityProperties(communityHome.communityRoot)
val productProperties = IdeaCommunityProperties(COMMUNITY_ROOT.communityRoot)
val options = createBuildOptionsForTest(productProperties = productProperties, skipDependencySetup = true)
val context = BuildContextImpl.createContext(
projectHome = homePath,

4
platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/IdeStructureTestBase.kt
View File

@@ -9,7 +9,6 @@ import kotlinx.coroutines.runBlocking
import org.assertj.core.api.SoftAssertions
import org.assertj.core.api.junit.jupiter.SoftAssertionsExtension
import org.jetbrains.intellij.build.BuildContext
import org.jetbrains.intellij.build.IdeaProjectLoaderUtil
import org.jetbrains.intellij.build.ProductProperties
import org.jetbrains.intellij.build.ProprietaryBuildTools
import org.jetbrains.intellij.build.impl.ModuleStructureValidator
@@ -36,8 +35,7 @@ abstract class IdeStructureTestBase {
return runBlocking(Dispatchers.Default) {
createBuildContext(homePath = projectHome,
productProperties = productProperties,
buildTools = createBuildTools(),
communityHomePath = IdeaProjectLoaderUtil.guessCommunityHome(javaClass))
buildTools = createBuildTools())
}
}

3
platform/build-scripts/testFramework/src/com/intellij/platform/buildScripts/testFramework/buildScriptTestUtils.kt
View File

@@ -19,7 +19,6 @@ import kotlinx.coroutines.runBlocking
import org.assertj.core.api.SoftAssertions
import org.jetbrains.intellij.build.*
import org.jetbrains.intellij.build.TraceManager.spanBuilder
import org.jetbrains.intellij.build.dependencies.BuildDependenciesCommunityRoot
import org.jetbrains.intellij.build.impl.BuildContextImpl
import org.jetbrains.intellij.build.impl.buildDistributions
import org.junit.jupiter.api.TestInfo
@@ -71,7 +70,6 @@ suspend inline fun createBuildContext(
homePath: Path,
productProperties: ProductProperties,
buildTools: ProprietaryBuildTools = ProprietaryBuildTools.DUMMY,
communityHomePath: BuildDependenciesCommunityRoot,
buildOptionsCustomizer: (BuildOptions) -> Unit = {},
): BuildContext {
val options = createBuildOptionsForTest(productProperties)
@@ -106,7 +104,6 @@ fun runTestBuild(
homePath: Path,
productProperties: ProductProperties,
buildTools: ProprietaryBuildTools = ProprietaryBuildTools.DUMMY,
communityHomePath: BuildDependenciesCommunityRoot = BuildDependenciesCommunityRoot(homePath.resolve("community")),
traceSpanName: String,
isReproducibilityTestAllowed: Boolean = true,
build: suspend (context: BuildContext) -> Unit = { buildDistributions(it) },

6
platform/build-scripts/tests/testSrc/org/jetbrains/intellij/build/PluginDistributionJARsBuilderTest.kt
View File

@@ -4,6 +4,7 @@ package org.jetbrains.intellij.build
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking
import org.assertj.core.api.Assertions.assertThat
import org.jetbrains.intellij.build.BuildPaths.Companion.COMMUNITY_ROOT
import org.jetbrains.intellij.build.impl.BuildContextImpl
import org.jetbrains.intellij.build.impl.createIdeClassPath
import org.jetbrains.intellij.build.impl.createPlatformLayout
@@ -12,10 +13,9 @@ import org.junit.Test
class PluginDistributionJARsBuilderTest {
@Test
fun verifyStableClasspathOrder() {
val communityHome = IdeaProjectLoaderUtil.guessCommunityHome(javaClass)
val productProperties = IdeaCommunityProperties(communityHome.communityRoot)
val productProperties = IdeaCommunityProperties(COMMUNITY_ROOT.communityRoot)
runBlocking(Dispatchers.Default) {
val context = BuildContextImpl.createContext(communityHome.communityRoot, productProperties)
val context = BuildContextImpl.createContext(COMMUNITY_ROOT.communityRoot, productProperties)
val ideClasspath1 = createIdeClassPath(createPlatformLayout(pluginsToPublish = emptySet(), context = context), context)
val ideClasspath2 = createIdeClassPath(createPlatformLayout(pluginsToPublish = emptySet(), context = context), context)
assertThat(ideClasspath1).isEqualTo(ideClasspath2)

4
platform/build-scripts/tests/testSrc/org/jetbrains/intellij/build/impl/BundledRuntimeTest.kt
View File

@@ -6,6 +6,7 @@ import com.intellij.openapi.util.io.NioFiles
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking
import org.jetbrains.intellij.build.*
import org.jetbrains.intellij.build.BuildPaths.Companion.COMMUNITY_ROOT
import org.jetbrains.intellij.build.dependencies.JdkDownloader
import org.junit.Test
import java.nio.file.Files
@@ -66,9 +67,8 @@ class BundledRuntimeTest {
private inline fun withCompilationContext(block: (CompilationContext) -> Unit) {
val tempDir = Files.createTempDirectory("compilation-context-")
try {
val communityHome = IdeaProjectLoaderUtil.guessCommunityHome(javaClass)
val context = createCompilationContextBlocking(
projectHome = communityHome.communityRoot,
projectHome = COMMUNITY_ROOT.communityRoot,
defaultOutputRoot = tempDir,
)
block(context)

7
python/build/src/PyCharmCommunityInstallersBuildTarget.kt
View File

@@ -4,7 +4,7 @@
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking
import org.jetbrains.intellij.build.BuildOptions
import org.jetbrains.intellij.build.IdeaProjectLoaderUtil
import org.jetbrains.intellij.build.BuildPaths.Companion.COMMUNITY_ROOT
import org.jetbrains.intellij.build.createBuildTasks
import org.jetbrains.intellij.build.impl.BuildContextImpl
import org.jetbrains.intellij.build.pycharm.PyCharmBuildUtils
@@ -29,10 +29,9 @@ object PyCharmCommunityInstallersBuildTarget {
PyCharmBuildUtils.SKELETONS_COPY_STEP,
))
}
val communityHome = IdeaProjectLoaderUtil.guessCommunityHome(PyCharmCommunityInstallersBuildTarget::class.java)
val context = BuildContextImpl.createContext(
projectHome = communityHome.communityRoot,
productProperties = PyCharmCommunityProperties(communityHome.communityRoot),
projectHome = COMMUNITY_ROOT.communityRoot,
productProperties = PyCharmCommunityProperties(COMMUNITY_ROOT.communityRoot),
options = options,
)
createBuildTasks(context).buildDistributions()

4
python/build/src/PythonCommunityPluginBuildTarget.kt
View File

@@ -3,13 +3,13 @@
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking
import org.jetbrains.intellij.build.IdeaProjectLoaderUtil
import org.jetbrains.intellij.build.BuildPaths.Companion.COMMUNITY_ROOT
import org.jetbrains.intellij.build.pycharm.PythonCommunityPluginBuilder
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
object PythonCommunityPluginBuildTarget {
@JvmStatic
fun main(args: Array<String>) = runBlocking(Dispatchers.Default) {
PythonCommunityPluginBuilder(IdeaProjectLoaderUtil.guessCommunityHome(javaClass).communityRoot).build()
PythonCommunityPluginBuilder(COMMUNITY_ROOT.communityRoot).build()
}
}

1
python/build/testSrc/org/jetbrains/intellij/build/pycharm/PyCharmCommunityBuildTest.kt
View File

@@ -42,7 +42,6 @@ class PyCharmCommunityBuildTest {
val communityHomePath = BuildDependenciesCommunityRoot(homePath.resolve("community"))
runTestBuild(
homePath = communityHomePath.communityRoot,
communityHomePath = communityHomePath,
traceSpanName = testInfo.spanName,
productProperties = PyCharmCommunityProperties(communityHomePath.communityRoot),
) {