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

IJPL-217695 Move Fleet libraries to module set

Browse Source 
GitOrigin-RevId: 0afb79bbebd3ccea8def04e3d14651a4045c2989
This commit is contained in:
Nikolay Rykunov
2025-11-10 23:13:20 +00:00
committed by intellij-monorepo-bot
parent 03c59a4b28
commit e413d0bc71
18 changed files with 118 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fleet/andel/module-content.yaml
+3
View File
@@ -0,0 +1,3 @@
- name: dist.all/lib/fleet.andel.jar
modules:
- name: fleet.andel
fleet/bifurcan/module-content.yaml
+3
View File
@@ -0,0 +1,3 @@
- name: dist.all/lib/fleet.bifurcan.jar
modules:
- name: fleet.bifurcan
fleet/fastutil/module-content.yaml
+3
View File
@@ -0,0 +1,3 @@
- name: dist.all/lib/fleet.fastutil.jar
modules:
- name: fleet.fastutil
fleet/kernel/module-content.yaml
+3
View File
@@ -0,0 +1,3 @@
- name: dist.all/lib/fleet.kernel.jar
modules:
- name: fleet.kernel
fleet/multiplatform.shims/module-content.yaml
+3
View File
@@ -0,0 +1,3 @@
- name: dist.all/lib/fleet.multiplatform.shims.jar
modules:
- name: fleet.multiplatform.shims
fleet/reporting/api/module-content.yaml
+3
View File
@@ -0,0 +1,3 @@
- name: dist.all/lib/fleet.reporting.api.jar
modules:
- name: fleet.reporting.api
fleet/reporting/shared/module-content.yaml
+3
View File
@@ -0,0 +1,3 @@
- name: dist.all/lib/fleet.reporting.shared.jar
modules:
- name: fleet.reporting.shared
fleet/rhizomedb/module-content.yaml
+3
View File
@@ -0,0 +1,3 @@
- name: dist.all/lib/fleet.rhizomedb.jar
modules:
- name: fleet.rhizomedb
fleet/rpc/module-content.yaml
+3
View File
@@ -0,0 +1,3 @@
- name: dist.all/lib/fleet.rpc.jar
modules:
- name: fleet.rpc
fleet/util/codepoints/module-content.yaml
+6
View File
@@ -0,0 +1,6 @@
- name: dist.all/lib/fleet.util.codepoints.jar
modules:
- name: fleet.util.codepoints
library: de.cketti.unicode.kotlin.codepoints.jvm
files:
- name: $MAVEN_REPOSITORY$/de/cketti/unicode/kotlin-codepoints-jvm/0/kotlin-codepoints-jvm-0.jar
fleet/util/core/module-content.yaml
+3
View File
@@ -0,0 +1,3 @@
- name: dist.all/lib/fleet.util.core.jar
modules:
- name: fleet.util.core
fleet/util/logging/api/module-content.yaml
+3
View File
@@ -0,0 +1,3 @@
- name: dist.all/lib/fleet.util.logging.api.jar
modules:
- name: fleet.util.logging.api
fleet/util/serialization/module-content.yaml
+3
View File
@@ -0,0 +1,3 @@
- name: dist.all/lib/fleet.util.serialization.jar
modules:
- name: fleet.util.serialization
platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformJarNames.kt
-6
View File
@@ -24,15 +24,9 @@ object PlatformJarNames {
*/
internal fun getPlatformModuleJarName(moduleName: String, frontendModuleFilter: FrontendModuleFilter): String {
if (frontendModuleFilter.isBackendModule(moduleName)) {
if (moduleName.startsWith("fleet.")) {
return LIB_BACKEND_JAR
}
return APP_BACKEND_JAR
}
else {
if (moduleName.startsWith("fleet.")) {
return LIB_JAR
}
return APP_JAR
}
}
platform/build-scripts/src/org/jetbrains/intellij/build/productLayout/CommunityModuleSets.kt
+23
View File
@@ -39,6 +39,8 @@ object CommunityModuleSets : ModuleSetProvider {
fun essential(): ModuleSet = moduleSet("essential") {
// Include libraries first (they are xi:included in essential.xml)
moduleSet(libraries())
// Fleet libraries are used by core functionality like Project, so should be essential
moduleSet(fleet())
// Core essential modules
module("intellij.platform.settings.local")
@@ -390,6 +392,27 @@ object CommunityModuleSets : ModuleSetProvider {
module("intellij.rd.ui")
}
/**
* Fleet libraries used in IntelliJ Platform. They are built from sources and put in the distribution.
* Corresponds to intellij.moduleSets.fleet.xml
*/
fun fleet(): ModuleSet = moduleSet("libraries.fleet") {
// These modules are embedded because some of them are used by V1 platform modules
embeddedModule("fleet.andel")
embeddedModule("fleet.bifurcan")
embeddedModule("fleet.fastutil")
embeddedModule("fleet.kernel")
embeddedModule("fleet.multiplatform.shims")
embeddedModule("fleet.reporting.api")
embeddedModule("fleet.reporting.shared")
embeddedModule("fleet.rhizomedb")
embeddedModule("fleet.rpc")
embeddedModule("fleet.util.codepoints")
embeddedModule("fleet.util.core")
embeddedModule("fleet.util.logging.api")
embeddedModule("fleet.util.serialization")
}
/**
* IDE common modules (includes essential, compose, grid.core, vcs, xml, duplicates).
*/
platform/platform-resources/generated/META-INF/intellij.moduleSets.essential.xml
+16
View File
@@ -103,6 +103,22 @@
<!-- </editor-fold> -->
<!-- <editor-fold desc="nested: libraries.fleet"> -->
<module name="fleet.andel" loading="embedded"/>
<module name="fleet.bifurcan" loading="embedded"/>
<module name="fleet.fastutil" loading="embedded"/>
<module name="fleet.kernel" loading="embedded"/>
<module name="fleet.multiplatform.shims" loading="embedded"/>
<module name="fleet.reporting.api" loading="embedded"/>
<module name="fleet.reporting.shared" loading="embedded"/>
<module name="fleet.rhizomedb" loading="embedded"/>
<module name="fleet.rpc" loading="embedded"/>
<module name="fleet.util.codepoints" loading="embedded"/>
<module name="fleet.util.core" loading="embedded"/>
<module name="fleet.util.logging.api" loading="embedded"/>
<module name="fleet.util.serialization" loading="embedded"/>
<!-- </editor-fold> -->
<!-- <editor-fold desc="direct modules"> -->
<module name="intellij.platform.settings.local"/>
<module name="intellij.platform.backend"/>
platform/platform-resources/generated/META-INF/intellij.moduleSets.ide.common.xml
+16
View File
@@ -106,6 +106,22 @@
<!-- </editor-fold> -->
<!-- <editor-fold desc="nested: essential > libraries.fleet"> -->
<module name="fleet.andel" loading="embedded"/>
<module name="fleet.bifurcan" loading="embedded"/>
<module name="fleet.fastutil" loading="embedded"/>
<module name="fleet.kernel" loading="embedded"/>
<module name="fleet.multiplatform.shims" loading="embedded"/>
<module name="fleet.reporting.api" loading="embedded"/>
<module name="fleet.reporting.shared" loading="embedded"/>
<module name="fleet.rhizomedb" loading="embedded"/>
<module name="fleet.rpc" loading="embedded"/>
<module name="fleet.util.codepoints" loading="embedded"/>
<module name="fleet.util.core" loading="embedded"/>
<module name="fleet.util.logging.api" loading="embedded"/>
<module name="fleet.util.serialization" loading="embedded"/>
<!-- </editor-fold> -->
<!-- <editor-fold desc="direct modules"> -->
<module name="intellij.platform.settings.local"/>
<module name="intellij.platform.backend"/>
platform/platform-resources/generated/META-INF/intellij.moduleSets.libraries.fleet.xml
+21
View File
@@ -0,0 +1,21 @@
<!-- DO NOT EDIT: This file is auto-generated from Kotlin code -->
<!-- To regenerate, run: CommunityModuleSets.main() -->
<!-- Source: see moduleSet("libraries.fleet") function in CommunityModuleSets.kt -->
<!-- Note: Files are kept under VCS to support running products without dev mode (deprecated) -->
<idea-plugin>
<content namespace="jetbrains">
<module name="fleet.andel" loading="embedded"/>
<module name="fleet.bifurcan" loading="embedded"/>
<module name="fleet.fastutil" loading="embedded"/>
<module name="fleet.kernel" loading="embedded"/>
<module name="fleet.multiplatform.shims" loading="embedded"/>
<module name="fleet.reporting.api" loading="embedded"/>
<module name="fleet.reporting.shared" loading="embedded"/>
<module name="fleet.rhizomedb" loading="embedded"/>
<module name="fleet.rpc" loading="embedded"/>
<module name="fleet.util.codepoints" loading="embedded"/>
<module name="fleet.util.core" loading="embedded"/>
<module name="fleet.util.logging.api" loading="embedded"/>
<module name="fleet.util.serialization" loading="embedded"/>
</content>
</idea-plugin>