Skip to content
This repository has been archived by the owner on Sep 5, 2020. It is now read-only.

[gulp] don't build NSIS installer on 'wallet' task #1614

Merged
merged 4 commits into from
Jan 31, 2017
Merged

[gulp] don't build NSIS installer on 'wallet' task #1614

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
837eb04
don't build NSIS installer in 'wallet' task
Jan 26, 2017
8191783
[readme] add 'makensis' to brew install
Jan 26, 2017
de37227
Merge branch 'develop' into luclu_various-NSIS
luclu Jan 31, 2017
acf41ef
Merge branch 'develop' into luclu_various-NSIS
evertonfraga Jan 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ const osArchList = [


console.log('You can select a platform like: --platform <mac|win|linux|all>');

console.log('App type:', type);
console.log('Mist version:', version);
console.log('Electron version:', electronVersion);

Expand Down Expand Up @@ -352,7 +350,7 @@ gulp.task('release-dist', ['build-dist'], (done) => {
}
}

if (platformIsActive('win')) {
if (platformIsActive('win') && type === 'mist') {
runSeq('build-nsis');
}
});
Expand Down Expand Up @@ -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);
});
Expand Down