MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-20 21:41:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

[runtime module repository] fix generation of descriptors with resource roots only

Browse Source 
GitOrigin-RevId: 8760ad91b4b33caf62f781e701965138859126d3
This commit is contained in:
Nikolay Chashnikov
2023-04-20 11:08:55 +02:00
committed by intellij-monorepo-bot
parent e8ba36e056
commit 25f7a44a3a
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/devkit/runtimeModuleRepository/jps/src/build/RuntimeModuleRepositoryBuilder.kt
View File

@@ -163,7 +163,7 @@ internal class RuntimeModuleRepositoryBuilder
val dependencies = LinkedHashSet<String>()
val processedDummyTestDependencies = HashSet<String>()
collectDependencies(module, test, dependencies, processedDummyTestDependencies, runtimeModuleNameGenerator)
val sourceRootTypes = if (test) JavaModuleSourceRootTypes.TESTS else JavaModuleSourceRootTypes.SOURCES
val sourceRootTypes = if (test) JavaModuleSourceRootTypes.TESTS else JavaModuleSourceRootTypes.PRODUCTION
val resourcePaths = if (module.sourceRoots.any { it.rootType in sourceRootTypes }) {
listOf("../${if (test) "test" else "production"}/${module.name}")
}

9
plugins/devkit/runtimeModuleRepository/jps/testSrc/build/RuntimeModuleRepositoryBuilderTest.kt
View File

@@ -7,6 +7,7 @@ import com.intellij.platform.runtime.repository.serialization.RawRuntimeModuleDe
import com.intellij.platform.runtime.repository.serialization.RuntimeModuleRepositorySerialization
import org.jetbrains.jps.builders.CompileScopeTestBuilder
import org.jetbrains.jps.builders.JpsBuildTestCase
import org.jetbrains.jps.model.java.JavaResourceRootType
import org.jetbrains.jps.model.java.JavaSourceRootType
import org.jetbrains.jps.model.java.JpsJavaDependencyScope
import org.jetbrains.jps.model.java.JpsJavaExtensionService
@@ -33,6 +34,14 @@ class RuntimeModuleRepositoryBuilderTest : JpsBuildTestCase() {
descriptor("a", resourceDirName = null)
}
}
fun `test module with resources only`() {
val module = addModule("a", withTests = false, withSources = false)
module.addSourceRoot(getUrl("a/res"), JavaResourceRootType.RESOURCE)
buildAndCheck {
descriptor("a")
}
}
fun `test dependency`() {
val a = addModule("a", withTests = false)