Skip to content

Commit

Permalink
JBDS-3851 gulp task package refactored, small fixes in other tasks
Browse files Browse the repository at this point in the history
  • Loading branch information
@ppitonak @jrichter1
ppitonak authored and jrichter1 committed Apr 21, 2016
1 parent 250d4d5 commit 7bf4fb9
Showing 1 changed file with 63 additions and 69 deletions.
132 changes: 63 additions & 69 deletions gulpfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ var gulp = require('gulp'),
require('./gulp-tasks/tests')(gulp);

var artifactName = 'jboss-devstudio-platform',
artifactType = '',
artifactPlatform = 'win32',
artifactArch = 'x64';

var buildFolderRoot = 'dist/win/';
var buildFileNamePrefix = artifactName + '-' + artifactPlatform + '-' + artifactArch;
var buildFolder = buildFolderRoot + buildFileNamePrefix;
var prefetchFolder = buildFolderRoot + buildFileNamePrefix; // or just use downloads/ folder to that a clean doesn't wipe out the downloads
let buildFolderPath = path.resolve(buildFolderRoot);

let zaRoot = path.resolve(buildFolderRoot);
let zaZip = path.join(zaRoot, '7za920.zip');
Expand All @@ -38,6 +38,9 @@ let zaSfxExe = path.join(zaRoot, '7zS.exe');
let zaExtra7z = path.join(zaRoot, '7z920_extra.7z');
let rhZip = path.join(zaRoot, 'resource_hacker.zip');
let rhExe = path.join(zaRoot, 'ResourceHacker.exe');
let zaElectronPackage = path.join(zaRoot, artifactName + '-win32-x64');
let bundled7z = path.join(zaRoot, artifactName +'-win32-x64.7z');
let installerExe = resolveInstallerExePath('');

gulp.task('transpile:app', function() {
return gulp.src(['./main/*.es6.js'])
Expand Down Expand Up @@ -71,7 +74,6 @@ function createExecCallback(cb, quiet) {

gulp.task('generate', ['transpile:app'], function(cb) {
var electronVersion = pjson.devDependencies['electron-prebuilt'];
let buildFolderPath = path.resolve(buildFolderRoot);
let configIcon = path.resolve(path.join(buildFolderPath, '..', '..', 'resources', artifactName + '.ico'));
var cmd = path.join('node_modules', '.bin') + path.sep + 'electron-packager . ' + artifactName + ' --platform=' + artifactPlatform + ' --arch=' + artifactArch;
cmd += ' --version=' + electronVersion + ' --out="' + buildFolderPath + '" --overwrite --asar=true';
Expand Down Expand Up @@ -112,68 +114,48 @@ gulp.task('download-7zip-extra', function() {

gulp.task('unzip-7zip-extra', ['download-7zip-extra', 'unzip-7zip'], function(cb) {
let cmd = zaExe + ' e ' + zaExtra7z + ' -o' + zaRoot + ' -y ' + '7zS.sfx';
console.log(cmd);

return exec(cmd, createExecCallback(cb, true));
// console.log(cmd);
exec(cmd, createExecCallback(cb, true));
});

// download-7zip and download-7zip-extra are listed here only for easier understanding
gulp.task('prepare-7zip', ['download-7zip', 'unzip-7zip', 'download-7zip-extra', 'unzip-7zip-extra']);

// Wrap electron-generated app to self extractring 7zip archive
gulp.task('package', ['prepare-7zip', 'prepare-resource-hacker'], function (cb) {
// wrap electron-generated app to 7zip archive
gulp.task('create-7zip-archive', function(cb) {
let packCmd = zaExe + ' a ' + bundled7z + ' ' + zaElectronPackage + path.sep + '*';
exec(packCmd, createExecCallback(cb, true));
});

let zaElectronPackage = path.join(zaRoot, artifactName + '-win32-x64');
gulp.task('update-metadata', function(cb) {
// compiling a .rc to .res doesn't work so have to do it by hand when the version in package.json changes
// let configRC = path.resolve(path.join(buildFolderRoot, '..', '..', 'resources', artifactName + '.rc')); // metadataincluding company info and copyright
let configRes = path.resolve(path.join(buildFolderRoot, '..', '..', 'resources', artifactName + '.res')); // resource ncluding icon & metadata
// let resHackCompileCmd = rhExe + ' -compile ' + configRC + ", " + configRes;
// console.log(resHackCompileCmd);
// run ResourceHacker.exe to insert a new icon into the installer .exe
// exec(resHackCompileCmd, function (err, stdout, stderr) {
// console.log(stderr);
// if (!err) {
let resHackModifyCmd = rhExe + ' -modify ' + zaSfx + ', ' + zaSfxExe + ', ' + configRes + ", , , "; // trailing commasrequired here!
// console.log(resHackModifyCmd);

exec(resHackModifyCmd, createExecCallback(cb, true));
});

gulp.task('create-final-exe', function(cb) {
let configTxt = path.resolve(path.join(zaRoot, '..', '..', 'config.txt'));
let bundled7z = path.join(zaRoot, artifactName +'-win32-x64.7z');
let installerExe = path.join(zaRoot, artifactName + '-' + pjson.version + artifactType + '-installer.exe');
let packageCmd = 'copy /b ' + zaSfxExe + ' + ' + configTxt + ' + ' + bundled7z + ' ' + installerExe;
// console.log(packageCmd);
exec(packageCmd, createExecCallback(cb, true));
});

console.log("Creating " + installerExe);
gulp.task('create-sha256sum-of-exe', function(cb) {
createSHA256File(installerExe, cb);
});

var packCmd = zaExe + ' a ' + bundled7z + ' ' + zaElectronPackage + path.sep + '*';
console.log(packCmd);
exec(packCmd, function (err, stdout, stderr) {
//console.log(stdout);
console.log(stderr);
if (!err) {
// compiling a .rc to .res doesn't work so have to do it by hand when the version in package.json changes
// var configRC = path.resolve(path.join(buildFolderRoot, '..', '..', 'resources', artifactName + '.rc')); // metadata including company info and copyright
var configRes = path.resolve(path.join(buildFolderRoot, '..', '..', 'resources', artifactName + '.res')); // resource including icon & metadata
// var resHackCompileCmd = rhExe + ' -compile ' + configRC + ", " + configRes;
// console.log(resHackCompileCmd);
// run ResourceHacker.exe to insert a new icon into the installer .exe
// exec(resHackCompileCmd, function (err, stdout, stderr) {
// console.log(stderr);
// if (!err) {
var resHackModifyCmd = rhExe + ' -modify ' + zaSfx + ', ' + zaSfxExe + ', ' + configRes + ", , , "; // trailing commas required here!
console.log(resHackModifyCmd);

exec(resHackModifyCmd, function (err, stdout, stderr) {
// console.log(stdout);
console.log(stderr);
if (!err) {

var packageCmd = 'copy /b ' + zaSfxExe + ' + ' + configTxt + ' + ' + bundled7z + ' ' + installerExe;
console.log(packageCmd);

// run ResourceHacker.exe to insert a new icon into the installer .exe
exec(packageCmd, function (err, stdout, stderr) {
console.log(stderr);
console.log(stdout);
// ResourceHacker console log available in zaRoot + "/ResourceHacker.log"
if(!err) {
createSHA256File(installerExe);
}
cb(err);
});
} else{
cb(err);
}
});
} else {
cb(err);
}
});
gulp.task('package', function(cb) {
runSequence('create-7zip-archive', 'update-metadata', 'create-final-exe', 'create-sha256sum-of-exe', cb);
});

// for a given filename, return the sha256sum
Expand Down Expand Up @@ -201,9 +183,15 @@ function getSHA256(filename, cb) {
}

// writes to {filename}.sha256, eg., 6441cde1821c93342e54474559dc6ff96d40baf39825a8cf57b9aad264093335 requirements.json
function createSHA256File(filename) {
getSHA256(filename, function(hashstring) { fs.writeFileSync(filename + ".sha256", hashstring + " *" + path.parse(filename).base); })
return true;
function createSHA256File(filename, cb) {
getSHA256(filename, function(hashstring) {
fs.writeFileSync(filename + ".sha256", hashstring + " *" + path.parse(filename).base);
if (cb) {
cb();
} else {
return true;
}
});
}

gulp.task('download-resource-hacker', function() {
Expand All @@ -221,29 +209,31 @@ gulp.task('unzip-resource-hacker', ['download-resource-hacker'], function() {
gulp.task('prepare-resource-hacker', ['unzip-resource-hacker', 'download-resource-hacker']);

// Create stub installer that will then download all the requirements
gulp.task('package-simple', ['check-requirements'], function() {
return runSequence('clean', 'generate', 'package', 'cleanup');
gulp.task('package-simple', function(cb) {
runSequence(['check-requirements', 'clean'], 'generate', ['prepare-7zip', 'prepare-resource-hacker'], 'package', 'cleanup', cb);
});

// Create bundled installer
gulp.task('package-bundle', ['check-requirements'], function() {
return runSequence('clean', 'generate', 'prefetch', 'package', '7zip-cleanup');
gulp.task('package-bundle', function(cb) {
runSequence(['check-requirements', 'clean'], 'generate', ['prepare-7zip', 'prepare-resource-hacker'], 'prefetch', 'package', 'cleanup', cb);
});

// Create both installers
gulp.task('dist', ['check-requirements'], function() {
return runSequence('clean', 'generate', 'package', 'prefetch', 'package', 'cleanup');
gulp.task('dist', function(cb) {
runSequence(['check-requirements', 'clean'], 'generate', ['prepare-7zip', 'prepare-resource-hacker'], 'package', 'prefetch', 'package', 'cleanup', cb);
});

gulp.task('7zip-cleanup', function() {
del([buildFolderRoot + 'DeveloperPlatformInstaller-w32-x64.7z', path.resolve(path.join(buildFolderRoot, '7z*'))], { force: false });
return del([buildFolderRoot + 'DeveloperPlatformInstaller-w32-x64.7z', path.resolve(path.join(buildFolderRoot, '7z*'))], { force: false });
});

gulp.task('resource-hacker-cleanup', function() {
del([path.resolve(path.join(buildFolderRoot, 'resource_hacker.zip')), path.resolve(path.join(buildFolderRoot, 'ResourceHacker.*'))], { force: false });
return del([path.resolve(path.join(buildFolderRoot, 'resource_hacker.zip')), path.resolve(path.join(buildFolderRoot, 'ResourceHacker.*'))], { force: false });
});

gulp.task('cleanup', ['7zip-cleanup', 'resource-hacker-cleanup']);
gulp.task('cleanup', function(cb) {
runSequence(['7zip-cleanup', 'resource-hacker-cleanup'], cb);
});

gulp.task('test', function() {
return runSequence('create-electron-symlink', 'unit-test', 'delete-electron-symlink', 'browser-test');
Expand All @@ -267,6 +257,10 @@ function isExistingSHA256Current(currentFile, sha256sum, processResult) {
}
}

function resolveInstallerExePath(artifactType) {
return path.join(zaRoot, artifactName + '-' + pjson.version + artifactType + '-installer.exe');
}

// download all the installer dependencies so we can package them up into the .exe
gulp.task('prefetch', function(cb) {
let counter=0;
Expand Down Expand Up @@ -300,10 +294,10 @@ gulp.task('prefetch', function(cb) {
});
}
}
artifactType = "-bundle";
installerExe = resolveInstallerExePath('-bundle');
});

//check if URLs in requirements.json return 200 and generally point to their appropriate tools
gulp.task('check-requirements', function(cb) {
return exec('node test/check-requirements.js', createExecCallback(cb, false));
exec('node test/check-requirements.js', createExecCallback(cb, false));
})

0 comments on commit 7bf4fb9

Please sign in to comment.