removed confusing win32 name

pull/281/head
antelle 2016-07-17 12:13:14 +03:00
parent dd886a1e41
commit ddf11a2ec4
3 changed files with 8 additions and 5 deletions

View File

@ -348,11 +348,11 @@ module.exports = function(grunt) {
files: [{ cwd: 'tmp/desktop/app', src: '**', expand: true }]
},
'win32-x64': {
options: { archive: 'dist/desktop/KeeWeb.win32.x64.zip' },
options: { archive: 'dist/desktop/KeeWeb.win.x64.zip' },
files: [{ cwd: 'tmp/desktop/KeeWeb-win32-x64', src: '**', expand: true }]
},
'win32-ia32': {
options: { archive: 'dist/desktop/KeeWeb.win32.ia32.zip' },
options: { archive: 'dist/desktop/KeeWeb.win.ia32.zip' },
files: [{ cwd: 'tmp/desktop/KeeWeb-win32-ia32', src: '**', expand: true }]
},
'linux-x64': {
@ -392,12 +392,14 @@ module.exports = function(grunt) {
},
'win32-x64': {
options: {
arch: 'x64'
arch: 'x64',
output: 'dist/desktop/KeeWeb.win.x64.exe'
}
},
'win32-ia32': {
options: {
arch: 'ia32'
arch: 'ia32',
output: 'dist/desktop/KeeWeb.win.ia32.exe'
}
}
},

View File

@ -15,6 +15,7 @@ module.exports = function (grunt) {
args.push(`${prefix}D${key}=${value}`);
});
args.push(`${prefix}Darch=${opt.arch}`);
args.push(`${prefix}Doutput=${opt.output}`);
args.push(`${prefix}NOCD`);
args.push(opt.installScript);
let executable = win ? 'C:\\Program Files (x86)\\NSIS\\makensis.exe' : 'makensis';

View File

@ -1,5 +1,5 @@
Name "${PRODUCT_NAME}"
OutFile dist/desktop/KeeWeb.win32.${arch}.exe
OutFile "${output}"
InstallDir "$PROGRAMFILES\KeeWeb"
ShowInstDetails show
ShowUnInstDetails show