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

Integrating electron-builder for better distributables building #972

Merged
merged 31 commits into from
Sep 15, 2016
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
9df1a7e
basic OS X build working
hiddentao Jul 15, 2016
dd39013
work towards multi-platform builds on osx
hiddentao Jul 15, 2016
e2872b2
Merge remote-tracking branch 'mist/develop' into electron_builder
hiddentao Jul 20, 2016
2aa44c7
updated shrinkwrap
hiddentao Jul 20, 2016
da1a86f
fix electron prebuilt v
hiddentao Jul 20, 2016
7eaca8c
work towards fixing node path
hiddentao Jul 20, 2016
0f41ed4
console log
hiddentao Jul 21, 2016
4d79f40
fix node path for mac builds
hiddentao Jul 21, 2016
a689264
fixed downloading and unzipping of nodes
hiddentao Jul 21, 2016
da497d8
remove decompressino plugin
hiddentao Jul 21, 2016
69d9b89
shift towards programmatic use of electron-builder
hiddentao Jul 21, 2016
0419a1f
Merge branch 'develop' into electron_builder
hiddentao Jul 28, 2016
9f931b7
dynamically fetch electron version
hiddentao Jul 28, 2016
56f3d07
fix node downloads
hiddentao Jul 28, 2016
cd8022e
remove redundant line
hiddentao Jul 28, 2016
835d739
fix unzipping / rename nodes
hiddentao Jul 28, 2016
f0c433f
fixes for platform node checking
hiddentao Aug 1, 2016
ced1de0
fixed loading of node on windows
hiddentao Aug 2, 2016
aaca7a2
fix use of options.platform
hiddentao Aug 2, 2016
a99c731
further fixes for use options.platform
hiddentao Aug 2, 2016
e11c75b
shrinkwrap
hiddentao Aug 2, 2016
d03b29c
Merge remote-tracking branch 'mist/develop' into electron_builder
hiddentao Aug 3, 2016
cc9db63
refactor node downloading code
hiddentao Aug 3, 2016
bff62a9
get mac build working again
hiddentao Aug 3, 2016
511989a
rename darwin to mac
hiddentao Aug 3, 2016
ad6ee1e
fix build
hiddentao Aug 8, 2016
a2906ca
updated README
hiddentao Aug 8, 2016
d2ba3b0
more readme updates
hiddentao Aug 8, 2016
a88ad95
Merge branch 'develop' into electron_builder
hiddentao Aug 8, 2016
b7a9412
Merge remote-tracking branch 'mist/develop' into electron_builder
hiddentao Sep 8, 2016
b81a0ae
fix build
hiddentao Sep 8, 2016
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
Prev Previous commit
Next Next commit
fix use of options.platform
  • Loading branch information
hiddentao committed Aug 2, 2016
commit aaca7a2f1efccd8688df9190f050f67b542f33c8
92 changes: 3 additions & 89 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,6 @@ if(_.contains(options.platform, 'mac')) {
}

if(_.contains(options.platform, 'all')) {
options.platform = ['win', 'mac', 'linux'];

nodeVersions = [
'darwin-x64',
// 'linux-arm',
Expand Down Expand Up @@ -425,7 +423,9 @@ gulp.task('build-dist', ['copy-i18n'], function(cb) {
);

// run build script
var oses = '--' + options.platform.join(' --');
let platform =
options.platform ? ['win', 'mac', 'linux'] : options.platform;
var oses = '--' + platform.join(' --');

var ret = shell.exec(`./build-dist.js --type ${type} ${oses}`, {
cwd: path.join(__dirname, 'dist_' + type, 'app'),
Expand All @@ -443,92 +443,6 @@ gulp.task('build-dist', ['copy-i18n'], function(cb) {
}
});

// FILE RENAMING

// gulp.task('change-files', ['create-binaries'], function() {
// var streams = [];

// nodeVersions.map(function(os){
// var path = './dist_'+ type +'/'+ filenameUppercase +'-'+ os;

// // change version file
// streams.push(gulp.src([
// path +'/version'
// ])
// .pipe(replace(electronVersion, version))
// .pipe(gulp.dest(path +'/')));

// // copy license file
// streams.push(gulp.src([
// './LICENSE'
// ])
// .pipe(gulp.dest(path +'/')));


// // copy authors file
// streams.push(gulp.src([
// './AUTHORS'
// ])
// .pipe(gulp.dest(path +'/')));

// // copy and rename readme
// streams.push(gulp.src([
// './Wallet-README.txt'
// ], { base: './' })
// .pipe(rename(function (path) {
// path.basename = "README";
// }))
// .pipe(gulp.dest(path + '/')));
// });


// return merge.apply(null, streams);
// });


//gulp.task('cleanup-files', ['change-files'], function (cb) {
// return del(['./dist_'+ type +'/**/Wallet-README.txt'], cb);
//});


// gulp.task('rename-folders', ['change-files'], function(done) {
// var count = 0;
// var called = false;
// nodeVersions.forEach(function(os){

// var path = createNewFileName(os);

// fs.renameSync('./dist_'+ type +'/'+ filenameUppercase +'-'+ os, path);

// // change icon on windows
// if(os.indexOf('win32') !== -1) {
// rcedit(path +'/'+ filenameUppercase +'.exe', {
// 'file-version': version,
// 'product-version': version,
// 'icon': './icons/'+ type +'/icon.ico'
// }, function(){
// if(!called && nodeVersions.length === count) {
// done();
// called = true;
// }
// });
// }


// //var zip5 = new EasyZip();
// //zip5.zipFolder(path, function(){
// // zip5.writeToFile(path +'.zip');
// //});


// count++;

// if(!called && nodeVersions.length === count) {
// done();
// called = true;
// }
// });
// });


// gulp.task('zip', ['rename-folders'], function () {
Expand Down