From 837eb040dea33822614306d4db6c8268ef240e58 Mon Sep 17 00:00:00 2001 From: Luca Zeug Date: Thu, 26 Jan 2017 23:31:22 +0100 Subject: [PATCH 1/2] don't build NSIS installer in 'wallet' task --- gulpfile.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index fcdf538b6..e16ed0f44 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -57,8 +57,6 @@ const osArchList = [ console.log('You can select a platform like: --platform '); - -console.log('App type:', type); console.log('Mist version:', version); console.log('Electron version:', electronVersion); @@ -352,7 +350,7 @@ gulp.task('release-dist', ['build-dist'], (done) => { } } - if (platformIsActive('win')) { + if (platformIsActive('win') && type === 'mist') { runSeq('build-nsis'); } }); @@ -467,8 +465,8 @@ gulp.task('wallet-checksums', (cb) => { gulp.task('build-nsis', (cb) => { const versionParts = version.split('.'); - const versionString = ''.concat('-DVERSIONMAJOR=', versionParts[0], ' -DVERSIONMINOR=', versionParts[1], ' -DVERSIONBUILD=', versionParts[2]); - const cmdString = 'makensis'.concat(' -V3 ', versionString, ' scripts/windows-installer.nsi'); + const versionString = `-DVERSIONMAJOR=${versionParts[0]} -DVERSIONMINOR=${versionParts[1]} -DVERSIONBUILD=${versionParts[2]}`; + const cmdString = `makensis -V3 ${versionString} scripts/windows-installer.nsi`; console.log(cmdString); shell.exec(cmdString, cb); }); From 819178386ce6d997594ab97ea5d16b2703a0775b Mon Sep 17 00:00:00 2001 From: Luca Zeug Date: Thu, 26 Jan 2017 23:31:42 +0100 Subject: [PATCH 2/2] [readme] add 'makensis' to brew install --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ece726016..3aecc79d8 100644 --- a/README.md +++ b/README.md @@ -156,7 +156,7 @@ Mist normally. To create a binaries you need to install [`electron-builder` dependencies](https://github.com/electron-userland/electron-builder/wiki/Multi-Platform-Build#macos): // tools for the windows binaries - $ brew install wine --without-x11 mono + $ brew install wine --without-x11 mono makensis // tools for the Linux binaries $ brew install gnu-tar libicns graphicsmagick xz // general dependencies