mirror of
https://github.com/felixrieseberg/windows95.git
synced 2026-05-09 00:24:09 +00:00
fb701041c2
The patch hardcoded a local Windows path, breaking Windows CI builds. Now resolves tools/resedit.js relative to process.cwd() and uses process.execPath instead of 'node'. Also drops the deb maker diagnostic step now that Linux builds pass.
33 lines
1.3 KiB
Diff
33 lines
1.3 KiB
Diff
diff --git a/node_modules/@electron/packager/dist/win32.js b/node_modules/@electron/packager/dist/win32.js
|
|
index d318f6c..bfde740 100644
|
|
--- a/node_modules/@electron/packager/dist/win32.js
|
|
+++ b/node_modules/@electron/packager/dist/win32.js
|
|
@@ -65,7 +65,26 @@ class WindowsApp extends platform_1.App {
|
|
resOpts.iconPath = icon;
|
|
}
|
|
(0, common_1.debug)(`Running resedit with the options ${JSON.stringify(resOpts)}`);
|
|
- await (0, resedit_1.resedit)(this.electronBinaryPath, resOpts);
|
|
+
|
|
+ // This causes segmentation faults for me on multiple machines
|
|
+ // It's unclear why exactly but this spawn hack fixes it
|
|
+ // await (0, resedit_1.resedit)(this.electronBinaryPath, resOpts);
|
|
+
|
|
+ const { spawnSync } = require('child_process');
|
|
+ const resEditProcess = spawnSync(process.execPath, [
|
|
+ require('path').resolve(process.cwd(), 'tools', 'resedit.js'),
|
|
+ this.electronBinaryPath
|
|
+ ], {
|
|
+ stdio: 'inherit'
|
|
+ });
|
|
+
|
|
+ if (resEditProcess.error) {
|
|
+ throw resEditProcess.error;
|
|
+ }
|
|
+
|
|
+ if (resEditProcess.status !== 0) {
|
|
+ throw new Error(`Resedit process exited with code ${resEditProcess.status}`);
|
|
+ }
|
|
}
|
|
async signAppIfSpecified() {
|
|
const windowsSignOpt = this.opts.windowsSign;
|