packaging

Gruntfile.js

@@ -98,12 +98,12 @@ module.exports = function(grunt) {
                 nonull: true
             },
             'desktop_osx': {
-                src: 'tmp/desktop/KeeWeb-darwin-x64/KeeWeb-' + pkg.version + '.dmg',
+                src: 'tmp/desktop/mac/KeeWeb-' + pkg.version + '.dmg',
                 dest: 'dist/desktop/KeeWeb.mac.dmg',
                 nonull: true
             },
             'desktop_win': {
-                src: 'tmp/desktop/win/KeeWebSetup-' + pkg.version + '-ia32.exe',
+                src: 'tmp/desktop/win-ia32/KeeWeb Setup ' + pkg.version + '-ia32.exe',
                 dest: 'dist/desktop/KeeWeb.win32.exe',
                 nonull: true
             },

grunt/tasks/grunt-electron-builder.js

@@ -1,21 +1,16 @@
 'use strict';
 
 var builder = require('electron-builder');
-var osxPackager = require('electron-builder/out/osxPackager');
-var platformPackager = require('electron-builder/out/platformPackager');
+var macPackager = require('electron-builder/out/macPackager');
 var linuxPackager = require('electron-builder/out/linuxPackager');
 
 var version;
 
-// workaround for https://github.com/electron-userland/electron-builder/issues/322
-osxPackager.default.prototype.zipMacApp = function() {
-    return Promise.resolve();
-};
-
 // workaround for https://github.com/electron-userland/electron-builder/issues/323
-platformPackager.PlatformPackager.prototype.computeBuildNumber = function() {
-    this.devMetadata.build['build-version'] = version;
-    return version;
+macPackager.default.prototype._origPrepareAppInfo = macPackager.default.prototype.prepareAppInfo;
+macPackager.default.prototype.prepareAppInfo = function(appInfo) {
+    this.platformSpecificBuildOptions.bundleVersion = version;
+    return this._origPrepareAppInfo(appInfo);
 };
 
 // we don't have 512x512 icon

package.json

@@ -63,7 +63,8 @@
     "compression": "maximum",
     "asar": false,
     "extend-info": "package/osx/extend.plist",
-    "osx": {
+    "mac": {
+      "target": "dmg",
       "contents": [
         {
           "x": 438,
@@ -80,6 +81,7 @@
       "icon-size": 80
     },
     "win": {
+      "target": "squirrel",
       "loadingGif": "graphics/install.gif"
     }
   },