cmake-js
Advanced tools
Comparing version 3.2.3 to 3.3.0
@@ -1,2 +0,2 @@ | ||
v3.2.3 - 03/02/16 | ||
v3.2.3 - 08/17/16 | ||
================= | ||
@@ -72,2 +72,2 @@ | ||
- Node.js 4.0.0+ support | ||
- Downloads the small, header only tarball for Node.js 4+ | ||
- Downloads the small, header only tarball for Node.js 4+ |
@@ -0,0 +0,0 @@ var gulp = require("gulp"); |
@@ -0,0 +0,0 @@ var es6 = true; |
@@ -23,3 +23,3 @@ "use strict"; | ||
this.projectRoot = path.resolve(this.options.directory || process.cwd()); | ||
this.workDir = path.join(this.projectRoot, "build"); | ||
this.workDir = this.options.out || path.join(this.projectRoot, "build"); | ||
this.config = this.options.debug ? "Debug" : "Release"; | ||
@@ -31,2 +31,3 @@ this.buildDir = path.join(this.workDir, this.config); | ||
this.cMakeOptions = this.options.cMakeOptions || {}; | ||
this.silent = !!options.silent; | ||
} | ||
@@ -602,3 +603,3 @@ Object.defineProperties(CMake.prototype, { | ||
this.log.info("RUN", command); | ||
return processHelpers.run(command); | ||
return processHelpers.run(command, {silent: this.silent}); | ||
}; | ||
@@ -605,0 +606,0 @@ module.exports = CMake; |
"use strict"; | ||
var Bluebird = require("bluebird"); | ||
var splitargs = require("splitargs"); | ||
var _ = require("lodash"); | ||
var spawn = require("child_process").spawn; | ||
var exec = require("child_process").exec; | ||
var processHelpers = { | ||
run: function(command) { | ||
run: function(command, options) { | ||
options = _.defaults({silent: false}, options); | ||
return new Bluebird(function(resolve, reject) { | ||
@@ -12,3 +14,3 @@ var args = splitargs(command); | ||
args.splice(0, 1); | ||
var child = spawn(name, args, {stdio: "inherit"}); | ||
var child = spawn(name, args, {stdio: options.silent ? "ignore" : "inherit"}); | ||
var ended = false; | ||
@@ -15,0 +17,0 @@ child.on("error", function(e) { |
@@ -0,0 +0,0 @@ "use strict"; |
@@ -0,0 +0,0 @@ "use strict"; |
@@ -24,3 +24,3 @@ "use strict"; | ||
this.projectRoot = path.resolve(this.options.directory || process.cwd()); | ||
this.workDir = path.join(this.projectRoot, "build"); | ||
this.workDir = this.options.out || path.join(this.projectRoot, "build"); | ||
this.config = this.options.debug ? "Debug" : "Release"; | ||
@@ -32,2 +32,3 @@ this.buildDir = path.join(this.workDir, this.config); | ||
this.cMakeOptions = this.options.cMakeOptions || {}; | ||
this.silent = !!options.silent; | ||
} | ||
@@ -113,3 +114,3 @@ | ||
let D = []; | ||
// CMake.js watermark | ||
@@ -121,3 +122,3 @@ D.push({"CMAKE_JS_VERSION": environment.moduleVersion}); | ||
if (environment.isWin) { | ||
D.push({"CMAKE_RUNTIME_OUTPUT_DIRECTORY": this.workDir}); | ||
D.push({"CMAKE_RUNTIME_OUTPUT_DIRECTORY": this.workDir}); | ||
} | ||
@@ -308,5 +309,5 @@ else { | ||
this.log.info("RUN", command); | ||
return processHelpers.run(command); | ||
return processHelpers.run(command, {silent: this.silent}); | ||
}; | ||
module.exports = CMake; |
@@ -0,0 +0,0 @@ "use strict"; |
@@ -0,0 +0,0 @@ "use strict"; |
@@ -0,0 +0,0 @@ "use strict"; |
@@ -0,0 +0,0 @@ "use strict"; |
@@ -0,0 +0,0 @@ "use strict"; |
@@ -0,0 +0,0 @@ "use strict"; |
"use strict"; | ||
let Bluebird = require("bluebird"); | ||
let splitargs = require("splitargs"); | ||
let _ = require("lodash"); | ||
let spawn = require("child_process").spawn; | ||
@@ -8,3 +9,4 @@ let exec = require("child_process").exec; | ||
let processHelpers = { | ||
run: function (command) { | ||
run: function (command, options) { | ||
options = _.defaults({silent: false}, options); | ||
return new Bluebird(function (resolve, reject) { | ||
@@ -14,3 +16,3 @@ let args = splitargs(command); | ||
args.splice(0, 1); | ||
let child = spawn(name, args, {stdio: "inherit"}); | ||
let child = spawn(name, args, {stdio: options.silent ? "ignore" : "inherit"}); | ||
let ended = false; | ||
@@ -50,2 +52,2 @@ child.on("error", function (e) { | ||
module.exports = processHelpers; | ||
module.exports = processHelpers; |
@@ -0,0 +0,0 @@ "use strict"; |
@@ -0,0 +0,0 @@ "use strict"; |
@@ -0,0 +0,0 @@ "use strict"; |
@@ -0,0 +0,0 @@ "use strict"; |
@@ -18,3 +18,3 @@ { | ||
], | ||
"version": "3.2.3", | ||
"version": "3.3.0", | ||
"author": "Gábor Mező aka unbornchikken", | ||
@@ -21,0 +21,0 @@ "repository": { |
@@ -146,2 +146,5 @@ # CMake.js (MIT) | ||
-D<your-arg-here> [string] | ||
--i, --silent CMake.js to print to the stdio [boolean] | ||
-u, --out Specify the output directory to compile to, default is | ||
projectRoot/build [string] | ||
``` | ||
@@ -363,2 +366,2 @@ | ||
- [javedulu](https://github.com/javedulu) option to generate Xcode project (-x, --prefer-xcode) | ||
- [Gerhard Berger](https://github.com/gerhardberger) - Custom CMake parameter support | ||
- [Gerhard Berger](https://github.com/gerhardberger) - Custom CMake parameter support, silent and out parameters |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
3850
366
192732