gistfile1.txt

Subject: [PATCH] build-scripts: fix NPE in MacDmgBuilder when building installers locally from community sources
---
Index: community/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/community/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy b/community/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy
--- a/community/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy	(revision 9fa68d3ca6b8caf7a7ef979f15262ac93130f578)
+++ b/community/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/MacDmgBuilder.groovy	(revision 322694da86a1eabe4fe9ff14416cca0f06c4e2c1)
@@ -96,7 +96,7 @@
     Path dmgImage = context.options.buildStepsToSkip.contains(BuildOptions.MAC_DMG_STEP)
       ? null
       : Path.of((context.applicationInfo.isEAP() ? customizer.dmgImagePathForEAP : null) ?: customizer.dmgImagePath)
-    Path jetSignClient = context.proprietaryBuildTools.signTool.commandLineClient(context)
+    Path jetSignClient = context.proprietaryBuildTools.signTool?.commandLineClient(context)
     if (jetSignClient == null) {
       context.messages.error("JetSign client is missing, cannot proceed with signing")
     }
@@ -176,12 +176,12 @@
       context.fullBuildNumber,
       // this host credentials, not required for signing via JetSign
       "", "",
-      context.proprietaryBuildTools.macHostProperties.codesignString,
+      context.proprietaryBuildTools.macHostProperties?.codesignString ?: "null",
       (jreArchivePath == null ? "no-jdk" : jreArchivePath.fileName.toString()),
       notarize ? "yes" : "no",
       customizer.bundleIdentifier,
       customizer.publishArchive.toString(), // compress-input
-      context.proprietaryBuildTools.signTool.commandLineClient(context)?.toString() ?: "null"
+      context.proprietaryBuildTools.signTool?.commandLineClient(context)?.toString() ?: "null"
     ), tempDir, null, TimeUnit.HOURS.toMillis(3))
     Files.move(targetFile, sourceFile, StandardCopyOption.REPLACE_EXISTING)
   }