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

node 6.3.1 for linux #574

Merged
marcelgerber merged 1 commit into from
Sep 3, 2016
Merged

node 6.3.1 for linux #574

Show file tree
Hide file tree
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
12 changes: 5 additions & 7 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ module.exports = function (grunt) {
},
"node-mac": {
"dest" : "<%= downloads %>",
"src" : "http://nodejs.org/dist/v<%= node.version %>/node-v<%= node.version %>-darwin-x86.tar.gz"
"src" : "http://nodejs.org/dist/v<%= node.version %>/node-v<%= node.version %>-darwin-x64.tar.gz"
},
/* win */
"cef-win": {
Expand All @@ -84,8 +84,9 @@ module.exports = function (grunt) {
},
"node-win": {
"dest" : "<%= downloads %>",
"src" : ["http://nodejs.org/dist/v<%= node.version %>/node.exe",
"http://nodejs.org/dist/npm/npm-<%= npm.version %>.zip"]
"src" : process.arch === "x64" ?
"http://nodejs.org/dist/v<%= node.version %>/win-x64/node.exe" :
"http://nodejs.org/dist/v<%= node.version %>/win-x86/node.exe"
}
},
"clean": {
Expand Down Expand Up @@ -221,10 +222,7 @@ module.exports = function (grunt) {
"version" : "3.1547.1459"
},
"node": {
"version" : "0.10.24"
},
"npm": {
"version" : "1.2.11"
"version" : "6.3.1"
}
});

Expand Down
15 changes: 3 additions & 12 deletions tasks/setup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,24 +375,15 @@ module.exports = function (grunt) {
// requires node to set "nodeSrc" in config
grunt.task.requires(["node"]);

var done = this.async(),
nodeDest = grunt.config("nodeDest"),
exeFile = nodeDest[0],
npmFile = nodeDest[1];
var nodeDest = grunt.config("nodeDest"),
exeFile = nodeDest;

grunt.file.mkdir("deps/node");

// copy node.exe to Brackets-node
grunt.file.copy(exeFile, "deps/node/node.exe");

// unzip NPM
unzip(npmFile, "deps/node").then(function () {
nodeWriteVersion();
done();
}, function (err) {
grunt.log.error(err);
done(false);
});
nodeWriteVersion();
});

// task: node-mac
Expand Down