From 05ea6ef054254af6735ec80e20c3e68867d4b944 Mon Sep 17 00:00:00 2001
From: "Dmitriy.Panov" <dmitriy.panov@jetbrains.com>
Date: Tue, 1 Jul 2025 16:02:51 +0200
Subject: [PATCH] build scripts: IntelliJ IDEA Community with open-source
 plugins only

IJI-2599


(cherry picked from commit 23079811eade22aebae4bc86cc82db2750ce412e)

IJ-MR-168904

GitOrigin-RevId: cf93f5cdba89f5515a91d308bc8f3cca9a695155
---
 .../org/jetbrains/intellij/build/IdeaCommunityBuildTest.kt    | 2 +-
 .../jetbrains/intellij/build/impl/WinExeInstallerBuilder.kt   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build/tests/testSrc/org/jetbrains/intellij/build/IdeaCommunityBuildTest.kt b/build/tests/testSrc/org/jetbrains/intellij/build/IdeaCommunityBuildTest.kt
index de23f91f033f..0e04bb8bfd52 100644
--- a/build/tests/testSrc/org/jetbrains/intellij/build/IdeaCommunityBuildTest.kt
+++ b/build/tests/testSrc/org/jetbrains/intellij/build/IdeaCommunityBuildTest.kt
@@ -23,7 +23,7 @@ class IdeaCommunityBuildTest {
       productProperties = productProperties,
       buildCrossPlatformDistribution = true,
     ) {
-      it.classOutDir = System.getProperty(BuildOptions.PROJECT_CLASSES_OUTPUT_DIRECTORY_PROPERTY) ?: "$homePath/out/classes"
+      it.classOutDir = it.classOutDir ?: "$homePath/out/classes"
     }
   }
 
diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.kt
index e473883dad25..e9c5a27ad7f9 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/WinExeInstallerBuilder.kt
@@ -209,7 +209,9 @@ private suspend fun prepareConfigurationFiles(nsiConfDir: Path, customizer: Wind
 private fun amendVersionNumber(base: String): String = base + ".0".repeat(3 - base.count { it == '.' })
 
 private suspend fun prepareSignTool(nsiConfDir: Path, context: BuildContext, uninstallerCopy: Path): Path {
-  val toolFile = context.proprietaryBuildTools.signTool.commandLineClient(context, OsFamily.currentOs, JvmArchitecture.currentJvmArch)!!
+  val toolFile = context.proprietaryBuildTools.signTool
+                   .commandLineClient(context, OsFamily.currentOs, JvmArchitecture.currentJvmArch)
+                 ?: error("No command line sign tool is configured")
   val scriptFile = Files.writeString(nsiConfDir.resolve("sign-tool.cmd"), when (OsFamily.currentOs) {
     // moving the file back and forth is required for NSIS to fail if signing didn't happen
     OsFamily.WINDOWS -> """