Skip to content

Commit e35846a

Browse files
develardevelar
committed
fix: use app-builder as xz-7za proxy
Close #2523
1 parent 85b65fd commit e35846a

File tree

12 files changed

+46
-39
lines changed

12 files changed

+46
-39
lines changed

‎.idea/dictionaries/develar.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"7zip-bin": "^2.4.1",
3232
"archiver": "^2.1.1",
3333
"async-exit-hook": "^2.0.1",
34-
"aws-sdk": "^2.186.0",
34+
"aws-sdk": "^2.188.0",
3535
"bluebird-lst": "^1.0.5",
3636
"chalk": "^2.3.0",
3737
"chromium-pickle-js": "^0.2.0",
@@ -60,7 +60,7 @@
6060
"sanitize-filename": "^1.6.1",
6161
"sax": "^1.2.4",
6262
"semver": "^5.5.0",
63-
"source-map-support": "^0.5.2",
63+
"source-map-support": "^0.5.3",
6464
"stat-mode": "^0.2.2",
6565
"temp-file": "^3.1.1",
6666
"tunnel-agent": "^0.6.0",

‎packages/builder-util/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"chalk": "^2.3.0",
2020
"debug": "^3.1.0",
2121
"builder-util-runtime": "^0.0.0-semantic-release",
22-
"source-map-support": "^0.5.2",
22+
"source-map-support": "^0.5.3",
2323
"7zip-bin": "^2.4.1",
2424
"ini": "^1.3.5",
2525
"tunnel-agent": "^0.6.0",

‎packages/electron-builder-lib/src/options/linuxOptions.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,12 @@ export interface LinuxTargetSpecificOptions extends CommonLinuxOptions, TargetSp
7575
*/
7676
readonly depends?: Array<string> | null
7777

78+
/**
79+
* The compression type.
80+
* @default xz
81+
*/
82+
readonly compression?: "gz" | "bzip2" | "xz" | null
83+
7884
readonly icon?: string
7985

8086
/**
@@ -95,12 +101,6 @@ export interface LinuxTargetSpecificOptions extends CommonLinuxOptions, TargetSp
95101
}
96102

97103
export interface DebOptions extends LinuxTargetSpecificOptions {
98-
/**
99-
* The compression type.
100-
* @default xz
101-
*/
102-
readonly compression?: "gz" | "bzip2" | "xz" | null
103-
104104
/**
105105
* Package dependencies. Defaults to `["gconf2", "gconf-service", "libnotify4", "libappindicator1", "libxtst6", "libnss3"]`.
106106
*/

‎packages/electron-builder-lib/src/packager.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ export class Packager {
243243
this._devMetadata = await orNullIfFileNotExist(readPackageJson(devPackageFile))
244244

245245
const devMetadata = this.devMetadata
246-
const configuration = await getConfig(projectDir, configPath, configFromOptions, new Lazy(() => BluebirdPromise.resolve(devMetadata)))
246+
const configuration = await getConfig(projectDir, configPath, configFromOptions, new Lazy(() => Promise.resolve(devMetadata)))
247247
if (log.isDebugEnabled) {
248248
log.debug({config: serializeToYaml(JSON.parse(safeStringifyJson(configuration)))}, "effective config")
249249
}
@@ -278,7 +278,7 @@ export class Packager {
278278
this._devMetadata = devMetadata
279279

280280
if (repositoryInfo != null) {
281-
this._repositoryInfo.value = BluebirdPromise.resolve(repositoryInfo)
281+
this._repositoryInfo.value = Promise.resolve(repositoryInfo)
282282
}
283283

284284
const projectDir = this.projectDir
@@ -290,7 +290,7 @@ export class Packager {
290290
throw new Error(`Cannot compute electron version for prepacked asar`)
291291
}
292292
}
293-
configuration.electronVersion = await computeElectronVersion(projectDir, new Lazy(() => BluebirdPromise.resolve(this.metadata)))
293+
configuration.electronVersion = await computeElectronVersion(projectDir, new Lazy(() => Promise.resolve(this.metadata)))
294294
}
295295
this._appInfo = new AppInfo(this)
296296

‎packages/electron-builder-lib/src/targets/LinuxTargetHelper.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { isEmptyOrSpaces, log } from "builder-util"
22
import { outputFile } from "fs-extra-p"
33
import { Lazy } from "lazy-val"
44
import * as path from "path"
5-
import { LinuxConfiguration, LinuxTargetSpecificOptions } from ".."
5+
import { LinuxTargetSpecificOptions } from ".."
66
import { LinuxPackager } from "../linuxPackager"
77
import { IconInfo } from "../platformPackager"
88
import { getTemplatePath } from "../util/pathManager"
@@ -46,7 +46,7 @@ export class LinuxTargetHelper {
4646
return iconPath == null ? null : path.resolve(this.packager.projectDir, iconPath)
4747
}
4848

49-
getDescription(options: LinuxConfiguration) {
49+
getDescription(options: LinuxTargetSpecificOptions) {
5050
return options.description || this.packager.appInfo.description
5151
}
5252

‎packages/electron-builder-lib/src/targets/archive.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { path7za } from "7zip-bin"
2-
import BluebirdPromise from "bluebird-lst"
32
import { debug7z, debug7zArgs, exec } from "builder-util"
43
import { exists, unlinkIfExists } from "builder-util/out/fs"
54
import { move } from "fs-extra-p"
@@ -15,7 +14,7 @@ export async function tar(compression: CompressionLevel | any | any, format: str
1514
tarArgs.push(tarFile)
1615
tarArgs.push(path.basename(dirToArchive))
1716

18-
await BluebirdPromise.all([
17+
await Promise.all([
1918
exec(path7za, tarArgs, {cwd: path.dirname(dirToArchive)}),
2019
// remove file before - 7z doesn't overwrite file, but update
2120
unlinkIfExists(outFile),

‎packages/electron-builder-lib/src/targets/fpm.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { path7za, pathCompressStdIn } from "7zip-bin"
1+
import { path7za } from "7zip-bin"
22
import BluebirdPromise from "bluebird-lst"
33
import { Arch, debug, exec, isMacOsSierra, log, smarten, TmpDir, toLinuxArchString, use } from "builder-util"
44
import { computeEnv } from "builder-util/out/bundledTool"
@@ -11,7 +11,7 @@ import * as errorMessages from "../errorMessages"
1111
import { LinuxPackager } from "../linuxPackager"
1212
import { getTemplatePath } from "../util/pathManager"
1313
import { installPrefix, LinuxTargetHelper } from "./LinuxTargetHelper"
14-
import { fpmPath, getLinuxToolsPath } from "./tools"
14+
import { fpmPath, getAppBuilderTool, getLinuxToolsPath } from "./tools"
1515

1616
interface FpmOptions {
1717
maintainer: string | undefined
@@ -149,11 +149,13 @@ export default class FpmTarget extends Target {
149149
args.push("--category", packageCategory)
150150
}
151151

152+
const compression = options.compression
152153
if (target === "deb") {
153-
args.push("--deb-compression", (options as DebOptions).compression || "xz")
154+
args.push("--deb-compression", compression || "xz")
154155
use((options as DebOptions).priority, it => args.push("--deb-priority", it!))
155156
}
156157
else if (target === "rpm") {
158+
args.push("--rpm-compression", (compression === "xz" ? "xzmt" : compression) || "xzmt")
157159
args.push("--rpm-os", "linux")
158160

159161
if (synopsis != null) {
@@ -212,7 +214,7 @@ export default class FpmTarget extends Target {
212214

213215
const env = {
214216
...process.env,
215-
FPM_COMPRESS_PROGRAM: pathCompressStdIn,
217+
FPM_COMPRESS_PROGRAM: await getAppBuilderTool(),
216218
SZA_PATH: path7za,
217219
SZA_COMPRESSION_LEVEL: packager.compression === "store" ? "0" : "9",
218220
SZA_ARCHIVE_TYPE: "xz",

‎packages/electron-builder-lib/src/targets/tools.ts

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import BluebirdPromise from "bluebird-lst"
21
import { isEnvTrue } from "builder-util"
32
import { getBin, getBinFromGithub } from "builder-util/out/binDownload"
43
import { Lazy } from "lazy-val"
@@ -17,20 +16,20 @@ export function getAppImage() {
1716

1817
export const fpmPath = new Lazy(() => {
1918
if (process.platform === "win32" || process.env.USE_SYSTEM_FPM === "true") {
20-
return BluebirdPromise.resolve("fpm")
19+
return Promise.resolve("fpm")
2120
}
2221

2322
const osAndArch = process.platform === "darwin" ? "mac" : `linux-x86${process.arch === "ia32" ? "" : "_64"}`
2423

2524
if (process.platform === "darwin") {
2625
//noinspection SpellCheckingInspection
27-
return getBinFromGithub("fpm", "1.9.2.1-20150715-2.2.2-mac", "6sZZoRKkxdmv3a6E5dnZgVl23apGnImhDtGHKhgCE1WOtXBUJnx+w0WvB2HD2/sitz4f93Mf7+QqDCIbfP7LOw==")
26+
return getBinFromGithub("fpm", "1.9.3-20150715-2.2.2-mac", "oXfq+0H2SbdrbMik07mYloAZ8uHrmf6IJk+Q3P1kwywuZnKTXSaaeZUJNlWoVpRDWNu537YxxpBQWuTcF+6xfw==")
2827
.then(it => path.join(it, "fpm"))
2928
}
3029

3130
//noinspection SpellCheckingInspection
32-
const checksum = process.arch === "ia32" ? "cTT/HdjrQ6qTJQhTZaZC3lyDkRCyNFtNBZ0F7n6mh5B3YmD5ttJZ0xn65pQS03dhEi67A8K1xXNO+tyEEviiIg==" : "0zKxWlHuQEUsXJpWll5Bc4OTI8d0jcMVlme9OeHI+Y+s3sv1S4KyGLOEVEkNw6pRU8F+A1Dj5IR95/+U8YzB0A=="
33-
return getBinFromGithub("fpm", `1.9.2-2.3.1-${osAndArch}`, checksum)
31+
const checksum = process.arch === "ia32" ? "OnzvBdsHE5djcXcAT87rwbnZwS789ZAd2ehuIO42JWtBAHNzXKxV4o/24XFX5No4DJWGO2YSGQttW+zn7d/4rQ==" : "fcKdXPJSso3xFs5JyIJHG1TfHIRTGDP0xhSBGZl7pPZlz4/TJ4rD/q3wtO/uaBBYeX0qFFQAFjgu1uJ6HLHghA=="
32+
return getBinFromGithub("fpm", `1.9.3-2.3.1-${osAndArch}`, checksum)
3433
.then(it => path.join(it, "fpm"))
3534
})
3635

@@ -124,13 +123,13 @@ export function getAppBuilderTool() {
124123
return getTool({
125124
repository: "develar/app-builder",
126125
name: "app-builder",
127-
version: "0.6.0",
128-
mac: "d27p1TYhPVlWFS+3TO8dh80sHP5imMnZTS04ODvL9xHpCQ7KZEUqFEWYi7zDFXKfzBU6zwBcRGrb8BwQAawvzg==",
129-
"linux-ia32": "1aLAsDliV/kCYfOQR/NX43pRwO/v4nC7F98Z9ZRO8r8iXEpTLYVJC19FNup81WpD0hvxLBspnbq73YiSE3aX8g==",
130-
"linux-x64": "6iu/0BzEKTIuCZ/pVPorpLTXjTzqcquTfrlyB9mEyPXQcHPTueK+tBBDQ6SIO7eaGq+W3PDe1oEjgiz2q3Zd4g==",
131-
"linux-armv7": "zUxn5fAxeGylF7mqVP+Aaas3vD3ITTS26EBty9VkGz51EYgCVYnQVTacDIQjwB6s1zit6jt8EJy5Jj0Y+6U+7w==",
132-
"linux-armv8": "69napXVwaPqQcNp7tozNyo7VJbB90E2RToN0pqGppdfUBzTLJUNnZL5D7H4MoUUPS/WgNRalEswb7GfZOsK4XA==",
133-
"win-ia32": "HW+pZS96d0v96iq0y8BX4vg5J97oFMujPaqziatRNZif26EI75lS5S58qCEmooyr9lXDLwbIlNIhrKg7ZzlNhw==",
134-
"win-x64": "eO8eJq2N/t0/3g3EuRut0LU460WUqzywiRhr+OjEUQH1Gt7GuIdc4gYOfDazYjyeTqlATCfT/OzQMdplaac2wQ==",
126+
version: "0.6.1",
127+
"linux-armv7": "oDOrB1Cv65OkNF1+bLTpw50xG+C1p6wjbWEwYGR+WbQs6ScrqcN7bPbHrSW1t578d5Y+x/sU5PYrfpBJTE9I2w==",
128+
"linux-armv8": "f10m8QnQr7V2bf1rZnun+uGc1piZjYLZx2OWKyNwsL+IRpT0VCnTUpuL0TV4UJbw1QzPg/JdzGAKubRfuXaWMw==",
129+
"linux-ia32": "qb14V2GfUIZ64ytrJemW0tgcvyrOPzWfWJQ8SJ6O+MmXC+zNGFBR2FYxfTzGOeB9iaXZucdAImxBxCrqUwZgew==",
130+
"linux-x64": "xPYAnXx535ZSMktNwbvsV4U1BadXaad0LtVtQBoFJuuRUQFqyOImK5XBvnhRhac7Ufx1S1jLoVfTMocPWvKutw==",
131+
mac: "ONEM+jbw48kBkqFXkxHQiEXEjLtm0TWVqDEjw7X4SX5GKtejfAGus9efMBcghG9O2ooRqcj5PGtbpV65LQs5ug==",
132+
"win-ia32": "XHQRnsLhuu+O20wf24bKWHT4I8sXT5e16970guutZjqcAC07O6/wQk527R6DBSoGHe+71neUK/oYK6B23glrAw==",
133+
"win-x64": "m1kR07Nz0fHvwPHcfYnJvd8puQfh71qbLoySXJHNS88xyEZNKMJXOTlwjUbv2D05LpzrhgIbBZFH5GOedlCQpA==",
135134
})
136135
}

‎packages/electron-publisher-s3/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
],
1313
"dependencies": {
1414
"fs-extra-p": "^4.5.0",
15-
"aws-sdk": "^2.186.0",
15+
"aws-sdk": "^2.188.0",
1616
"mime": "^2.2.0",
1717
"electron-publish": "~0.0.0-semantic-release",
1818
"builder-util": "^0.0.0-semantic-release",

0 commit comments

Comments
 (0)