octoleo/nativefier
2
2
Fork 0
mirror of https://github.com/Llewellynvdm/nativefier.git synced 2024-11-11 15:51:06 +00:00
Code Issues Releases Activity

Remove arch ia32 as it's no longer supported in Electron 19 (fix #1439, PR #1441)

Browse Source
This commit is contained in:
Adam Weeden 2022-07-30 13:19:45 -04:00 committed by GitHub
parent 82ff609a91
commit 347c06d250
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
API.md
View File

@ -158,7 +158,7 @@ The processor architecture to target when building.
``` ```
(See https://nodejs.org/api/os.html#os_os_arch) (See https://nodejs.org/api/os.html#os_os_arch)
- Please note: On M1 Macs, unless an arm64 version of brew is used to install nodejs, the version installed will be an `x64` version run through Rosetta, and will result in an `x64` app being generated. If this is not desired, either specify `-a arm64` to build for M1, or re-install node with an arm64 version of brew. See https://github.com/nativefier/nativefier/issues/1089 - Please note: On M1 Macs, unless an arm64 version of brew is used to install nodejs, the version installed will be an `x64` version run through Rosetta, and will result in an `x64` app being generated. If this is not desired, either specify `-a arm64` to build for M1, or re-install node with an arm64 version of brew. See https://github.com/nativefier/nativefier/issues/1089
- Can be overridden by specifying one of: `ia32`, `x64`, `armv7l`, `arm64`, or `universal` - Can be overridden by specifying one of: `x64`, `armv7l`, `arm64`, or `universal`
- When specifying `universal` you must be building for the `darwin`, `mas`, `mac`, or `osx` platforms. This will generate a universal (M1 and x86) app. - When specifying `universal` you must be building for the `darwin`, `mas`, `mac`, or `osx` platforms. This will generate a universal (M1 and x86) app.
Note: careful to not conflate _platform_ with _architecture_. If you want for example a Linux or Mac build, it's `--platform` you are looking for. See its documentation for details. Note: careful to not conflate _platform_ with _architecture_. If you want for example a Linux or Mac build, it's `--platform` you are looking for. See its documentation for details.

7
src/infer/inferOs.ts
View File

@ -3,11 +3,8 @@ import * as os from 'os';
import * as log from 'loglevel'; import * as log from 'loglevel';
// Ideally we'd get this list directly from electron-packager, but it's not // Ideally we'd get this list directly from electron-packager, but it's not
// accessible in the package without importing its private js files, which felt // possible to convert a literal type to an array of strings in current TypeScript
// dirty. So if those change, we'll update these as well. export const supportedArchs = ['x64', 'armv7l', 'arm64', 'universal'];
// https://electron.github.io/electron-packager/master/interfaces/electronpackager.options.html#platform
// https://electron.github.io/electron-packager/master/interfaces/electronpackager.options.html#arch
export const supportedArchs = ['ia32', 'x64', 'armv7l', 'arm64', 'universal'];
export const supportedPlatforms = [ export const supportedPlatforms = [
'darwin', 'darwin',
'linux', 'linux',

2
src/integration-test.ts
View File

@ -164,11 +164,9 @@ describe('Nativefier upgrade', () => {
// Exhaustive integration testing here would be neat, but takes too long. // Exhaustive integration testing here would be neat, but takes too long.
// -> For now, only testing a subset of platforms/archs // -> For now, only testing a subset of platforms/archs
// { platform: 'win32', arch: 'x64' }, // { platform: 'win32', arch: 'x64' },
// { platform: 'win32', arch: 'ia32' },
// { platform: 'darwin', arch: 'arm64' }, // { platform: 'darwin', arch: 'arm64' },
// { platform: 'linux', arch: 'x64' }, // { platform: 'linux', arch: 'x64' },
// { platform: 'linux', arch: 'armv7l' }, // { platform: 'linux', arch: 'armv7l' },
// { platform: 'linux', arch: 'ia32' },
])( ])(
'can upgrade a Nativefier app for platform/arch: %s', 'can upgrade a Nativefier app for platform/arch: %s',
async (baseAppOptions) => { async (baseAppOptions) => {