Restore dtrace-provider in optionalDependencies

dtrace-provider v0.3.0 fixes build issues of yore. This fixes things
for node 0.11/0.12 usage.

Fixes #157
master
Trent Mick 2014-10-15 22:18:11 -07:00
parent 5598700713
commit 6fc941c9b4
5 changed files with 26 additions and 13 deletions

View File

@ -6,9 +6,19 @@ Known issues:
bug](https://github.com/TooTallNate/node-gyp/issues/65). bug](https://github.com/TooTallNate/node-gyp/issues/65).
## bunyan 1.1.4 (not yet released) ## bunyan 1.2.0 (not yet released)
(nothing yet) - [issue #157] Restore dtrace-provider as a dependency (in
"optionalDependencies").
Dtrace-provider version 0.3.0 add build sugar that should eliminate the
problems from older versions:
The build is not attempted on Linux and Windows. The build spew is
*not* emitted by default (use `V=1 npm install` to see it); instead a
short warning is emitted if the build fails.
Also, importantly, the new dtrace-provider fixes working with node
v0.11/0.12.
## bunyan 1.1.3 ## bunyan 1.1.3

View File

@ -32,7 +32,6 @@ NON_DTRACE_TEST_FILES := $(shell ls -1 test/*.test.js | grep -v dtrace | xargs)
all $(NODEUNIT): all $(NODEUNIT):
npm install npm install
npm install dtrace-provider
# Ensure all version-carrying files have the same version. # Ensure all version-carrying files have the same version.
.PHONY: versioncheck .PHONY: versioncheck
@ -87,8 +86,13 @@ test: $(NODEUNIT)
# Note: 'test10' is last so (if all is well) I end up with a binary # Note: 'test10' is last so (if all is well) I end up with a binary
# dtrace-provider build for node 0.10 (my current version). # dtrace-provider build for node 0.10 (my current version).
.PHONY: testall .PHONY: testall
testall: test08 test10 testall: test11 test08 test10
.PHONY: test11
test11:
@echo "# Test node 0.11.x (with node `$(NODEOPT)/node-0.11/bin/node --version`)"
@$(NODEOPT)/node-0.11/bin/node --version
PATH="$(NODEOPT)/node-0.11/bin:$(PATH)" make distclean all test
.PHONY: test10 .PHONY: test10
test10: test10:
@echo "# Test node 0.10.x (with node `$(NODEOPT)/node-0.10/bin/node --version`)" @echo "# Test node 0.10.x (with node `$(NODEOPT)/node-0.10/bin/node --version`)"

View File

@ -11,7 +11,7 @@
* vim: expandtab:ts=4:sw=4 * vim: expandtab:ts=4:sw=4
*/ */
var VERSION = '1.1.4'; var VERSION = '1.2.0';
var p = console.log; var p = console.log;
var util = require('util'); var util = require('util');

View File

@ -8,7 +8,7 @@
* vim: expandtab:ts=4:sw=4 * vim: expandtab:ts=4:sw=4
*/ */
var VERSION = '1.1.4'; var VERSION = '1.2.0';
// Bunyan log format version. This becomes the 'v' field on all log records. // Bunyan log format version. This becomes the 'v' field on all log records.
// `0` is until I release a version '1.0.0' of node-bunyan. Thereafter, // `0` is until I release a version '1.0.0' of node-bunyan. Thereafter,

View File

@ -1,6 +1,6 @@
{ {
"name": "bunyan", "name": "bunyan",
"version": "1.1.4", "version": "1.2.0",
"description": "a JSON logging library for node.js services", "description": "a JSON logging library for node.js services",
"author": "Trent Mick <trentm@gmail.com> (http://trentm.com)", "author": "Trent Mick <trentm@gmail.com> (http://trentm.com)",
"main": "./lib/bunyan.js", "main": "./lib/bunyan.js",
@ -13,17 +13,16 @@
"url": "git://github.com/trentm/node-bunyan.git" "url": "git://github.com/trentm/node-bunyan.git"
}, },
"engines": ["node >=0.8.0"], "engines": ["node >=0.8.0"],
"keywords": ["log", "logging", "log4j", "json"], "keywords": ["log", "logging", "log4j", "json", "bunyan"],
"dependencies": { "// comment1": "'dtrace-provider' required for dtrace features",
}, "// comment2": "'mv' required for RotatingFileStream",
"// comment: mv": "'mv' required for RotatingFileStream",
"// comment: dtrace": "dtrace-provider required for Bunyan dtrace features, but install is notoriously problematic on some plats (#135)",
"optionalDependencies": { "optionalDependencies": {
"dtrace-provider": "0.3.0",
"mv": "~2" "mv": "~2"
}, },
"devDependencies": { "devDependencies": {
"nodeunit": "0.7.4", "nodeunit": "0.9.*",
"ben": "0.0.0", "ben": "0.0.0",
"verror": "1.3.3", "verror": "1.3.3",
"vasync": "1.4.3" "vasync": "1.4.3"