From 7b31275d08b59876354818a395e106083fe37123 Mon Sep 17 00:00:00 2001 From: Nikita Kudrin Date: Fri, 29 Sep 2023 10:28:01 +0300 Subject: [PATCH] [project import perf tests] IJ-CR-115806 Fixes for review GitOrigin-RevId: 3d3a19059a8d9312f523793dfedff8d7b115a1d9 --- platform/build-scripts/dev-server/src/BuildServer.kt | 2 +- platform/build-scripts/dev-server/src/IdeBuilder.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/build-scripts/dev-server/src/BuildServer.kt b/platform/build-scripts/dev-server/src/BuildServer.kt index 399be43f8570..d5d29da7b1d6 100644 --- a/platform/build-scripts/dev-server/src/BuildServer.kt +++ b/platform/build-scripts/dev-server/src/BuildServer.kt @@ -39,7 +39,7 @@ fun getIdeSystemProperties(runDir: Path): Map { val libDir = runDir.resolve("lib") val defaultProperties: Map = Properties().apply { - load(runDir.resolve("bin").listDirectoryEntries(glob = "*.properties").single().bufferedReader()) + load(runDir.resolve("bin/idea.properties").bufferedReader()) }.map { it.key.toString() to it.value.toString() }.toMap() return defaultProperties.plus( diff --git a/platform/build-scripts/dev-server/src/IdeBuilder.kt b/platform/build-scripts/dev-server/src/IdeBuilder.kt index 929e516bed9f..c4e9090edc70 100644 --- a/platform/build-scripts/dev-server/src/IdeBuilder.kt +++ b/platform/build-scripts/dev-server/src/IdeBuilder.kt @@ -94,7 +94,7 @@ internal suspend fun buildProduct(productConfiguration: ProductConfiguration, re // PathManager.getBinPath() is used as a working dir for maven Files.createDirectories(runDir.resolve("bin")).also { distBinDir -> getOsDistributionBuilder(os = OsFamily.currentOs, context = context)!!.writeVmOptions(distBinDir) - // copying outside of the installation directory is neccesary to specify system property "jb.vmOptionsFile" + // copying outside the installation directory is necessary to specify system property "jb.vmOptionsFile" .apply { this.copyTo(distBinDir.parent.parent.resolve(this.fileName), overwrite = true) } patchIdeaPropertiesFile(context).apply { moveTo(distBinDir.resolve(this.fileName), overwrite = true) }