From 3ca317e0ce470cd0b9d00a4d98736ceb48b603b8 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Mon, 25 May 2020 11:09:50 +0300 Subject: [PATCH] FIR IDE: Split resources to three folders which is needed for FIR plugin The "resources" is common for both plugins, while resources-descriptors & resources-fir belongs to corresponding plugins --- idea/build.gradle.kts | 8 ++++++++ .../META-INF/plugin.xml | 0 .../META-INF/plugin.xml.192 | 0 .../META-INF/plugin.xml.201 | 0 .../META-INF/plugin.xml.as36 | 0 .../META-INF/plugin.xml.as40 | 0 6 files changed, 8 insertions(+) rename idea/{resources => resources-descriptors}/META-INF/plugin.xml (100%) rename idea/{resources => resources-descriptors}/META-INF/plugin.xml.192 (100%) rename idea/{resources => resources-descriptors}/META-INF/plugin.xml.201 (100%) rename idea/{resources => resources-descriptors}/META-INF/plugin.xml.as36 (100%) rename idea/{resources => resources-descriptors}/META-INF/plugin.xml.as40 (100%) diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index 9d785747926..be67751bb51 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -6,6 +6,9 @@ plugins { } val kotlinVersion: String by rootProject.extra +val isFirPlugin: Boolean + get() = rootProject.findProperty("idea.fir.plugin") == "true" + repositories { maven("https://jetbrains.bintray.com/markdown") @@ -25,6 +28,11 @@ sourceSets { "idea-repl/resources", "resources-en" ) + if (isFirPlugin) { + resources.srcDir("resources-fir") + } else { + resources.srcDir("resources-descriptors") + } } "test" { projectDefault() diff --git a/idea/resources/META-INF/plugin.xml b/idea/resources-descriptors/META-INF/plugin.xml similarity index 100% rename from idea/resources/META-INF/plugin.xml rename to idea/resources-descriptors/META-INF/plugin.xml diff --git a/idea/resources/META-INF/plugin.xml.192 b/idea/resources-descriptors/META-INF/plugin.xml.192 similarity index 100% rename from idea/resources/META-INF/plugin.xml.192 rename to idea/resources-descriptors/META-INF/plugin.xml.192 diff --git a/idea/resources/META-INF/plugin.xml.201 b/idea/resources-descriptors/META-INF/plugin.xml.201 similarity index 100% rename from idea/resources/META-INF/plugin.xml.201 rename to idea/resources-descriptors/META-INF/plugin.xml.201 diff --git a/idea/resources/META-INF/plugin.xml.as36 b/idea/resources-descriptors/META-INF/plugin.xml.as36 similarity index 100% rename from idea/resources/META-INF/plugin.xml.as36 rename to idea/resources-descriptors/META-INF/plugin.xml.as36 diff --git a/idea/resources/META-INF/plugin.xml.as40 b/idea/resources-descriptors/META-INF/plugin.xml.as40 similarity index 100% rename from idea/resources/META-INF/plugin.xml.as40 rename to idea/resources-descriptors/META-INF/plugin.xml.as40