feat(nsis): allow disabling of building a universal installer #8607
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…able-win-universal
🦋 Changeset detectedLatest commit: b5914a3 The changes in this PR will be included in the next version bump. This PR includes changesets to release 8 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
✅ Deploy Preview for car-park-attendant-cleat-11576 ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
beyondkmp
reviewed
Nov 22, 2024
| protected buildUniversalInstaller() { | ||
| const buildSeparateInstallers = this.options.buildUniversalInstaller === false | ||
| return !buildSeparateInstallers | ||
| } |
There was a problem hiding this comment.
protected buildUniversalInstaller() {
return this.options.buildUniversalInstaller
}There was a problem hiding this comment.
buildUniversalInstaller is optional, so we must check against explicit false.
There was a problem hiding this comment.
This is not a get function, so there shouldn't be any caching, right?
| protected installerFilenamePattern(primaryArch?: Arch | null, defaultArch?: string): string { | ||
| if (!this.buildUniversalInstaller()) { | ||
| return "${productName} " + (this.isPortable ? "" : "Setup ") + "${version}" + (primaryArch != null ? getArchSuffix(primaryArch, defaultArch) : "") + ".${ext}" | ||
| } | ||
| // tslint:disable:no-invalid-template-strings | ||
| return "${productName} " + (this.isPortable ? "" : "Setup ") + "${version}.${ext}" | ||
| } |
There was a problem hiding this comment.
protected installerFilenamePattern(primaryArch?: Arch | null, defaultArch?: string): string {
const setupText = this.isPortable ? "" : "Setup ";
const archSuffix = !this.buildUniversalInstaller() && primaryArch != null
? getArchSuffix(primaryArch, defaultArch)
: "";
return "${productName} " + setupText + "${version}" + archSuffix + ".${ext}";
}There was a problem hiding this comment.
Love it, I'll update the logic.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
By default, electron-builder builds a universal NSIS package when multiple archs are specified. This universal exe size is usually the sum of each individual installer.
This PR introduces a config property
buildUniversalInstaller(defaulttruefor backward compatibility)In order to build separate exe's, I needed to update the installer name template to include an arch. Unless a
defaultArchis supplied, x64 will not have a suffix appended to the file name and the other arch builds will have suffix-${arch}.electron-builder/packages/app-builder-lib/src/targets/nsis/NsisTarget.ts
Lines 140 to 146 in 1b41b17
Note: Only
nsistargets supports individual installers asnsis-webrequires 32 bit arch to be present in the distributable package since it automatically detects OS architecture and downloads the corresponding package file.nsis-weblogic overrides any setting tobuildUniversalInstallertotrue.Ref: https://www.electron.build/nsis.html#web-installer
Resolves: #8298 and #8597