[intellij project configuration] rename intellij.idea.community.resources module to intellij.idea.community.customization

We need to add sources to this module (for IJPL-204), so its name won't be correct.

GitOrigin-RevId: ab377fb890531656679a95f5f4afc6de26776acb
This commit is contained in:
Nikolay Chashnikov
2023-08-18 17:28:01 +02:00
committed by intellij-monorepo-bot
parent 48a83b4595
commit 93ebf714a7
8 changed files with 10 additions and 10 deletions

View File

@@ -668,7 +668,7 @@
<module name="intellij.platform.externalSystem.impl" />
</modules-set>
<modules-set>
<module name="intellij.idea.community.resources" />
<module name="intellij.idea.community.customization" />
<module name="intellij.java" />
<module name="intellij.java.aetherDependencyResolver" />
<module name="intellij.java.analysis" />

View File

@@ -3367,7 +3367,7 @@
<module name="intellij.platform.externalSystem.impl" />
</modules-set>
<modules-set>
<module name="intellij.idea.community.resources" />
<module name="intellij.idea.community.customization" />
<module name="intellij.java" />
<module name="intellij.java.aetherDependencyResolver" />
<module name="intellij.java.analysis" />

4
.idea/modules.xml generated
View File

@@ -51,7 +51,7 @@
<module old-name="common" new-name="android.sdktools.common" />
<module old-name="community-guitests" new-name="intellij.idea.community.guiTests" />
<module old-name="community-main" new-name="intellij.idea.community.main" />
<module old-name="community-resources" new-name="intellij.idea.community.resources" />
<module old-name="community-resources" new-name="intellij.idea.community.customization" />
<module old-name="compiler-impl" new-name="intellij.java.compiler.impl" />
<module old-name="compiler-openapi" new-name="intellij.java.compiler" />
<module old-name="compiler-tests" new-name="intellij.java.compiler.tests" />
@@ -673,9 +673,9 @@
<module fileurl="file://$PROJECT_DIR$/build/deps/intellij.idea.community.build.dependencies.iml" filepath="$PROJECT_DIR$/build/deps/intellij.idea.community.build.dependencies.iml" />
<module fileurl="file://$PROJECT_DIR$/build/tasks/intellij.idea.community.build.tasks.iml" filepath="$PROJECT_DIR$/build/tasks/intellij.idea.community.build.tasks.iml" />
<module fileurl="file://$PROJECT_DIR$/build/tests/intellij.idea.community.build.tests.iml" filepath="$PROJECT_DIR$/build/tests/intellij.idea.community.build.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/community-resources/intellij.idea.community.customization.iml" filepath="$PROJECT_DIR$/community-resources/intellij.idea.community.customization.iml" />
<module fileurl="file://$PROJECT_DIR$/intellij.idea.community.main.iml" filepath="$PROJECT_DIR$/intellij.idea.community.main.iml" />
<module fileurl="file://$PROJECT_DIR$/intellij.idea.community.main.android.iml" filepath="$PROJECT_DIR$/intellij.idea.community.main.android.iml" />
<module fileurl="file://$PROJECT_DIR$/community-resources/intellij.idea.community.resources.iml" filepath="$PROJECT_DIR$/community-resources/intellij.idea.community.resources.iml" />
<module fileurl="file://$PROJECT_DIR$/build/launch/intellij.idea.tools.launch.iml" filepath="$PROJECT_DIR$/build/launch/intellij.idea.tools.launch.iml" />
<module fileurl="file://$PROJECT_DIR$/java/openapi/intellij.java.iml" filepath="$PROJECT_DIR$/java/openapi/intellij.java.iml" />
<module fileurl="file://$PROJECT_DIR$/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml" filepath="$PROJECT_DIR$/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml" />

View File

@@ -36,7 +36,7 @@ open class IdeaCommunityProperties(private val communityHomeDir: Path) : BaseIde
init {
platformPrefix = "Idea"
applicationInfoModule = "intellij.idea.community.resources"
applicationInfoModule = "intellij.idea.community.customization"
additionalIDEPropertiesFilePaths = persistentListOf(communityHomeDir.resolve("build/conf/ideaCE.properties"))
toolsJarRequired = true
scrambleMainJar = false
@@ -47,7 +47,7 @@ open class IdeaCommunityProperties(private val communityHomeDir: Path) : BaseIde
so this property is set only when IDEA CE is built from the intellij-ultimate project. */
embeddedJetBrainsClientMainModule = null
productLayout.productImplementationModules = listOf("intellij.platform.main", "intellij.idea.community.resources")
productLayout.productImplementationModules = listOf("intellij.platform.main", "intellij.idea.community.customization")
productLayout.bundledPluginModules = IDEA_BUNDLED_PLUGINS
.add("intellij.javaFX.community")
.toMutableList()

View File

@@ -61,7 +61,7 @@
<orderEntry type="module" module-name="intellij.platform.debugger.impl" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.xml.impl" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.xml" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.idea.community.resources" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.idea.community.customization" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.java.plugin" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.java.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.copyright" scope="RUNTIME" />

View File

@@ -17,7 +17,7 @@
<orderEntry type="module" module-name="intellij.java.impl" />
<orderEntry type="module" module-name="intellij.java.impl.inspections" />
<orderEntry type="module" module-name="intellij.java.ui" />
<orderEntry type="module" module-name="intellij.idea.community.resources" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.idea.community.customization" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.java.execution.impl" />
<orderEntry type="module" module-name="intellij.platform.ide" />
<orderEntry type="module" module-name="intellij.java.i18n" exported="" />

View File

@@ -92,7 +92,7 @@ class PluginModelValidator(sourceModules: List<Module>) {
val id = descriptor.getChild("id")?.content
?: descriptor.getChild("name")?.content
// can't specify 'com.intellij', because there is ultimate plugin with the same ID
?: if (sourceModuleName == "intellij.idea.community.resources") "com.intellij.community" else null
?: if (sourceModuleName == "intellij.idea.community.customization") "com.intellij.community" else null
if (id == null) {
_errors.add(PluginValidationError(
"Plugin id is not specified",
@@ -543,7 +543,7 @@ class PluginModelValidator(sourceModules: List<Module>) {
return
}
val pluginFileName = if (moduleName == "intellij.idea.community.resources") "IdeaPlugin.xml" else "plugin.xml"
val pluginFileName = if (moduleName == "intellij.idea.community.customization") "IdeaPlugin.xml" else "plugin.xml"
val pluginDescriptorFile = metaInf / pluginFileName
val pluginDescriptor = pluginDescriptorFile.readXmlAsModel()