diff --git a/.idea/modules.xml b/.idea/modules.xml index 4879951d7443..654b874aaca3 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -716,7 +716,6 @@ - @@ -760,6 +759,7 @@ + diff --git a/build/src/org/jetbrains/intellij/build/IdeaCommunityProperties.kt b/build/src/org/jetbrains/intellij/build/IdeaCommunityProperties.kt index 613f94b4169e..d1f051f76ddd 100644 --- a/build/src/org/jetbrains/intellij/build/IdeaCommunityProperties.kt +++ b/build/src/org/jetbrains/intellij/build/IdeaCommunityProperties.kt @@ -48,7 +48,7 @@ open class IdeaCommunityProperties(private val communityHomeDir: Path) : BaseIde buildCrossPlatformDistribution = true productLayout.productImplementationModules = listOf( - "intellij.platform.main", + "intellij.platform.starter", "intellij.idea.community.customization", ) productLayout.bundledPluginModules = IDEA_BUNDLED_PLUGINS diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml index f90cc6cb49d5..7309fc41002a 100644 --- a/intellij.idea.community.main.iml +++ b/intellij.idea.community.main.iml @@ -41,7 +41,7 @@ - + diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/DistributionBuilderState.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/DistributionBuilderState.kt index be6074bc73c4..e1a9909c5d6e 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/DistributionBuilderState.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/DistributionBuilderState.kt @@ -72,6 +72,6 @@ internal fun filterPluginsToPublish(plugins: MutableSet, context: * @return module names which are required to run the necessary tools from build scripts */ internal fun getToolModules(): List { - return java.util.List.of("intellij.java.rt", "intellij.platform.main", + return java.util.List.of("intellij.java.rt", "intellij.platform.starter", /*required to build searchable options index*/ "intellij.platform.updater") } \ No newline at end of file diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt index 2509e5ce8ccb..86e08143b6fa 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt @@ -326,7 +326,7 @@ internal suspend fun createPlatformLayout(addPlatformCoverage: Boolean, projectL .dependentModules.computeIfAbsent("core") { mutableListOf() }.add(module.name) } - val platformMainModule = "intellij.platform.main" + val platformMainModule = "intellij.platform.starter" if (context.isEmbeddedJetBrainsClientEnabled && layout.includedModules.none { it.moduleName == platformMainModule }) { /* this module is used by JetBrains Client, but it isn't packed in commercial IDEs, so let's put it in a separate JAR which won't be loaded when the IDE is started in the regular mode */ diff --git a/platform/platform-main/api-dump-unreviewed.txt b/platform/starter/api-dump-unreviewed.txt similarity index 100% rename from platform/platform-main/api-dump-unreviewed.txt rename to platform/starter/api-dump-unreviewed.txt diff --git a/platform/platform-main/intellij.platform.main.iml b/platform/starter/intellij.platform.starter.iml similarity index 100% rename from platform/platform-main/intellij.platform.main.iml rename to platform/starter/intellij.platform.starter.iml diff --git a/platform/platform-main/src/com/intellij/idea/MainImpl.kt b/platform/starter/src/com/intellij/idea/MainImpl.kt similarity index 88% rename from platform/platform-main/src/com/intellij/idea/MainImpl.kt rename to platform/starter/src/com/intellij/idea/MainImpl.kt index 6ddd45eb3a2b..57bb3713cb63 100644 --- a/platform/platform-main/src/com/intellij/idea/MainImpl.kt +++ b/platform/starter/src/com/intellij/idea/MainImpl.kt @@ -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 com.intellij.idea import com.intellij.ide.bootstrap.InitAppContext diff --git a/python/build/src/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.kt b/python/build/src/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.kt index d65aa04292a3..59f8ebace9bc 100644 --- a/python/build/src/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.kt +++ b/python/build/src/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.kt @@ -26,7 +26,7 @@ class PyCharmCommunityProperties(private val communityHome: Path) : PyCharmPrope productLayout.productApiModules = listOf("intellij.xml.dom") productLayout.productImplementationModules = listOf( "intellij.xml.dom.impl", - "intellij.platform.main", + "intellij.platform.starter", "intellij.pycharm.community", "intellij.platform.whatsNew", ) diff --git a/python/intellij.pycharm.community.main.iml b/python/intellij.pycharm.community.main.iml index e04e18382a31..1a887b645db4 100644 --- a/python/intellij.pycharm.community.main.iml +++ b/python/intellij.pycharm.community.main.iml @@ -16,7 +16,7 @@ - +