MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA project configuration: the great module rename

Browse Source 
Improve names for product-specific modules: change 'intellij.productEdition' to 'intellij.product.edition' (e.g. 'intellij.ideaUltimate' -> 'intellij.idea.ultimate'). This makes names of these modules consistent with other names and groups modules related to the same product together.
This commit is contained in:
nik
2018-01-25 12:59:04 +03:00
parent 1d43a0dbc2
commit 43d6d568c8
26 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/modules.xml
Generated
+26 -26
View File
@@ -13,7 +13,7 @@
<module old-name="annotations-java8" new-name="intellij.platform.annotations" />
<module old-name="android-rt" new-name="intellij.android.rt" />
<module old-name="java-decompiler-engine" new-name="intellij.java.decompiler.engine" />
<module old-name="main_pycharm_ce" new-name="intellij.pycharmCommunity.main" />
<module old-name="main_pycharm_ce" new-name="intellij.pycharm.community.main" />
<module old-name="platform-resources" new-name="intellij.platform.resources" />
<module old-name="svn4idea" new-name="intellij.vcs.svn" />
<module old-name="remote-servers-git-java" new-name="intellij.java.remoteServers.git" />
@@ -58,7 +58,7 @@
<module old-name="java-i18n" new-name="intellij.java.i18n" />
<module old-name="compiler-tests" new-name="intellij.java.compiler.tests" />
<module old-name="javaFX-CE" new-name="intellij.javaFX.community" />
<module old-name="community-main" new-name="intellij.ideaCommunity.main" />
<module old-name="community-main" new-name="intellij.idea.community.main" />
<module old-name="stream-debugger" new-name="intellij.java.debugger.streams" />
<module old-name="jsp-openapi" new-name="intellij.jsp" />
<module old-name="execution-openapi" new-name="intellij.java.execution" />
@@ -80,7 +80,7 @@
<module old-name="ShortcutPromoter" new-name="intellij.shortcutPromoter" />
<module old-name="github" new-name="intellij.vcs.github" />
<module old-name="instrumentation-util" new-name="intellij.java.compiler.instrumentationUtil" />
<module old-name="python-community-ide-resources" new-name="intellij.pycharmCommunity.resources" />
<module old-name="python-community-ide-resources" new-name="intellij.pycharm.community.resources" />
<module old-name="android-tests" new-name="intellij.android.tests" />
<module old-name="script-debugger-backend" new-name="intellij.platform.scriptDebugger.backend" />
<module old-name="remote-servers-git" new-name="intellij.platform.remoteServers.git" />
@@ -146,16 +146,16 @@
<module old-name="lvcs-api" new-name="intellij.platform.lvcs" />
<module old-name="java-tests" new-name="intellij.java.tests" />
<module old-name="layoutinspector" new-name="intellij.android.layoutInspector" />
<module old-name="build-debug-binaries" new-name="intellij.pycharmCommunity.build.debugBinaries" />
<module old-name="build-debug-binaries" new-name="intellij.pycharm.community.build.debugBinaries" />
<module old-name="build-common" new-name="intellij.android.buildCommon" />
<module old-name="java-runtime" new-name="intellij.java.rt" />
<module old-name="python-edu-build" new-name="intellij.pycharmEdu.build" />
<module old-name="python-edu-build" new-name="intellij.pycharm.edu.build" />
<module old-name="external-system-rt" new-name="intellij.platform.externalSystem.rt" />
<module old-name="indexing-api" new-name="intellij.platform.indexing" />
<module old-name="tasks-core" new-name="intellij.tasks.core" />
<module old-name="android-annotations" new-name="android.sdktools.android-annotations" />
<module old-name="draw9patch" new-name="android.sdktools.draw9patch" />
<module old-name="pycharm-edu-dependencies" new-name="intellij.pycharmEdu.dependencies" />
<module old-name="pycharm-edu-dependencies" new-name="intellij.pycharm.edu.dependencies" />
<module old-name="projectModel-impl" new-name="intellij.platform.projectModel.impl" />
<module old-name="bootstrap" new-name="intellij.platform.bootstrap" />
<module old-name="git4idea" new-name="intellij.vcs.git" />
@@ -194,7 +194,7 @@
<module old-name="jps-builders-6" new-name="intellij.platform.jps.build.javac.rt" />
<module old-name="instant-run-annotations" new-name="android.sdktools.instant-run-annotations" />
<module old-name="lvcs-impl" new-name="intellij.platform.lvcs.impl" />
<module old-name="python-community-ide" new-name="intellij.pycharmCommunity" />
<module old-name="python-community-ide" new-name="intellij.pycharm.community" />
<module old-name="builder-model" new-name="android.sdktools.builder-model" />
<module old-name="idea-ui-tests" new-name="intellij.java.ui.tests" />
<module old-name="xslt-debugger" new-name="intellij.xslt.debugger" />
@@ -252,7 +252,7 @@
<module old-name="jps-launcher" new-name="intellij.platform.jps.build.launcher" />
<module old-name="devkit" new-name="intellij.devkit" />
<module old-name="jshell-protocol" new-name="intellij.java.jshell.protocol" />
<module old-name="educational-python" new-name="intellij.pycharmEdu" />
<module old-name="educational-python" new-name="intellij.pycharm.edu" />
<module old-name="openapi" new-name="intellij.java" />
<module old-name="chunkio-processor" new-name="android.sdktools.chunkio-processor" />
<module old-name="pixelprobe" new-name="android.sdktools.pixelprobe" />
@@ -272,7 +272,7 @@
<module old-name="devkit-kotlin-tests" new-name="intellij.devkit.kotlin.tests" />
<module old-name="javaFX-jps-plugin" new-name="intellij.javaFX.jps" />
<module old-name="util-tests" new-name="intellij.platform.util.tests" />
<module old-name="python-community-build" new-name="intellij.pycharmCommunity.build" />
<module old-name="python-community-build" new-name="intellij.pycharm.community.build" />
<module old-name="compiler-openapi" new-name="intellij.java.compiler" />
<module old-name="debugger-impl" new-name="intellij.java.debugger.impl" />
<module old-name="layoutlib-resources" new-name="android.sdktools.layoutlib-resources" />
@@ -286,7 +286,7 @@
<module old-name="usageView" new-name="intellij.platform.usageView" />
<module old-name="debugger-agent-storage" new-name="intellij.java.debugger.agent.storage" />
<module old-name="cvs-core" new-name="intellij.vcs.cvs.core" />
<module old-name="community-guitests" new-name="intellij.ideaCommunity.guiTests" />
<module old-name="community-guitests" new-name="intellij.idea.community.guiTests" />
<module old-name="xml" new-name="intellij.xml.impl" />
<module old-name="javac2" new-name="intellij.java.compiler.antTasks" />
<module old-name="external-system-api" new-name="intellij.platform.externalSystem" />
@@ -299,7 +299,7 @@
<module old-name="python-community-tests" new-name="intellij.python.community.tests" />
<module old-name="python-community-plugin-build-patches" new-name="intellij.python.community.plugin.buildPatches" />
<module old-name="jsp-spi" new-name="intellij.jsp.spi" />
<module old-name="build" new-name="intellij.ideaCommunity.build" />
<module old-name="build" new-name="intellij.idea.community.build" />
<module old-name="testFramework-java" new-name="intellij.java.testFramework" />
<module old-name="vcs-log-graph-api" new-name="intellij.platform.vcs.log.graph" />
<module old-name="structure-view-impl" new-name="intellij.platform.structureView.impl" />
@@ -307,7 +307,7 @@
<module old-name="appEngine-runtime" new-name="intellij.java.googleAppEngine.runtime" />
<module old-name="python-community-configure" new-name="intellij.python.configure" />
<module old-name="profilers-ui" new-name="intellij.android.profilers.ui" />
<module old-name="main_pycharm_edu" new-name="intellij.pycharmEdu.main" />
<module old-name="main_pycharm_edu" new-name="intellij.pycharm.edu.main" />
<module old-name="tests_bootstrap" new-name="intellij.tools.testsBootstrap" />
<module old-name="diff-impl" new-name="intellij.platform.diff.impl" />
<module old-name="uast-common" new-name="intellij.platform.uast" />
@@ -320,7 +320,7 @@
<module old-name="perfd-host" new-name="intellij.android.perfdHost" />
<module old-name="devkit-jps-plugin" new-name="intellij.devkit.jps" />
<module old-name="ipnb" new-name="intellij.python.ipnb" />
<module old-name="community-resources" new-name="intellij.ideaCommunity.resources" />
<module old-name="community-resources" new-name="intellij.idea.community.resources" />
<module old-name="vcs-tests" new-name="intellij.platform.vcs.tests" />
<module old-name="wizard" new-name="intellij.android.wizard" />
<module old-name="gradle-tests" new-name="intellij.gradle.tests" />
@@ -451,10 +451,10 @@
<module fileurl="file://$PROJECT_DIR$/plugins/groovy/rt/intellij.groovy.rt.iml" filepath="$PROJECT_DIR$/plugins/groovy/rt/intellij.groovy.rt.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/groovy/structuralsearch-groovy/intellij.groovy.structuralSearch.iml" filepath="$PROJECT_DIR$/plugins/groovy/structuralsearch-groovy/intellij.groovy.structuralSearch.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/groovy/groovy-uast-tests/intellij.groovy.uast.tests.iml" filepath="$PROJECT_DIR$/plugins/groovy/groovy-uast-tests/intellij.groovy.uast.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/build/intellij.ideaCommunity.build.iml" filepath="$PROJECT_DIR$/build/intellij.ideaCommunity.build.iml" />
<module fileurl="file://$PROJECT_DIR$/community-guitests/intellij.ideaCommunity.guiTests.iml" filepath="$PROJECT_DIR$/community-guitests/intellij.ideaCommunity.guiTests.iml" />
<module fileurl="file://$PROJECT_DIR$/intellij.ideaCommunity.main.iml" filepath="$PROJECT_DIR$/intellij.ideaCommunity.main.iml" />
<module fileurl="file://$PROJECT_DIR$/community-resources/intellij.ideaCommunity.resources.iml" filepath="$PROJECT_DIR$/community-resources/intellij.ideaCommunity.resources.iml" />
<module fileurl="file://$PROJECT_DIR$/build/intellij.idea.community.build.iml" filepath="$PROJECT_DIR$/build/intellij.idea.community.build.iml" />
<module fileurl="file://$PROJECT_DIR$/community-guitests/intellij.idea.community.guiTests.iml" filepath="$PROJECT_DIR$/community-guitests/intellij.idea.community.guiTests.iml" />
<module fileurl="file://$PROJECT_DIR$/intellij.idea.community.main.iml" filepath="$PROJECT_DIR$/intellij.idea.community.main.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$/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" />
<module fileurl="file://$PROJECT_DIR$/java/java-analysis-api/intellij.java.analysis.iml" filepath="$PROJECT_DIR$/java/java-analysis-api/intellij.java.analysis.iml" />
@@ -635,15 +635,15 @@
<module fileurl="file://$PROJECT_DIR$/plugins/properties/intellij.properties.iml" filepath="$PROJECT_DIR$/plugins/properties/intellij.properties.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/properties/properties-psi-api/intellij.properties.psi.iml" filepath="$PROJECT_DIR$/plugins/properties/properties-psi-api/intellij.properties.psi.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/properties/properties-psi-impl/intellij.properties.psi.impl.iml" filepath="$PROJECT_DIR$/plugins/properties/properties-psi-impl/intellij.properties.psi.impl.iml" />
<module fileurl="file://$PROJECT_DIR$/python/ide/intellij.pycharmCommunity.iml" filepath="$PROJECT_DIR$/python/ide/intellij.pycharmCommunity.iml" />
<module fileurl="file://$PROJECT_DIR$/python/build/intellij.pycharmCommunity.build.iml" filepath="$PROJECT_DIR$/python/build/intellij.pycharmCommunity.build.iml" />
<module fileurl="file://$PROJECT_DIR$/python/build/build-debug-binaries/intellij.pycharmCommunity.build.debugBinaries.iml" filepath="$PROJECT_DIR$/python/build/build-debug-binaries/intellij.pycharmCommunity.build.debugBinaries.iml" />
<module fileurl="file://$PROJECT_DIR$/python/intellij.pycharmCommunity.main.iml" filepath="$PROJECT_DIR$/python/intellij.pycharmCommunity.main.iml" />
<module fileurl="file://$PROJECT_DIR$/python/python-community-ide-resources/intellij.pycharmCommunity.resources.iml" filepath="$PROJECT_DIR$/python/python-community-ide-resources/intellij.pycharmCommunity.resources.iml" />
<module fileurl="file://$PROJECT_DIR$/python/educational-python/intellij.pycharmEdu.iml" filepath="$PROJECT_DIR$/python/educational-python/intellij.pycharmEdu.iml" />
<module fileurl="file://$PROJECT_DIR$/python/educational-python/build/intellij.pycharmEdu.build.iml" filepath="$PROJECT_DIR$/python/educational-python/build/intellij.pycharmEdu.build.iml" />
<module fileurl="file://$PROJECT_DIR$/python/educational-python/build/dependencies/intellij.pycharmEdu.dependencies.iml" filepath="$PROJECT_DIR$/python/educational-python/build/dependencies/intellij.pycharmEdu.dependencies.iml" />
<module fileurl="file://$PROJECT_DIR$/python/educational-python/intellij.pycharmEdu.main.iml" filepath="$PROJECT_DIR$/python/educational-python/intellij.pycharmEdu.main.iml" />
<module fileurl="file://$PROJECT_DIR$/python/ide/intellij.pycharm.community.iml" filepath="$PROJECT_DIR$/python/ide/intellij.pycharm.community.iml" />
<module fileurl="file://$PROJECT_DIR$/python/build/intellij.pycharm.community.build.iml" filepath="$PROJECT_DIR$/python/build/intellij.pycharm.community.build.iml" />
<module fileurl="file://$PROJECT_DIR$/python/build/build-debug-binaries/intellij.pycharm.community.build.debugBinaries.iml" filepath="$PROJECT_DIR$/python/build/build-debug-binaries/intellij.pycharm.community.build.debugBinaries.iml" />
<module fileurl="file://$PROJECT_DIR$/python/intellij.pycharm.community.main.iml" filepath="$PROJECT_DIR$/python/intellij.pycharm.community.main.iml" />
<module fileurl="file://$PROJECT_DIR$/python/python-community-ide-resources/intellij.pycharm.community.resources.iml" filepath="$PROJECT_DIR$/python/python-community-ide-resources/intellij.pycharm.community.resources.iml" />
<module fileurl="file://$PROJECT_DIR$/python/educational-python/intellij.pycharm.edu.iml" filepath="$PROJECT_DIR$/python/educational-python/intellij.pycharm.edu.iml" />
<module fileurl="file://$PROJECT_DIR$/python/educational-python/build/intellij.pycharm.edu.build.iml" filepath="$PROJECT_DIR$/python/educational-python/build/intellij.pycharm.edu.build.iml" />
<module fileurl="file://$PROJECT_DIR$/python/educational-python/build/dependencies/intellij.pycharm.edu.dependencies.iml" filepath="$PROJECT_DIR$/python/educational-python/build/dependencies/intellij.pycharm.edu.dependencies.iml" />
<module fileurl="file://$PROJECT_DIR$/python/educational-python/intellij.pycharm.edu.main.iml" filepath="$PROJECT_DIR$/python/educational-python/intellij.pycharm.edu.main.iml" />
<module fileurl="file://$PROJECT_DIR$/python/openapi/intellij.python.community.iml" filepath="$PROJECT_DIR$/python/openapi/intellij.python.community.iml" />
<module fileurl="file://$PROJECT_DIR$/python/intellij.python.community.impl.iml" filepath="$PROJECT_DIR$/python/intellij.python.community.impl.iml" />
<module fileurl="file://$PROJECT_DIR$/python/pluginCore/intellij.python.community.plugin.iml" filepath="$PROJECT_DIR$/python/pluginCore/intellij.python.community.plugin.iml" />
.idea/runConfigurations/IDEA.xml
Generated
+1 -1
View File
@@ -12,7 +12,7 @@
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<module name="intellij.ideaCommunity.main" />
<module name="intellij.idea.community.main" />
<envs>
<env name="IDEA_RUNNERW" value="win/runnerw.exe" />
</envs>
.idea/runConfigurations/PyCharm.xml
Generated
+1 -1
View File
@@ -11,7 +11,7 @@
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<module name="intellij.pycharmCommunity.main" />
<module name="intellij.pycharm.community.main" />
<envs />
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="" />
.idea/runConfigurations/PyCharm_Edu.xml
Generated
+1 -1
View File
@@ -10,7 +10,7 @@
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<option name="ENV_VARIABLES" />
<option name="PASS_PARENT_ENVS" value="true" />
<module name="intellij.pycharmEdu.main" />
<module name="intellij.pycharm.edu.main" />
<option name="VM_PARAMETERS" value="-ea -Xbootclasspath/p:../out/classes/production/intellij.platform.boot -Xmx192m -Didea.is.internal=true -Didea.platform.prefix=PyCharmEdu -Didea.config.path=../config/pycharmEdu -Didea.system.path=../system/pycharmEdu" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bin" />
<method>
build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy
+3 -3
View File
@@ -28,7 +28,7 @@ class IdeaCommunityProperties extends BaseIdeaProperties {
baseFileName = "idea"
platformPrefix = "Idea"
productCode = "IC"
applicationInfoModule = "intellij.ideaCommunity.resources"
applicationInfoModule = "intellij.idea.community.resources"
additionalIDEPropertiesFilePaths = ["$home/build/conf/ideaCE.properties".toString()]
toolsJarRequired = true
buildCrossPlatformDistribution = true
@@ -36,9 +36,9 @@ class IdeaCommunityProperties extends BaseIdeaProperties {
productLayout.productApiModules = JAVA_API_MODULES
productLayout.productImplementationModules = JAVA_IMPLEMENTATION_MODULES +
["intellij.platform.duplicates.analysis", "intellij.platform.structuralSearch", "intellij.java.structuralSearch", "intellij.java.typeMigration", "intellij.platform.main"]
productLayout.additionalPlatformJars.put("resources.jar", "intellij.ideaCommunity.resources")
productLayout.additionalPlatformJars.put("resources.jar", "intellij.idea.community.resources")
productLayout.bundledPluginModules = BUNDLED_PLUGIN_MODULES
productLayout.mainModules = ["intellij.ideaCommunity.main"]
productLayout.mainModules = ["intellij.idea.community.main"]
productLayout.compatiblePluginsToIgnore = PythonCommunityPluginModules.PYCHARM_ONLY_PLUGIN_MODULES
productLayout.allNonTrivialPlugins = CommunityRepositoryModules.COMMUNITY_REPOSITORY_PLUGINS + [
CommunityRepositoryModules.androidPlugin([:]),
build/scripts/tests_in_community.gant
+1 -1
View File
@@ -25,5 +25,5 @@ target("default": "Run tests") {
String home = IdeaProjectLoader.guessHome(this)
String outputDir = "$home/out/tests"
def context = CompilationContextImpl.create(home, home, outputDir)
TestingTasks.create(context).runTests([], "intellij.ideaCommunity.main", null)
TestingTasks.create(context).runTests([], "intellij.idea.community.main", null)
}
community-guitests/intellij.idea.community.guiTests.iml
+1 -1
View File
@@ -7,7 +7,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.ideaCommunity.main" />
<orderEntry type="module" module-name="intellij.idea.community.main" />
<orderEntry type="module" module-name="intellij.platform.testGuiFramework" />
<orderEntry type="module" module-name="intellij.platform.diff.impl" scope="TEST" />
</component>
intellij.idea.community.main.iml
+1 -1
View File
@@ -55,7 +55,7 @@
<orderEntry type="module" module-name="intellij.platform.debugger.impl" />
<orderEntry type="module" module-name="intellij.xml.impl" />
<orderEntry type="module" module-name="intellij.xml" />
<orderEntry type="module" module-name="intellij.ideaCommunity.resources" />
<orderEntry type="module" module-name="intellij.idea.community.resources" />
<orderEntry type="module" module-name="intellij.java.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.copyright" />
<orderEntry type="module" module-name="intellij.vcs.cvs" />
java/java-tests/intellij.java.tests.iml
+1 -1
View File
@@ -20,7 +20,7 @@
<orderEntry type="module" module-name="intellij.java.testFramework" />
<orderEntry type="module" module-name="intellij.java.impl" />
<orderEntry type="module" module-name="intellij.java.ui" />
<orderEntry type="module" module-name="intellij.ideaCommunity.resources" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.idea.community.resources" 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="" />
platform/build-scripts/testFramework/src/org/jetbrains/intellij/build/LibraryLicensesTester.kt
+1 -1
View File
@@ -14,7 +14,7 @@ import org.junit.rules.ErrorCollector
class LibraryLicensesTester(private val project: JpsProject, private val licenses: List<LibraryLicense>) {
fun reportMissingLicenses(collector: ErrorCollector) {
val nonPublicModules = setOf("intellij.ideaUltimate.build", "intellij.ideaCommunity.build", "buildSrc", "intellij.platform.testGuiFramework")
val nonPublicModules = setOf("intellij.idea.ultimate.build", "intellij.idea.community.build", "buildSrc", "intellij.platform.testGuiFramework")
val libraries = HashMap<JpsLibrary, JpsModule>()
project.modules.filter { it.name !in nonPublicModules && !it.name.contains("guiTests") }.forEach { module ->
JpsJavaExtensionService.dependencies(module).includedIn(JpsJavaClasspathKind.PRODUCTION_RUNTIME).libraries.forEach {
platform/testGuiFramework/src/com/intellij/testGuiFramework/launcher/ide/CommunityIde.kt
+1 -1
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.testGuiFramework.launcher.ide
class CommunityIde : IdeType(name = "IntelliJ IDEA", platformPrefix = "Idea", ideJarName = "idea.jar", mainModule = "intellij.ideaCommunity.guiTests")
class CommunityIde : IdeType(name = "IntelliJ IDEA", platformPrefix = "Idea", ideJarName = "idea.jar", mainModule = "intellij.idea.community.guiTests")
plugins/devkit/src/projectRoots/IdeaJdk.java
+1 -1
View File
@@ -350,7 +350,7 @@ public class IdeaJdk extends JavaDependentSdkType implements JavaSdkType {
boolean isUltimate = vfsManager.findFileByUrl(VfsUtilCore.pathToUrl(sdkHome + "/ultimate/ultimate-resources")) != null;
Set<String> suppressedModules = ContainerUtil.newTroveSet("jps-plugin-system");
Set<String> ultimateModules = ContainerUtil.newTroveSet(
"intellij.platform.commercial", "intellij.ideaUltimate.resources", "intellij.platform.commercial.verifier",
"intellij.platform.commercial", "intellij.idea.ultimate.resources", "intellij.platform.commercial.verifier",
"intellij.diagram", "intellij.diagram.impl", "intellij.uml");
List<JpsModule> modules = JBIterable.from(model.getProject().getModules())
.filter(o -> {
plugins/devkit/src/util/PsiUtil.java
+1 -1
View File
@@ -165,7 +165,7 @@ public class PsiUtil {
continue;
}
if (dir.findChild("idea.iml") != null || dir.findChild("community-main.iml") != null
|| dir.findChild("intellij.ideaCommunity.main.iml") != null || dir.findChild("intellij.ideaUltimate.main.iml") != null) {
|| dir.findChild("intellij.idea.community.main.iml") != null || dir.findChild("intellij.idea.ultimate.main.iml") != null) {
return true;
}
}
plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTest.groovy
+2 -2
View File
@@ -904,8 +904,8 @@ class AppTest {
addGroovyLibrary(anotherModule)
PsiTestUtil.addProjectLibrary(myModule, "junit", IntelliJProjectConfiguration.getProjectLibraryClassesRootPaths("JUnit3"))
PsiTestUtil.addProjectLibrary(myModule, "cli", IntelliJProjectConfiguration.getModuleLibrary("intellij.ideaCommunity.build", "commons-cli").classesPaths)
PsiTestUtil.addProjectLibrary(anotherModule, "cli", IntelliJProjectConfiguration.getModuleLibrary("intellij.ideaCommunity.build", "commons-cli").classesPaths)
PsiTestUtil.addProjectLibrary(myModule, "cli", IntelliJProjectConfiguration.getModuleLibrary("intellij.idea.community.build", "commons-cli").classesPaths)
PsiTestUtil.addProjectLibrary(anotherModule, "cli", IntelliJProjectConfiguration.getModuleLibrary("intellij.idea.community.build", "commons-cli").classesPaths)
myFixture.addFileToProject("a.groovy", "class Foo extends GroovyTestCase {}")
myFixture.addFileToProject("b.groovy", "class Bar extends CliBuilder {}")
python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy
+4 -4
View File
@@ -24,16 +24,16 @@ class PyCharmCommunityProperties extends PyCharmPropertiesBase {
PyCharmCommunityProperties(String communityHome) {
productCode = "PC"
platformPrefix = "PyCharmCore"
applicationInfoModule = "intellij.pycharmCommunity.resources"
applicationInfoModule = "intellij.pycharm.community.resources"
brandingResourcePaths = ["$communityHome/python/resources"]
productLayout.platformApiModules = CommunityRepositoryModules.PLATFORM_API_MODULES + ["intellij.xml.dom"]
productLayout.platformImplementationModules = CommunityRepositoryModules.PLATFORM_IMPLEMENTATION_MODULES + [
"intellij.xml.dom.impl", "intellij.python.community.impl", "intellij.pycharmCommunity.resources",
"intellij.pycharmCommunity", "intellij.python.configure", "intellij.python.community", "intellij.python.psi", "intellij.platform.main"
"intellij.xml.dom.impl", "intellij.python.community.impl", "intellij.pycharm.community.resources",
"intellij.pycharm.community", "intellij.python.configure", "intellij.python.community", "intellij.python.psi", "intellij.platform.main"
]
productLayout.bundledPluginModules = new File("$communityHome/python/build/plugin-list.txt").readLines()
productLayout.mainModules = ["intellij.pycharmCommunity.main"]
productLayout.mainModules = ["intellij.pycharm.community.main"]
}
@Override
python/build/groovy/org/jetbrains/intellij/build/pycharm/PythonCommunityPluginProperties.groovy
+1 -1
View File
@@ -26,7 +26,7 @@ class PythonCommunityPluginProperties extends PythonPluginPropertiesBase {
super()
productCode = "PC"
platformPrefix = "PyCharmCore"
applicationInfoModule = "intellij.pycharmCommunity.resources"
applicationInfoModule = "intellij.pycharm.community.resources"
productLayout.pluginModulesToPublish = [PythonCommunityPluginModules.PYTHON_COMMUNITY_PLUGIN_MODULE]
productLayout.allNonTrivialPlugins = CommunityRepositoryModules.COMMUNITY_REPOSITORY_PLUGINS + [
python/build/intellij.pycharm.community.build.iml
+1 -1
View File
@@ -9,6 +9,6 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Groovy" level="project" />
<orderEntry type="module" module-name="intellij.tools.jps.build.standalone" />
<orderEntry type="module" module-name="intellij.ideaCommunity.build" />
<orderEntry type="module" module-name="intellij.idea.community.build" />
</component>
</module>
python/educational-python/build/groovy/org/jetbrains/intellij/build/pycharm/edu/PyCharmEduProperties.groovy
+4 -4
View File
@@ -15,14 +15,14 @@ class PyCharmEduProperties extends PyCharmPropertiesBase {
pythonCommunityPath = new File(home, "community/python").exists() ? "$home/community/python" : "$home/python"
productCode = "PE"
platformPrefix = "PyCharmEdu"
applicationInfoModule = "intellij.pycharmEdu"
applicationInfoModule = "intellij.pycharm.edu"
brandingResourcePaths = ["$pythonCommunityPath/educational-python/resources"]
productLayout.mainModules = ["intellij.pycharmEdu.main"]
productLayout.mainModules = ["intellij.pycharm.edu.main"]
productLayout.platformApiModules = CommunityRepositoryModules.PLATFORM_API_MODULES + ["intellij.xml.dom"]
productLayout.platformImplementationModules = CommunityRepositoryModules.PLATFORM_IMPLEMENTATION_MODULES + [
"intellij.xml.dom.impl", "intellij.python.community.impl", "intellij.pycharmCommunity.resources",
"intellij.pycharmCommunity", "intellij.python.configure", "intellij.pycharmEdu", "intellij.python.community", "intellij.python.psi", "intellij.platform.main"
"intellij.xml.dom.impl", "intellij.python.community.impl", "intellij.pycharm.community.resources",
"intellij.pycharm.community", "intellij.python.configure", "intellij.pycharm.edu", "intellij.python.community", "intellij.python.psi", "intellij.platform.main"
]
productLayout.bundledPluginModules = new File("$pythonCommunityPath/educational-python/build/plugin-list.txt").readLines()
additionalIDEPropertiesFilePaths = ["$home/community/python/educational-python/build/pycharm-edu.properties".toString()]
python/educational-python/build/intellij.pycharm.edu.build.iml
+3 -3
View File
@@ -9,9 +9,9 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Groovy" level="project" />
<orderEntry type="module" module-name="intellij.tools.jps.build.standalone" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.ideaCommunity.build" />
<orderEntry type="module" module-name="intellij.ideaUltimate.build" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.pycharmCommunity.build" />
<orderEntry type="module" module-name="intellij.idea.community.build" />
<orderEntry type="module" module-name="intellij.idea.ultimate.build" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.pycharm.community.build" />
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
</component>
</module>
python/educational-python/intellij.pycharm.edu.iml
+1 -1
View File
@@ -24,7 +24,7 @@
<orderEntry type="module" module-name="intellij.spellchecker" />
<orderEntry type="module" module-name="intellij.platform.debugger.impl" />
<orderEntry type="module" module-name="intellij.xml.psi.impl" />
<orderEntry type="module" module-name="intellij.pycharmCommunity.resources" />
<orderEntry type="module" module-name="intellij.pycharm.community.resources" />
<orderEntry type="module" module-name="intellij.python.community.impl" />
<orderEntry type="library" name="markdownj" level="project" />
</component>
python/educational-python/intellij.pycharm.edu.main.iml
+2 -2
View File
@@ -11,10 +11,10 @@
<orderEntry type="module" module-name="intellij.relaxng" />
<orderEntry type="module" module-name="intellij.reStructuredText" />
<orderEntry type="module" module-name="intellij.python.helpers" />
<orderEntry type="module" module-name="intellij.pycharmCommunity" />
<orderEntry type="module" module-name="intellij.pycharm.community" />
<orderEntry type="module" module-name="intellij.platform.main" />
<orderEntry type="module" module-name="intellij.shortcutPromoter" />
<orderEntry type="module" module-name="intellij.pycharmEdu" />
<orderEntry type="module" module-name="intellij.pycharm.edu" />
<orderEntry type="module" module-name="intellij.vcs.hg" />
<orderEntry type="module" module-name="intellij.python.ipnb" />
</component>
python/ide/intellij.pycharm.community.iml
+1 -1
View File
@@ -9,7 +9,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.platform.ide.impl" />
<orderEntry type="module" module-name="intellij.python.configure" />
<orderEntry type="module" module-name="intellij.pycharmCommunity.resources" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.pycharm.community.resources" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.python.community.impl" />
<orderEntry type="module" module-name="intellij.platform.lang" />
<orderEntry type="module" module-name="intellij.platform.lang.impl" />
python/intellij.pycharm.community.main.iml
+1 -1
View File
@@ -16,7 +16,7 @@
<orderEntry type="module" module-name="intellij.python.reStructuredText" />
<orderEntry type="module" module-name="intellij.python.helpers" />
<orderEntry type="module" module-name="intellij.terminal" />
<orderEntry type="module" module-name="intellij.pycharmCommunity" />
<orderEntry type="module" module-name="intellij.pycharm.community" />
<orderEntry type="module" module-name="intellij.platform.main" />
<orderEntry type="module" module-name="intellij.tasks.jira" />
<orderEntry type="module" module-name="intellij.shortcutPromoter" />
python/intellij.python.community.plugin.resources.iml
+1 -1
View File
@@ -11,7 +11,7 @@
<orderEntry type="module" module-name="intellij.java.langInjection" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.python.community.plugin" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.python.community.plugin.java" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.pycharmCommunity.resources" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.pycharm.community.resources" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.python.community.impl" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.xml.langInjection" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.python.configure" scope="RUNTIME" />
python/tools/intellij.python.tools.iml
+1 -1
View File
@@ -12,7 +12,7 @@
<orderEntry type="module" module-name="intellij.platform.testFramework" />
<orderEntry type="module" module-name="intellij.python.psi" />
<orderEntry type="module" module-name="intellij.python.community.impl" />
<orderEntry type="module" module-name="intellij.pycharmPro" exported="" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.pycharm.pro" exported="" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.python" exported="" />
<orderEntry type="library" name="Guava" level="project" />
<orderEntry type="module" module-name="intellij.tools.index" />
resources/intellij.java.resources.iml
+1 -1
View File
@@ -10,7 +10,7 @@
<orderEntry type="module" module-name="intellij.platform.resources" />
<orderEntry type="module" module-name="intellij.regexp" exported="" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.platform.images" exported="" />
<orderEntry type="module" module-name="intellij.ideaCommunity.resources" exported="" />
<orderEntry type="module" module-name="intellij.idea.community.resources" exported="" />
<orderEntry type="module" module-name="intellij.platform.util" />
<orderEntry type="module" module-name="intellij.platform.resources.en" />
</component>