diff --git a/build/bundled-plugins/ru_pack/lib/intellij-ru-pack-0.0.1.jar b/build/bundled-plugins/ru_pack/lib/intellij-ru-pack-0.0.1.jar new file mode 100644 index 000000000000..f4deee418c28 Binary files /dev/null and b/build/bundled-plugins/ru_pack/lib/intellij-ru-pack-0.0.1.jar differ diff --git a/openide/src/ru/openide/OpenIdePluginBundler.kt b/openide/src/ru/openide/OpenIdePluginBundler.kt index 8b3b35f7064a..541ab9c144ef 100644 --- a/openide/src/ru/openide/OpenIdePluginBundler.kt +++ b/openide/src/ru/openide/OpenIdePluginBundler.kt @@ -14,20 +14,24 @@ import java.nio.file.Path object OpenIdePluginBundler { - private const val PLUGINS_DIR = "build/download/plugins" + private const val DOWNLOADABLE_PLUGINS_DIR = "build/download/plugins" + private const val PHYSICAL_PLUGINS_DIR = "build/bundled-plugins" private const val AMPLICODE_URL = "https://amplicode.ru" private const val AMPLICODE_MARKETPLACE_URL = "https://amplicode.ru/jetbrains-marketplace" fun getBundlePluginPaths(context: BuildContext): List { val communityHomeDir = context.paths.communityHomeDir - return listOf(Path.of("${communityHomeDir}/$PLUGINS_DIR/amplicode")) + return listOf( + Path.of("${communityHomeDir}/$DOWNLOADABLE_PLUGINS_DIR/amplicode"), + Path.of("${communityHomeDir}/$PHYSICAL_PLUGINS_DIR/ru_pack") + ) } fun bundleAmplicodePlugin(context: BuildContext) { val majorVersion = context.buildNumber.substringBefore('.') val uri = resolveAmplicodeUri(majorVersion) val archivePath = BuildDependenciesDownloader.downloadFileToCacheLocation(COMMUNITY_ROOT, uri) - val targetDir = context.paths.communityHomeDir.resolve("$PLUGINS_DIR/amplicode") + val targetDir = context.paths.communityHomeDir.resolve("$DOWNLOADABLE_PLUGINS_DIR/amplicode") BuildDependenciesDownloader.extractFile(archivePath, targetDir, COMMUNITY_ROOT, BuildDependenciesExtractOptions.STRIP_ROOT) }