Skip to content

Added ability to specify jar directly. #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added ability to specify jar directly. #50

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 18 additions & 7 deletions tasks/closure-compiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = function(grunt) {
module.exports = function (grunt) {

'use strict';

Expand All @@ -11,7 +11,7 @@ module.exports = function(grunt) {
// TASKS
// ==========================================================================

grunt.registerMultiTask('closure-compiler', 'Minify JS files using Closure Compiler.', function() {
grunt.registerMultiTask('closure-compiler', 'Minify JS files using Closure Compiler.', function () {

var closurePath = '',
reportFile = '',
Expand All @@ -33,7 +33,18 @@ module.exports = function(grunt) {
return false;
}

var command = 'java -jar "' + closurePath + '/build/compiler.jar"';
// Add String.endsWith function
if (typeof String.prototype.endsWith !== 'function') {
String.prototype.endsWith = function (suffix) {
return this.indexOf(suffix, this.length - suffix.length) !== -1;
};
}

// Append filepath if jar is not specified
if (!closurePath.endsWith('.jar')) {
closurePath += '/build/compiler.jar';
}
var command = 'java -jar "' + closurePath + '"';

data.cwd = data.cwd || './';

Expand Down Expand Up @@ -88,7 +99,7 @@ module.exports = function(grunt) {
grunt.file.write(data.jsOutputFile, '');

// Minify WebGraph class.
exec(command, { maxBuffer: data.maxBuffer * 1024, cwd: data.cwd }, function(err, stdout, stderr) {
exec(command, { maxBuffer: data.maxBuffer * 1024, cwd: data.cwd }, function (err, stdout, stderr) {
if (err) {
grunt.warn(err);
done(false);
Expand All @@ -101,7 +112,7 @@ module.exports = function(grunt) {
// If OK, calculate gzipped file size.
if (reportFile.length) {
var min = fs.readFileSync(data.jsOutputFile, 'utf8');
min_info(min, function(err) {
min_info(min, function (err) {
if (err) {
grunt.warn(err);
done(false);
Expand All @@ -111,7 +122,7 @@ module.exports = function(grunt) {
done();
} else {
// Write compile report to a file.
fs.writeFile(reportFile, stderr, function(err) {
fs.writeFile(reportFile, stderr, function (err) {
if (err) {
grunt.warn(err);
done(false);
Expand All @@ -136,7 +147,7 @@ module.exports = function(grunt) {

// Output some size info about a file.
function min_info(min, onComplete) {
gzip(min, function(err, buffer) {
gzip(min, function (err, buffer) {
if (err) {
onComplete.call(this, err);
}
Expand Down