Skip to content

Commit 1c983d4

Browse files
committed
feat: Windows targets 7z, zip, tar.xz, tar.lz, tar.gz, tar.bz2
Squirrel.Windows Update.exe is not copied to unpacked dir anymore.
1 parent 317a330 commit 1c983d4

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

docs/Options.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ MAS (Mac Application Store) specific options (in addition to `build.osx`).
9292
### `.build.win`
9393
| Name | Description
9494
| --- | ---
95+
| target | <a name="WinBuildOptions-target"></a>Target package type: list of `squirrel`, `7z`, `zip`, `tar.xz`, `tar.lz`, `tar.gz`, `tar.bz2`. Defaults to `squirrel`.
9596
| iconUrl | <a name="WinBuildOptions-iconUrl"></a><p>A URL to an ICO file to use as the application icon (displayed in Control Panel &gt; Programs and Features). Defaults to the Electron icon.</p> <p>Please note — [local icon file url is not accepted](https://github.com/atom/grunt-electron-installer/issues/73), must be https/http.</p> <ul> <li>If you don’t plan to build windows installer, you can omit it.</li> <li>If your project repository is public on GitHub, it will be <code>https://github.com/${u}/${p}/blob/master/build/icon.ico?raw=true</code> by default.</li> </ul>
9697
| loadingGif | <a name="WinBuildOptions-loadingGif"></a><p>The path to a .gif file to display during install. <code>build/install-spinner.gif</code> will be used if exists (it is a recommended way to set) (otherwise [default](https://github.com/electron/windows-installer/blob/master/resources/install-spinner.gif)).</p>
9798
| msi | <a name="WinBuildOptions-msi"></a>Whether to create an MSI installer. Defaults to `false` (MSI is not created).

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"deep-assign": "^2.0.0",
6767
"electron-osx-sign-tf": "0.6.0",
6868
"electron-packager-tf": "~7.3.2",
69-
"electron-winstaller-fixed": "~2.9.6",
69+
"electron-winstaller-fixed": "~2.10.1",
7070
"fs-extra-p": "^1.0.2",
7171
"glob": "^7.0.3",
7272
"hosted-git-info": "^2.1.5",

src/metadata.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,11 @@ export interface WinBuildOptions extends PlatformSpecificBuildOptions {
255255
readonly certificateFile?: string
256256
readonly certificatePassword?: string
257257

258+
/*
259+
Target package type: list of `squirrel`, `7z`, `zip`, `tar.xz`, `tar.lz`, `tar.gz`, `tar.bz2`. Defaults to `squirrel`.
260+
*/
261+
readonly target?: Array<string> | null
262+
258263
/*
259264
A URL to an ICO file to use as the application icon (displayed in Control Panel > Programs and Features). Defaults to the Electron icon.
260265

test/src/helpers/fileAssert.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ function compare(actual: any, expected: any) {
8080
const expectedJson = JSON.stringify(expected, jsonReplacer, 2)
8181
const stack = new Error().stack
8282
throw new AssertionError({
83-
message: `Expected \n${expectedJson}\n\nis not equal to\n\n${actualJson}\n\n${prettyDiff(JSON.parse(actualJson), JSON.parse(expectedJson))}\n${stack.split("\n")[3].trim()}`,
83+
message: `Expected \n${expectedJson}\n\nis not equal to\n\n${actualJson}\n\n${prettyDiff(JSON.parse(expectedJson), JSON.parse(actualJson))}\n${stack.split("\n")[3].trim()}`,
8484
actual: actual,
8585
expected: expected,
8686
})

0 commit comments

Comments
 (0)