diff --git a/packages/app-builder-lib/src/targets/ArchiveTarget.ts b/packages/app-builder-lib/src/targets/ArchiveTarget.ts index 272c25fc76d..5d5afa42fa6 100644 --- a/packages/app-builder-lib/src/targets/ArchiveTarget.ts +++ b/packages/app-builder-lib/src/targets/ArchiveTarget.ts @@ -72,7 +72,7 @@ export class ArchiveTarget extends Target { if (this.isWriteUpdateInfo && format === "zip") { if (isMac) { - updateInfo = await createBlockmap(artifactPath, this, packager, artifactName) + updateInfo = await createBlockmap(artifactPath, this, packager, artifactName, arch) } else { updateInfo = await appendBlockmap(artifactPath) } diff --git a/packages/app-builder-lib/src/targets/differentialUpdateInfoBuilder.ts b/packages/app-builder-lib/src/targets/differentialUpdateInfoBuilder.ts index b5c71541367..0c5c4d14c9f 100644 --- a/packages/app-builder-lib/src/targets/differentialUpdateInfoBuilder.ts +++ b/packages/app-builder-lib/src/targets/differentialUpdateInfoBuilder.ts @@ -1,4 +1,4 @@ -import { log } from "builder-util" +import { Arch, log } from "builder-util" import { BlockMapDataHolder, PackageFileInfo } from "builder-util-runtime" import * as path from "path" import { Target } from "../core" @@ -67,7 +67,13 @@ export async function appendBlockmap(file: string): Promise return await executeAppBuilderAsJson(["blockmap", "--input", file, "--compression", "deflate"]) } -export async function createBlockmap(file: string, target: Target, packager: PlatformPackager, safeArtifactName: string | null): Promise { +export async function createBlockmap( + file: string, + target: Target, + packager: PlatformPackager, + safeArtifactName: string | null, + arch: Arch | null = null +): Promise { const blockMapFile = `${file}${BLOCK_MAP_FILE_SUFFIX}` log.info({ blockMapFile: log.filePath(blockMapFile) }, "building block map") const updateInfo = await executeAppBuilderAsJson(["blockmap", "--input", file, "--output", blockMapFile]) @@ -75,7 +81,7 @@ export async function createBlockmap(file: string, target: Target, packager: Pla file: blockMapFile, safeArtifactName: safeArtifactName == null ? null : `${safeArtifactName}${BLOCK_MAP_FILE_SUFFIX}`, target, - arch: null, + arch, packager, updateInfo, }) diff --git a/packages/app-builder-lib/src/targets/nsis/NsisTarget.ts b/packages/app-builder-lib/src/targets/nsis/NsisTarget.ts index d95633edaf2..048ecc3ab35 100644 --- a/packages/app-builder-lib/src/targets/nsis/NsisTarget.ts +++ b/packages/app-builder-lib/src/targets/nsis/NsisTarget.ts @@ -366,7 +366,7 @@ export class NsisTarget extends Target { if (this.isWebInstaller) { updateInfo = createNsisWebDifferentialUpdateInfo(installerPath, packageFiles) } else if (this.isBuildDifferentialAware) { - updateInfo = await createBlockmap(installerPath, this, packager, safeArtifactName) + updateInfo = await createBlockmap(installerPath, this, packager, safeArtifactName, primaryArch) } if (updateInfo != null && isPerMachine && (oneClick || options.packElevateHelper)) { diff --git a/packages/dmg-builder/src/dmg.ts b/packages/dmg-builder/src/dmg.ts index 9366636f922..5dc6cd1e873 100644 --- a/packages/dmg-builder/src/dmg.ts +++ b/packages/dmg-builder/src/dmg.ts @@ -96,7 +96,7 @@ export class DmgTarget extends Target { } const safeArtifactName = packager.computeSafeArtifactName(artifactName, "dmg") - const updateInfo = this.options.writeUpdateInfo === false ? null : await createBlockmap(artifactPath, this, packager, safeArtifactName) + const updateInfo = this.options.writeUpdateInfo === false ? null : await createBlockmap(artifactPath, this, packager, safeArtifactName, arch) await packager.info.emitArtifactBuildCompleted({ file: artifactPath, safeArtifactName,