jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-04-25 07:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix windows ia32 rebuild

Browse Source 
Change-type: patch
This commit is contained in:
Alexis Svinartchouk 2020-06-03 19:58:02 +02:00
parent 5f5c66e3f2
commit f0bbd1a1cd
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
beforeBuild.js
View File

@ -1,17 +1,26 @@
'use strict' 'use strict'
const cp = require('child_process') const cp = require('child_process');
const rimraf = require('rimraf');
const process = require('process');
// Rebuild native modules for ia32 and run webpack again for the ia32 part of windows packages // Rebuild native modules for ia32 and run webpack again for the ia32 part of windows packages
exports.default = function(context) { exports.default = function(context) {
if (context.platform.name === 'windows') { if (context.platform.name === 'windows') {
cp.execFileSync( cp.execFileSync(
'bash', 'bash',
['./node_modules/.bin/electron-rebuild', '--types', 'dev', '--arch', context.arch] ['./node_modules/.bin/electron-rebuild', '--types', 'dev', '--arch', context.arch],
); );
rimraf.sync('generated');
cp.execFileSync( cp.execFileSync(
'bash', 'bash',
['./node_modules/.bin/webpack'] ['./node_modules/.bin/webpack'],
{
env: {
...process.env,
npm_config_target_arch: context.arch,
},
},
); );
} }
} }

7
webpack.config.ts
View File

@ -22,6 +22,7 @@ import * as MiniCssExtractPlugin from 'mini-css-extract-plugin';
import * as os from 'os'; import * as os from 'os';
import outdent from 'outdent'; import outdent from 'outdent';
import * as path from 'path'; import * as path from 'path';
import { env } from 'process';
import * as SimpleProgressWebpackPlugin from 'simple-progress-webpack-plugin'; import * as SimpleProgressWebpackPlugin from 'simple-progress-webpack-plugin';
import * as TerserPlugin from 'terser-webpack-plugin'; import * as TerserPlugin from 'terser-webpack-plugin';
import { BannerPlugin, NormalModuleReplacementPlugin } from 'webpack'; import { BannerPlugin, NormalModuleReplacementPlugin } from 'webpack';
@ -77,7 +78,11 @@ function renameNodeModules(resourcePath: string) {
function findLzmaNativeBindingsFolder(): string { function findLzmaNativeBindingsFolder(): string {
const files = readdirSync(path.join('node_modules', 'lzma-native')); const files = readdirSync(path.join('node_modules', 'lzma-native'));
const bindingsFolder = files.find((f) => f.startsWith('binding-')); const bindingsFolder = files.find(
(f) =>
f.startsWith('binding-') &&
f.endsWith(env.npm_config_target_arch || os.arch()),
);
if (bindingsFolder === undefined) { if (bindingsFolder === undefined) {
throw new Error('Could not find lzma_native binding'); throw new Error('Could not find lzma_native binding');
} }