Skip to content
This repository was archived by the owner on Sep 2, 2021. It is now read-only.

fetch origin for new branches. fix jshint errors. #286

Closed
jasonsanjose wants to merge 2 commits into from
Closed

fetch origin for new branches. fix jshint errors. #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f21e5c5
fetch origin for new branches. fix jshint errors.
jasonsanjose Jul 24, 2013
e080a63
use correct fs.symlink on mac and linux
jasonsanjose Jul 25, 2013
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
1 change: 1 addition & 0 deletions tasks/build.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ module.exports = function (grunt) {

var done = this.async(),
promise = spawn([
"git fetch origin",
"git checkout " + this.data.branch,
"git pull origin " + this.data.branch,
"git submodule sync",
Expand Down
4 changes: 2 additions & 2 deletions tasks/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* DEALINGS IN THE SOFTWARE.
*
*/
/*jslint es5:true, vars: true, plusplus: true, regexp: true*/
/*jslint es5:true, vars: true, plusplus: true, regexp: true, nomen: true*/
/*global module, require, process, Buffer*/
module.exports = function (grunt) {
"use strict";
Expand Down Expand Up @@ -187,7 +187,7 @@ module.exports = function (grunt) {
code: code,
stdout: stdout.toString(),
stderr: stderr.toString(),
toString: function() {
toString: function () {
if (code === 0) {
return this.stdout;
} else {
Expand Down
23 changes: 10 additions & 13 deletions tasks/setup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,21 +45,18 @@ module.exports = function (grunt) {

// cross-platform symbolic link
link = (function () {
var symlink;
var typeArg,
symlink;

if (process.platform === "win32") {
symlink = q.denodeify(fs.symlink);

return function (srcpath, destpath) {
return symlink(srcpath, destpath, "junction");
};
} else {
symlink = q.denodeify(fs.link);

return function (srcpath, destpath) {
return symlink(srcpath, destpath);
};
typeArg = "junction";
}

symlink = q.denodeify(fs.symlink);

return function (srcpath, destpath) {
return symlink(srcpath, destpath, typeArg);
};
}());

function unzip(src, dest) {
Expand Down Expand Up @@ -90,7 +87,7 @@ module.exports = function (grunt) {
grunt.verbose.writeln("Found CEF download " + zipDest);
grunt.task.run(["cef-clean", "cef-extract", "cef-symlinks"]);
} else {
grunt.task.run(["cef-download","cef-clean", "cef-extract", "cef-symlinks"]);
grunt.task.run(["cef-download", "cef-clean", "cef-extract", "cef-symlinks"]);
}
} else {
grunt.verbose.writeln("Skipping CEF download. Found deps/cef/" + txtName);
Expand Down