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

[jps-to-bazel] Always add non-generated *.form files as sources (if any) in BazelBuildFileGeneratorKt#computeSources (IJI-2835)

Browse Source 
Also removes obsolete ModuleWithFormsKt#moduleWithForm.

GitOrigin-RevId: dee5ea96e43dd6c08cc7b340a6d5a6c0126ac573
This commit is contained in:
Ilia Kirianovskii
2025-08-17 17:20:22 +00:00
committed by intellij-monorepo-bot
parent 8e32675252
commit 6b0b5a3cc2
2 changed files with 3 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/BazelBuildFileGenerator.kt
+3 -3
View File
@@ -25,8 +25,10 @@ import org.jetbrains.kotlin.jps.model.JpsKotlinFacetModuleExtension
import java.nio.file.Path
import java.util.IdentityHashMap
import java.util.TreeMap
import kotlin.io.path.extension
import kotlin.io.path.invariantSeparatorsPathString
import kotlin.io.path.relativeTo
import kotlin.io.path.walk
import kotlin.reflect.KProperty1
import kotlin.reflect.full.memberProperties
import kotlin.reflect.jvm.javaField
@@ -816,9 +818,7 @@ private fun computeSources(module: JpsModule, contentRoots: List<Path>, bazelBui
}
if (type == JavaSourceRootType.SOURCE || type == JavaSourceRootType.TEST_SOURCE) {
val rootProperties = root.properties
if ((rootProperties !is JavaSourceRootProperties || !rootProperties.isForGeneratedSources) && moduleWithForm.contains (module.name)) {
// rootDir.walk().any { it.extension == "form" }
if (!(root.properties as JavaSourceRootProperties).isForGeneratedSources && rootDir.walk().any { it.extension == "form" }) {
sequenceOf(SourceDirDescriptor(glob = listOf("$prefix**/*.kt", "$prefix**/*.java", "$prefix**/*.form"), excludes = excludes))
}
else {
platform/build-scripts/bazel/src/org/jetbrains/intellij/build/bazel/moduleWithForms.kt
-183
View File
@@ -1,183 +0,0 @@
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.intellij.build.bazel
internal val moduleWithForm: Set<String> = setOf(
"intellij.platform.execution.impl",
"intellij.platform.ide",
"intellij.platform.lang",
"intellij.platform.ide.impl",
"intellij.platform.lang.impl",
"intellij.platform.diff.impl",
"intellij.platform.ide.internal",
"intellij.platform.remoteServers.impl",
"intellij.platform.debugger.impl",
"intellij.platform.vcs.impl",
"intellij.platform.images",
"intellij.xml.dom",
"intellij.xml.impl",
"intellij.spellchecker",
"intellij.java.impl",
"intellij.platform.externalSystem.impl",
"intellij.platform.testRunner",
"intellij.copyright",
"intellij.maven",
"intellij.xml.langInjection",
"intellij.xpath",
"intellij.platform.langInjection",
"intellij.properties.backend",
"intellij.java.compiler.impl",
"intellij.java.ui",
"intellij.java.impl.refactorings",
"intellij.java.execution.impl",
"intellij.java.debugger.impl",
"intellij.groovy",
"intellij.ant",
"intellij.java.remoteServers.impl",
"intellij.java.langInjection",
"intellij.java.i18n",
"intellij.junit",
"intellij.testng",
"intellij.java.guiForms.designer",
"intellij.eclipse",
"intellij.platform.tests",
"intellij.relaxng",
"intellij.platform.coverage",
"intellij.platform.tasks.impl",
"intellij.java.unscramble",
"intellij.gradle",
"intellij.performanceTesting",
"intellij.sh.core",
"intellij.performanceTesting.async.core",
"intellij.platform.ssh.ui",
"intellij.platform.ide.remote",
"intellij.php.impl",
"intellij.webDeployment",
"intellij.database.sql.impl",
"intellij.database.impl",
"intellij.grid.impl",
"intellij.platform.duplicates",
"intellij.platform.webide.impl",
"intellij.restClient",
"intellij.diagram.impl",
"intellij.platform.graph.impl",
"intellij.vcs.git",
"intellij.editorconfig.backend",
"intellij.database.plugin",
"intellij.clouds.docker",
"intellij.dev.psiViewer",
"intellij.javaee.platform.impl",
"intellij.spring.core",
"intellij.javaee.web.impl",
"intellij.javaee.jsp.impl",
"intellij.javaee.app.servers.impl",
"intellij.lombok",
"intellij.hibernate",
"intellij.javaee.jpa.impl",
"intellij.xml.duplicates",
"intellij.devkit.core",
"intellij.sass.plugin",
"intellij.javascript.langInjection",
"intellij.flex",
"intellij.gwt",
"intellij.properties.resource.bundle.editor",
"intellij.tasks.core",
"intellij.tasks",
"intellij.clouds.docker.remoteRun",
"intellij.webDeployment.transport",
"intellij.python.community.impl",
"intellij.python.syntax",
"intellij.python",
"intellij.django.core",
"intellij.python.templateLanguages",
"intellij.python.community.plugin.java",
"intellij.go.impl",
"intellij.restructuredtext.python",
"intellij.python.django",
"intellij.python.gherkin",
"intellij.gherkin",
"intellij.python.remoteInterpreter",
"intellij.remoteRun",
"intellij.python.profiler",
"intellij.python.pyramid",
"intellij.puppet",
"intellij.ruby.backend",
"intellij.ruby.java",
"intellij.spring.boot.core",
"intellij.spring.boot.run",
"intellij.spring.boot.initializr",
"kotlin.idea",
"kotlin.base.compiler-configuration-ui",
"kotlin.j2k.shared",
"kotlin.run-configurations.jvm",
"kotlin.jvm-debugger.core",
"kotlin.refactorings.k2",
"intellij.java.duplicates",
"intellij.javaee.ejb.impl",
"intellij.coffeescript",
"intellij.cidr.debugger.core",
"intellij.c.core",
"intellij.cidr.clangd",
"intellij.appcode",
"intellij.ruby.coverage",
"intellij.ruby.docker",
"intellij.ruby.profiler",
"intellij.ruby.cucumber",
"intellij.ruby.cucumber.java",
"intellij.diagram.java",
"intellij.xml.refactoring",
"intellij.xml.xmlbeans",
"intellij.ejs",
"intellij.handlebars",
"intellij.javascript.cucumber",
"intellij.aspectj",
"intellij.blade",
"intellij.cfml",
"intellij.cucumber.java",
"intellij.dart",
"intellij.platform.statistics.devkit",
"intellij.groovy.grails",
"intellij.javaFX",
"intellij.javaee.appServers",
"intellij.javaee.appServers.glassfish.base",
"intellij.javaee.appServers.jboss.base",
"intellij.javaee.appServers.jetty.base",
"intellij.javaee.appServers.view",
"intellij.javaee.appServers.weblogic",
"intellij.javaee.appServers.websphere",
"intellij.javaee.jax.ws",
"intellij.jsr45debug",
"intellij.osgi",
"intellij.phing",
"intellij.php.commandLineTool",
"intellij.php.docker",
"intellij.php.remoteInterpreter",
"intellij.spring.webflow",
"intellij.tasks.timeTracking",
"intellij.terraform",
"intellij.vcs.hg",
"intellij.vcs.perforce",
"intellij.vcs.svn",
"intellij.yeoman",
"intellij.zkm",
"intellij.javaee.appServers.tomcat",
"intellij.performanceTesting.ui",
"intellij.twig",
"intellij.pycharm.community.ide.impl",
"intellij.drupal",
"intellij.wordPress",
"intellij.r",
"intellij.gauge",
"intellij.builtInHelp",
"intellij.rider",
"intellij.exceptionAnalyzer",
"intellij.java.rareRefactorings",
"intellij.vagrant",
"intellij.joomla",
"intellij.psalm",
"intellij.php.workshop",
"intellij.phpstan",
"intellij.qt.python",
"intellij.rider.plugins.android",
"intellij.sqlComplexity",
"util.android-studio.android-studio-roboscope-plugin"
)