From 697a00e502a7be2e2f572b94a6e77e7433a3c992 Mon Sep 17 00:00:00 2001 From: Darel Finkbeiner Date: Tue, 21 Apr 2015 15:12:07 -0400 Subject: [PATCH 1/3] add preliminary node-pre-gyp support --- binding.gyp | 11 +++++++++++ lib/node-expat.js | 7 +++++-- package.json | 17 +++++++++++++---- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/binding.gyp b/binding.gyp index 2073fe3..1fa30c5 100644 --- a/binding.gyp +++ b/binding.gyp @@ -9,6 +9,17 @@ 'dependencies': [ 'deps/libexpat/libexpat.gyp:expat' ] + }, + { + 'target_name': 'action_after_build', + 'type': 'none', + 'dependencies': [ '<(module_name)' ], + 'copies': [ + { + 'files': [ '<(PRODUCT_DIR)/<(module_name).node' ], + 'destination': '<(module_path)' + } + ] } ] } diff --git a/lib/node-expat.js b/lib/node-expat.js index 597a047..55d78cd 100644 --- a/lib/node-expat.js +++ b/lib/node-expat.js @@ -1,7 +1,10 @@ var EventEmitter = require('events').EventEmitter var util = require('util') // Only support nodejs v0.6 and on so no need to look for older module location -var expat = require('bindings')('node_expat') +var binary = require('node-pre-gyp') +var path = require('path') +var binding_path = binary.find(path.resolve(path.join(__dirname,'../package.json'))) +var expat = require(binding_path) var Stream = require('stream').Stream var Parser = function(encoding) { @@ -109,4 +112,4 @@ exports.createParser = function(cb) { parser.on('startElement', cb) } return parser -} \ No newline at end of file +} diff --git a/package.json b/package.json index 3de1b0a..d983b58 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "node-expat", "version": "2.3.7", - "main": "./lib/node-expat", + "main": "./lib/node-expat.js", "description": "NodeJS binding for fast XML parsing.", "keywords": [ "xml", @@ -12,16 +12,25 @@ "parsing" ], "scripts": { - "test": "vows --spec ./test/**/*.js" + "test": "vows --spec ./test/**/*.js", + "install": "node-pre-gyp install --fallback-to-build" }, "dependencies": { "bindings": "~1.2.1", "debug": "~2.1.0", "iconv": "~2.1.5", - "nan": "~1.7.0" + "nan": "~1.7.0", + "node-pre-gyp": "0.5.x" }, "devDependencies": { - "vows": ">=0.5.12" + "vows": ">=0.5.12", + "aws-sdk": "~2.0.0-rc.15" + }, + "bundledDependencies": ["node-pre-gyp"], + "binary": { + "module_name": "node_expat", + "module_path": "./lib/binding/", + "host": "https://node-expat" }, "repository": { "type": "git", From a5442fc6efa1911770ecb4544a568a3e95faf806 Mon Sep 17 00:00:00 2001 From: Darel Finkbeiner Date: Fri, 24 Apr 2015 08:56:23 -0400 Subject: [PATCH 2/3] make a full example pre-release for this fork --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d983b58..3572f28 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "node-expat", - "version": "2.3.7", + "version": "2.3.7-precomp", "main": "./lib/node-expat.js", "description": "NodeJS binding for fast XML parsing.", "keywords": [ @@ -30,7 +30,7 @@ "binary": { "module_name": "node_expat", "module_path": "./lib/binding/", - "host": "https://node-expat" + "host": "https://github.com/darelf/node-expat/releases/download/v2.3.7-precomp" }, "repository": { "type": "git", From 3fcc9907f56530cb61a3e4c7b966178e023bc781 Mon Sep 17 00:00:00 2001 From: Darel Finkbeiner Date: Thu, 30 Apr 2015 08:37:04 -0400 Subject: [PATCH 3/3] change url to work with master --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 3572f28..9395308 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "node-expat", - "version": "2.3.7-precomp", + "version": "2.3.8", "main": "./lib/node-expat.js", "description": "NodeJS binding for fast XML parsing.", "keywords": [ @@ -30,7 +30,7 @@ "binary": { "module_name": "node_expat", "module_path": "./lib/binding/", - "host": "https://github.com/darelf/node-expat/releases/download/v2.3.7-precomp" + "host": "https://github.com/node-xmpp/node-expat/releases/download/v2.3.8" }, "repository": { "type": "git",