mirror of https://github.com/keeweb/keeweb.git
fix #1292: macOS app notarization
This commit is contained in:
parent
9513a6eb80
commit
320bc0fe06
22
Gruntfile.js
22
Gruntfile.js
|
@ -6,6 +6,7 @@ const path = require('path');
|
||||||
const webpackConfig = require('./build/webpack.config');
|
const webpackConfig = require('./build/webpack.config');
|
||||||
const pkg = require('./package.json');
|
const pkg = require('./package.json');
|
||||||
const hookRcedit = require('./build/util/hook-rcedit');
|
const hookRcedit = require('./build/util/hook-rcedit');
|
||||||
|
const codeSignConfig = require('../keys/codesign');
|
||||||
|
|
||||||
hookRcedit.setup();
|
hookRcedit.setup();
|
||||||
|
|
||||||
|
@ -276,7 +277,19 @@ module.exports = function(grunt) {
|
||||||
icon: 'graphics/icon.icns',
|
icon: 'graphics/icon.icns',
|
||||||
appBundleId: 'net.antelle.keeweb',
|
appBundleId: 'net.antelle.keeweb',
|
||||||
appCategoryType: 'public.app-category.productivity',
|
appCategoryType: 'public.app-category.productivity',
|
||||||
extendInfo: 'package/osx/extend.plist'
|
extendInfo: 'package/osx/extend.plist',
|
||||||
|
osxSign: {
|
||||||
|
identity: codeSignConfig.identities.app,
|
||||||
|
hardenedRuntime: true,
|
||||||
|
entitlements: 'package/osx/entitlements.mac.plist',
|
||||||
|
'entitlements-inherit': 'package/osx/entitlements.mac.plist',
|
||||||
|
'gatekeeper-assess': false
|
||||||
|
},
|
||||||
|
osxNotarize: {
|
||||||
|
appleId: codeSignConfig.appleId,
|
||||||
|
appleIdPassword: '@keychain:AC_PASSWORD',
|
||||||
|
ascProvider: codeSignConfig.teamId
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
win32: {
|
win32: {
|
||||||
|
@ -296,13 +309,6 @@ module.exports = function(grunt) {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
codesign: {
|
codesign: {
|
||||||
app: {
|
|
||||||
options: {
|
|
||||||
identity: 'app',
|
|
||||||
deep: true
|
|
||||||
},
|
|
||||||
src: ['tmp/desktop/KeeWeb-darwin-x64/KeeWeb.app']
|
|
||||||
},
|
|
||||||
dmg: {
|
dmg: {
|
||||||
options: {
|
options: {
|
||||||
identity: 'app'
|
identity: 'app'
|
||||||
|
|
|
@ -4,7 +4,7 @@ const childProcess = require('child_process');
|
||||||
|
|
||||||
const childProcessSpawn = childProcess.spawn;
|
const childProcessSpawn = childProcess.spawn;
|
||||||
|
|
||||||
function hookedSpawn(command, options) {
|
function hookedSpawn(command, options, ...args) {
|
||||||
if (command === 'wine') {
|
if (command === 'wine') {
|
||||||
options = options.map(option => {
|
options = options.map(option => {
|
||||||
if (option.includes(' ')) {
|
if (option.includes(' ')) {
|
||||||
|
@ -13,7 +13,7 @@ function hookedSpawn(command, options) {
|
||||||
return option;
|
return option;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
return childProcessSpawn.call(childProcess, command, options);
|
return childProcessSpawn.call(childProcess, command, options, ...args);
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports.setup = function() {
|
module.exports.setup = function() {
|
||||||
|
|
|
@ -40,8 +40,7 @@ module.exports = function(grunt) {
|
||||||
'copy:desktop-darwin-installer',
|
'copy:desktop-darwin-installer',
|
||||||
'copy:desktop-windows-helper-ia32',
|
'copy:desktop-windows-helper-ia32',
|
||||||
'copy:desktop-windows-helper-x64',
|
'copy:desktop-windows-helper-x64',
|
||||||
'chmod:linux-desktop-x64',
|
'chmod:linux-desktop-x64'
|
||||||
'codesign:app'
|
|
||||||
]);
|
]);
|
||||||
|
|
||||||
grunt.registerTask('build-desktop-archives', [
|
grunt.registerTask('build-desktop-archives', [
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||||
|
<plist version="1.0">
|
||||||
|
<dict>
|
||||||
|
<key>com.apple.security.cs.allow-jit</key>
|
||||||
|
<true/>
|
||||||
|
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
|
||||||
|
<true/>
|
||||||
|
<key>com.apple.security.cs.allow-dyld-environment-variables</key>
|
||||||
|
<true/>
|
||||||
|
</dict>
|
||||||
|
</plist>
|
|
@ -1,5 +1,8 @@
|
||||||
Release notes
|
Release notes
|
||||||
-------------
|
-------------
|
||||||
|
##### v1.11.8 (2019-10-10)
|
||||||
|
`-` fix #1292: macOS app notarization
|
||||||
|
|
||||||
##### v1.11.7 (2019-10-08)
|
##### v1.11.7 (2019-10-08)
|
||||||
`-` fix #1289: crash on Auto sorting mode
|
`-` fix #1289: crash on Auto sorting mode
|
||||||
`-` fix #1288: issues when opening a file during in auto-type mode
|
`-` fix #1288: issues when opening a file during in auto-type mode
|
||||||
|
|
Loading…
Reference in New Issue