fix #1503: building windows arm64

pull/1513/head
antelle 2020-05-14 20:52:02 +02:00
parent f7d1708550
commit 94caa1fca3
No known key found for this signature in database
GPG Key ID: 094A2F2D6136A4EE
3 changed files with 42 additions and 16 deletions

View File

@ -141,14 +141,19 @@ module.exports = function(grunt) {
dest: 'tmp/desktop/update/',
nonull: true
},
'desktop-windows-helper-x64': {
src: 'helper/win32/KeeWebHelper.exe',
dest: 'tmp/desktop/KeeWeb-win32-x64/Resources/',
nonull: true
},
'desktop-windows-helper-ia32': {
src: 'helper/win32/KeeWebHelper.exe',
dest: 'tmp/desktop/KeeWeb-win32-ia32/Resources/',
nonull: true
},
'desktop-windows-helper-x64': {
'desktop-windows-helper-arm64': {
src: 'helper/win32/KeeWebHelper.exe',
dest: 'tmp/desktop/KeeWeb-win32-x64/Resources/',
dest: 'tmp/desktop/KeeWeb-win32-arm64/Resources/',
nonull: true
},
'desktop-win32-dist-x64': {
@ -377,16 +382,6 @@ module.exports = function(grunt) {
]
}
},
'win32-ia32': {
options: {
platform: 'win32',
arch: 'ia32',
icon: 'graphics/icon.ico',
buildVersion: pkg.version,
ignore: [/(linux|darwin)-\w+\.node$/, /(x64|arm64)\.node/],
'version-string': windowsAppVersionString
}
},
'win32-x64': {
options: {
platform: 'win32',
@ -397,6 +392,16 @@ module.exports = function(grunt) {
'version-string': windowsAppVersionString
}
},
'win32-ia32': {
options: {
platform: 'win32',
arch: 'ia32',
icon: 'graphics/icon.ico',
buildVersion: pkg.version,
ignore: [/(linux|darwin)-\w+\.node$/, /(x64|arm64)\.node/],
'version-string': windowsAppVersionString
}
},
'win32-arm64': {
options: {
platform: 'win32',
@ -461,6 +466,10 @@ module.exports = function(grunt) {
options: { archive: `dist/desktop/KeeWeb-${pkg.version}.win.ia32.zip` },
files: [{ cwd: 'tmp/desktop/KeeWeb-win32-ia32', src: '**', expand: true }]
},
'win32-arm64': {
options: { archive: `dist/desktop/KeeWeb-${pkg.version}.win.arm64.zip` },
files: [{ cwd: 'tmp/desktop/KeeWeb-win32-arm64', src: '**', expand: true }]
},
'linux-x64': {
options: { archive: `dist/desktop/KeeWeb-${pkg.version}.linux.x64.zip` },
files: [
@ -645,6 +654,18 @@ module.exports = function(grunt) {
}
}
},
'win32-build-arm64': {
options: {
files: {
'tmp/desktop/KeeWeb-win32-arm64/KeeWeb.exe': 'KeeWeb',
'tmp/desktop/KeeWeb-win32-arm64/ffmpeg.dll': '',
'tmp/desktop/KeeWeb-win32-arm64/libEGL.dll':
'ANGLE libEGL Dynamic Link Library',
'tmp/desktop/KeeWeb-win32-arm64/libGLESv2.dll':
'ANGLE libGLESv2 Dynamic Link Library'
}
}
},
'win32-uninst-x64': {
options: {
files: {

View File

@ -16,7 +16,7 @@
"license": "MIT",
"readme": "../README.md",
"dependencies": {
"@keeweb/keeweb-native-modules": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.2.0/keeweb-native-modules.tgz",
"@keeweb/keeweb-native-modules": "https://github.com/keeweb/keeweb-native-modules/releases/download/0.2.2/keeweb-native-modules.tgz",
"node-stream-zip": "^1.4.2"
},
"devDependencies": {}

View File

@ -42,11 +42,15 @@ module.exports = function(grunt) {
grunt.registerTask('build-desktop-executables-darwin', ['electron:darwin']);
grunt.registerTask('build-desktop-executables-win32', [
'electron:win32',
'electron:win32-x64',
'electron:win32-ia32',
'electron:win32-arm64',
'sign-exe:win32-build-x64',
'sign-exe:win32-build-ia32',
'sign-exe:win32-build-arm64',
'copy:desktop-windows-helper-x64',
'copy:desktop-windows-helper-ia32',
'copy:desktop-windows-helper-x64'
'copy:desktop-windows-helper-arm64'
]);
grunt.registerTask('build-desktop-executables', [
@ -59,7 +63,8 @@ module.exports = function(grunt) {
grunt.registerTask('build-desktop-archives-win32', [
'compress:win32-x64',
'compress:win32-ia32'
'compress:win32-ia32',
'compress:win32-arm64'
]);
grunt.registerTask('build-desktop-archives', [