From 73aee43f5a144fa3118121d11538da4ff0f17325 Mon Sep 17 00:00:00 2001 From: Brian White Date: Wed, 28 Aug 2013 22:47:28 -0400 Subject: [PATCH] relax node version check ABI compatibility is kept within a node stable series --- lib/httpsys_native.js | 16 ++++------------ .../win32/ia32/{0.10.15 => 0.10}/.npmignore | 0 .../win32/ia32/{0.10.15 => 0.10}/httpsys.node | Bin .../win32/ia32/{0.6.20 => 0.6}/.npmignore | 0 .../win32/ia32/{0.6.20 => 0.6}/httpsys.node | Bin .../win32/ia32/{0.8.22 => 0.8}/.npmignore | 0 .../win32/ia32/{0.8.22 => 0.8}/httpsys.node | Bin .../win32/x64/{0.10.15 => 0.10}/.npmignore | 0 .../win32/x64/{0.10.15 => 0.10}/httpsys.node | Bin lib/native/win32/x64/{0.6.20 => 0.6}/.npmignore | 0 .../win32/x64/{0.6.20 => 0.6}/httpsys.node | Bin lib/native/win32/x64/{0.8.22 => 0.8}/.npmignore | 0 .../win32/x64/{0.8.22 => 0.8}/httpsys.node | Bin 13 files changed, 4 insertions(+), 12 deletions(-) rename lib/native/win32/ia32/{0.10.15 => 0.10}/.npmignore (100%) rename lib/native/win32/ia32/{0.10.15 => 0.10}/httpsys.node (100%) rename lib/native/win32/ia32/{0.6.20 => 0.6}/.npmignore (100%) rename lib/native/win32/ia32/{0.6.20 => 0.6}/httpsys.node (100%) rename lib/native/win32/ia32/{0.8.22 => 0.8}/.npmignore (100%) rename lib/native/win32/ia32/{0.8.22 => 0.8}/httpsys.node (100%) rename lib/native/win32/x64/{0.10.15 => 0.10}/.npmignore (100%) rename lib/native/win32/x64/{0.10.15 => 0.10}/httpsys.node (100%) rename lib/native/win32/x64/{0.6.20 => 0.6}/.npmignore (100%) rename lib/native/win32/x64/{0.6.20 => 0.6}/httpsys.node (100%) rename lib/native/win32/x64/{0.8.22 => 0.8}/.npmignore (100%) rename lib/native/win32/x64/{0.8.22 => 0.8}/httpsys.node (100%) diff --git a/lib/httpsys_native.js b/lib/httpsys_native.js index 91d4a3e..5faf4df 100644 --- a/lib/httpsys_native.js +++ b/lib/httpsys_native.js @@ -1,15 +1,7 @@ -var versionMap = [ - [ /^0\.6\./, '0.6.20' ], - [ /^0\.8\./, '0.8.22' ], - [ /^0\.10\./, '0.10.15' ] -]; - function determineVersion() { - for (var i in versionMap) { - if (process.versions.node.match(versionMap[i][0])) { - return versionMap[i][1]; - } - } + var m; + if (m = /^(0\.(?:6|8|10))\./.exec(process.versions.node)) + return m[1]; throw new Error('The httpsys module has not been pre-compiled for node.js version ' + process.version + '. You must build a custom version of httpsys.node. Please refer to https://github.com/tjanczuk/httpsys ' + @@ -20,7 +12,7 @@ if (process.env.HTTPSYS_NATIVE) { exports = module.exports = require(process.env.HTTPSYS_NATIVE); } else if (process.platform === 'win32') { - exports = module.exports = require('./native/' + process.platform + '/' + exports = module.exports = require('./native/win32/' + process.arch + '/' + determineVersion() + '/httpsys'); } else { diff --git a/lib/native/win32/ia32/0.10.15/.npmignore b/lib/native/win32/ia32/0.10/.npmignore similarity index 100% rename from lib/native/win32/ia32/0.10.15/.npmignore rename to lib/native/win32/ia32/0.10/.npmignore diff --git a/lib/native/win32/ia32/0.10.15/httpsys.node b/lib/native/win32/ia32/0.10/httpsys.node similarity index 100% rename from lib/native/win32/ia32/0.10.15/httpsys.node rename to lib/native/win32/ia32/0.10/httpsys.node diff --git a/lib/native/win32/ia32/0.6.20/.npmignore b/lib/native/win32/ia32/0.6/.npmignore similarity index 100% rename from lib/native/win32/ia32/0.6.20/.npmignore rename to lib/native/win32/ia32/0.6/.npmignore diff --git a/lib/native/win32/ia32/0.6.20/httpsys.node b/lib/native/win32/ia32/0.6/httpsys.node similarity index 100% rename from lib/native/win32/ia32/0.6.20/httpsys.node rename to lib/native/win32/ia32/0.6/httpsys.node diff --git a/lib/native/win32/ia32/0.8.22/.npmignore b/lib/native/win32/ia32/0.8/.npmignore similarity index 100% rename from lib/native/win32/ia32/0.8.22/.npmignore rename to lib/native/win32/ia32/0.8/.npmignore diff --git a/lib/native/win32/ia32/0.8.22/httpsys.node b/lib/native/win32/ia32/0.8/httpsys.node similarity index 100% rename from lib/native/win32/ia32/0.8.22/httpsys.node rename to lib/native/win32/ia32/0.8/httpsys.node diff --git a/lib/native/win32/x64/0.10.15/.npmignore b/lib/native/win32/x64/0.10/.npmignore similarity index 100% rename from lib/native/win32/x64/0.10.15/.npmignore rename to lib/native/win32/x64/0.10/.npmignore diff --git a/lib/native/win32/x64/0.10.15/httpsys.node b/lib/native/win32/x64/0.10/httpsys.node similarity index 100% rename from lib/native/win32/x64/0.10.15/httpsys.node rename to lib/native/win32/x64/0.10/httpsys.node diff --git a/lib/native/win32/x64/0.6.20/.npmignore b/lib/native/win32/x64/0.6/.npmignore similarity index 100% rename from lib/native/win32/x64/0.6.20/.npmignore rename to lib/native/win32/x64/0.6/.npmignore diff --git a/lib/native/win32/x64/0.6.20/httpsys.node b/lib/native/win32/x64/0.6/httpsys.node similarity index 100% rename from lib/native/win32/x64/0.6.20/httpsys.node rename to lib/native/win32/x64/0.6/httpsys.node diff --git a/lib/native/win32/x64/0.8.22/.npmignore b/lib/native/win32/x64/0.8/.npmignore similarity index 100% rename from lib/native/win32/x64/0.8.22/.npmignore rename to lib/native/win32/x64/0.8/.npmignore diff --git a/lib/native/win32/x64/0.8.22/httpsys.node b/lib/native/win32/x64/0.8/httpsys.node similarity index 100% rename from lib/native/win32/x64/0.8.22/httpsys.node rename to lib/native/win32/x64/0.8/httpsys.node