oracledb 3.0.0 → 3.1.2

package/lib/util.js

@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. */
+/* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. */
 
 /******************************************************************************
  *
@@ -21,14 +21,25 @@
 
 var util = require('util');
 
+// Directory containing the node-oracledb add-on binary
+const RELEASE_DIR = 'build/Release';
+module.exports.RELEASE_DIR = RELEASE_DIR;
+
+// The default node-oracledb add-on binary filename for this Node.js
+const BINARY_FILE = 'oracledb-abi' + process.versions.modules + '-' + process.platform + '-' + process.arch + '.node';
+module.exports.BINARY_FILE = BINARY_FILE;
+
+// Staging directory used by maintainers building the npm package
+const STAGING_DIR = 'package/Staging';
+module.exports.STAGING_DIR = STAGING_DIR;
+
 var EventEmitter = require('events').EventEmitter;
 var eventEmitterKeys = Object.keys(EventEmitter.prototype);
 var eventEmitterFuncKeys = eventEmitterKeys.filter(function(key) {
   return typeof EventEmitter.prototype[key] === 'function';
 });
 
-// errorMessages is a temporary duplication of error messages defined in the C
-// layer that will be removed once a function to fetch from the C layer is added.
+// errorMessages is for NJS error messages used in the JavaScript layer
 var errorMessages = {
   'NJS-002': 'NJS-002: invalid pool',
   'NJS-004': 'NJS-004: invalid value for property %s',
@@ -41,13 +52,79 @@ var errorMessages = {
   'NJS-041': 'NJS-041: cannot convert ResultSet to QueryStream after invoking methods',
   'NJS-042': 'NJS-042: cannot invoke ResultSet methods after converting to QueryStream',
   'NJS-043': 'NJS-043: ResultSet already converted to QueryStream',
-  'NJS-045': 'NJS-045: cannot load the oracledb add-on binary for Node.js %s',
+  'NJS-045': 'NJS-045: cannot load a node-oracledb binary for Node.js ' + process.versions.node + ' (' + process.platform + ' ' + process.arch + ') %s',
   'NJS-046': 'NJS-046: poolAlias "%s" already exists in the connection pool cache',
   'NJS-047': 'NJS-047: poolAlias "%s" not found in the connection pool cache',
+  'NJS-054': 'NJS-054: binary build/Release/oracledb.node was not installed',
   'NJS-064': 'NJS-064: connection pool is closing',
-  'NJS-065': 'NJS-065: connection pool was closed'
+  'NJS-065': 'NJS-065: connection pool was closed',
+  'NJS-067': 'NJS-067: a pre-built node-oracledb binary was not found for Node.js %s'
 };
 
+// getInstallURL returns a string with installation URL
+function getInstallURL() {
+  return('Node-oracledb installation instructions: https://oracle.github.io/node-oracledb/INSTALL.html');
+}
+
+module.exports.getInstallURL = getInstallURL;
+
+// getInstallHelp returns a string with installation usage tips that may be helpful
+function getInstallHelp() {
+  var arch, url;
+  var mesg = getInstallURL() + '\n';
+  if (process.platform === 'linux') {
+    if (process.arch === 'x64') {
+      url = 'http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html\n';
+      arch = '64-bit';
+    } else if (process.arch === 'x32') {
+      url = 'http://www.oracle.com/technetwork/topics/linuxsoft-082809.html\n';
+      arch = '32-bit';
+    } else {
+      url = 'http://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html\n';
+      arch = process.arch;
+    }
+    mesg += 'You must have ' + arch + ' Oracle client libraries in LD_LIBRARY_PATH, or configured with ldconfig.\n';
+    mesg += 'If you do not have Oracle Database on this computer, then install the Instant Client Basic or Basic Light package from \n';
+    mesg += url;
+  } else if (process.platform === 'darwin') {
+    if (process.arch === 'x64') {
+      url = 'http://www.oracle.com/technetwork/topics/intel-macsoft-096467.html';
+      arch = '64-bit';
+    } else if (process.arch === 'x32') {
+      url = 'http://www.oracle.com/technetwork/topics/intel-macsoft-096467.html';
+      arch = '32-bit';
+    } else {
+      url = 'http://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html\n';
+      arch = process.arch;
+    }
+    mesg += 'You must have the ' + arch + ' Oracle Instant Client Basic or Basic Light package in ~/lib or /usr/local/lib\n';
+    mesg += 'They can be downloaded from ' + url;
+  } else if (process.platform === 'win32') {
+    if (process.arch === 'x64') {
+      url = 'http://www.oracle.com/technetwork/topics/winx64soft-089540.html\n';
+      arch = '64-bit';
+    } else if (process.arch === 'x32') {
+      url = 'http://www.oracle.com/technetwork/topics/winsoft-085727.html\n';
+      arch = '32-bit';
+    } else {
+      url = 'http://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html\n';
+      arch = process.arch;
+    }
+    mesg += 'You must have ' + arch + ' Oracle client libraries in your PATH environment variable.\n';
+    mesg += 'If you do not have Oracle Database on this computer, then install the Instant Client Basic or Basic Light package from\n';
+    mesg += url;
+    mesg += 'A Microsoft Visual Studio Redistributable suitable for your Oracle client library version must be available.\n';
+  } else {
+    url = 'http://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html\n';
+    mesg += 'You must have ' + process.arch + ' Oracle client libraries in your operating system library search path.\n';
+    mesg += 'If you do not have Oracle Database on this computer, then install an Instant Client Basic or Basic Light package from: \n';
+    mesg += url;
+  }
+  return mesg;
+}
+
+module.exports.getInstallHelp = getInstallHelp;
+
 // makeEventEmitter is used to make class instances inherit from the EventEmitter
 // class. This is needed because we extend instances from the C layer and thus
 // don't have JavaScript constructor functions we can use for more traditional

package/package/README.md

@@ -1,115 +1,46 @@
 # Overview
 
-This directory contains scripts for building, extracting and
-installing binary packages of node-oracledb.  Most users do not need
-to use anything in this directory (the exceptions are when building
-packages for self-hosting, or when doing a [manual
-install](https://oracle.github.io/node-oracledb/INSTALL.html#manualextraction)
-instead of using `npm`).
+This directory is used for building the [node-oracledb npm
+package](https://www.npmjs.com/package/oracledb).  The scripts can
+also be used to create custom packages for hosting on a local server.
 
-The binary install process requires two kinds of package:
-
-- a gzipped tar file like `oracledb-X.Y.Z.tgz` containing JavaScript
-  and ancillary files suitable for npm to install.  This is a generic
-  file used on all platforms.
-
-- a gzipped package like `oracledb-vZ.Y.Z-node-abi57-darwin-x64.gz`
-  containing the binary add-on.  The package uses a custom format with
-  three components: length bytes (giving the length of the license
-  file), the license file, and then the node-oracledb binary.  Each
-  Node.js version/architecture needs a unique binary package.
-
-  A custom package format is used due to business and technical requirements:
-
-  - the license text needs to be included with any binary download.
-
-  - Node.js doesn't have a native archive module, and the installer
-    should be lightweight and not have 3rd party dependencies.
-
-When `npm install oracledb` is executed, the JavaScript package is
-first installed by npm.  An 'install' script in its `package.json`
-invokes `oracledbinstall.js`.  This downloads the appropriate
-node-oracledb binary package, and then extracts and installs the
-binary.
-
-If a suitable binary package is not available, users must compile
-source code by installing from GitHub.
-
-Installation is described in [INSTALL](https://oracle.github.io/node-oracledb/INSTALL.html).
+Most users do not need to use anything in this directory.
 
 # Maintainers
 
-- The Makefile is used by node-oracledb maintainers to create the
-  packages to be uploaded to
-  [GitHub](https://github.com/oracle/node-oracledb) and
-  [npm](https://www.npmjs.com/package/oracledb).
-
-    - `make npmpackage` makes the main node-oracledb package
-      containing the general node-oracledb JavaScript files and the
-      package.json in this directory.  This is the package that an
-      `npm install oracledb` will initially install.
-
-    - `make binarypackage` makes a binary package for the current
-      Node.js / node-oracledb / platform combination and generates a
-      SHA256 for the binary.  A Windows batch file does the same for
-      Windows.
-
-- As part of `npm install`, the `package.json` in this directory
-  invokes `oracledbinstall.js` that downloads the appropriate binary
-  package from GitHub.  This variant of `package.json` is the copy
-  bundled for the npm release.
-
-  The parent file `../package.json` doesn't have the install target
-  meaning that node-gyp will be invoked to compile node-oracledb.  This
-  allows installation from source code (via GitHub) when no suitable
-  pre-built binary is available.
-
-- The `make npmpackage` command creates three variants of the JavaScript bundle:
-
-  - `oracledb-X.Y.Z.tgz` which downloads binaries from the
-    node-oracledb GitHub release page.
-
-  - `staging-oracledb-X.Y.Z.tgz` which downloads binaries from a
-    server of your choice, specified by the environment variables
-    `NODE_ORACLEDB_PACKAGE_HOSTNAME` (e.g. "your.example.com") and
-    `NODE_ORACLEDB_PACKAGE_URL_PATH` (e.g. "/yourpath/") which must be set
-    before running `make`.
-
-  - `oracledb-src-X.Y.Z.tgz` which is the complete source code, mainly
-    created because older npm's (e.g. with Node.js 4) do not download the
-    opdi submodule code when installing from a GitHub tag or branch.
-
-- The`staging-oracledb-X.Y.Z.tgz` package can be used to host binaries
-  on internal networks.  Copy `staging-oracledb-X.Y.Z.tgz`, the binary
-  packages for each desired architectures, and a single SHASUMS256.txt
-  file (with one line per available binary package) to an
-  HTTPS-enabled web server to the directory that
-  https://your.example.com/yourpath/vX.Y.Z/ resolves to.  Note if the
-  web server has a self-signed certificate, then you may need to
-  bypass some npm checks:
+In a clone or copy of the repository:
 
-  ```
-  export NODE_TLS_REJECT_UNAUTHORIZED=0
-  npm config set strict-ssl false
+- `npm run buildbinary` calls `buildbinary.js` to create a binary for
+  the current node-oracledb / Node.js / platform combination.
 
-  npm install https://your.example.com/yourpath/vX.Y.Z/staging-oracledb-X.Y.X.tgz
-  ```
+- `npm run buildpackage` calls `buildpackage.js` to make the
+  node-oracledb package containing the node-oracledb JavaScript files,
+  the available binaries, and a package.json that has an "install"
+  script and a "prune" script.  The package will be created in the top
+  level directory.
 
-  Remember to do `npm config delete strict-ssl` and unset the
-  environment variable when not testing.
+  Before executing `npm run buildpackage`, all binaries and related
+  build metadata information files from all node-oracledb / Node.js /
+  platform combinations should be placed in the `package/Staging`
+  directory.
 
-- On Windows, MAKEPKG.BAT has command options to create binaries, and
-  also to create staged binaries and the main packages.
+Package installation:
 
-- At install time, setting the environment variable
-  `NODE_ORACLEDB_TRACE_INSTALL` to `TRUE` will cause `npm install` to
-  display more tracing information.
+- As part of an `npm install` that uses the created package, the
+  `package.json` install script runs `package/install.js` to check a
+  binary module for the current Node.js and platform is available.
 
--  The installer scripts assume GitHub tags have the format "vX.Y.Z".
-   Other assumptions about GitHub paths are also made in the scripts.
+  If a suitable binary is not available, installation will fail.
+  Users must then compile node-oracledb using source code from GitHub,
+  or choose an alternative Node.js / platform that has a pre-built
+  binary module.
 
-- TODO
+- After install, space conscious users can run `npm run prune` which
+  removes pre-built binaries for all other Node.js releases and
+  architectures.
 
-  - oracledbinstall.js should cache SHASUMS256.txt so it doesn't have to be fetched twice.
-  - Add support for proxies that require authentication
-  - Improve oracledbinstall.js `no_proxy` support for domain names and wildcards.
+By default the top level `package.json` doesn't have an install script
+target.  This means that node-gyp will be invoked to compile
+node-oracledb.  This allows installation from [source
+code](https://oracle.github.io/node-oracledb/INSTALL.html#github) (via
+GitHub) when no suitable pre-built binary is available.

package/package/install.js

@@ -0,0 +1,139 @@
+/* Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. */
+
+/******************************************************************************
+ *
+ * You may not use the identified files except in compliance with the Apache
+ * License, Version 2.0 (the "License.")
+ *
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * NAME
+ *   install.js
+ *
+ * DESCRIPTION
+ *   This script is included in the npm bundle of node-oracledb.  It
+ *   is invoked by package.json during npm install.
+ *
+ *   The node-oracledb npm package bundles all available pre-built
+ *   binaries, so this script is really just a check to see if an
+ *   appropriate pre-built binary is available.
+ *
+ * MAINTENANCE NOTES
+ *   This file should only ever 'require' packages included in core Node.js.
+ *
+ *****************************************************************************/
+
+'use strict';
+
+const fs = require('fs');
+const nodbUtil = require('../lib/util.js');
+
+let packageJSON;
+try {
+  packageJSON = require('../package.json');
+} catch(err) {
+  throw new Error('package.json is missing');
+}
+const PACKAGE_JSON_VERSION = packageJSON.version;
+
+// Log standard output with an 'oracledb' prefix
+function log(message) { // eslint-disable-line
+  const args = Array.from(arguments);
+  args.unshift('oracledb');
+  console.log.apply(console, args);
+}
+
+// Log errors. It combines 'oracledb' with a stylized 'ERR' prefix
+function error(message) { // eslint-disable-line
+  const args = Array.from(arguments);
+  args.unshift('oracledb \x1b[31mERR!\x1b[0m');
+  console.error.apply(console, args);
+}
+
+// Print a concluding messages and quits
+function done(err) {
+  let installUrl = 'https://oracle.github.io/node-oracledb/INSTALL.html';
+
+  if (err) { // Couldn't install the binary
+    error(err.message);
+    error('Try compiling node-oracledb source code using ' + installUrl + '#github');
+    process.exit(87);
+  } else { // Successfully installed
+    let arch;
+    let clientUrl;
+
+    if (process.arch === 'x64') {
+      arch = '64-bit';
+    } else {
+      arch = '32-bit';
+    }
+
+    log('********************************************************************************');
+
+    log('** Node-oracledb ' + PACKAGE_JSON_VERSION + ' installed for Node.js ' + process.versions.node + ' (' + process.platform + ', ' + process.arch +')');
+
+    log('**');
+    log('** To use node-oracledb:');
+
+    if (process.platform === 'linux') {
+      if (process.arch === 'x64') {
+        clientUrl = 'https://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html';
+      } else {
+        clientUrl = 'https://www.oracle.com/technetwork/topics/linuxsoft-082809.html';
+      }
+
+      log('** - Oracle Client libraries (' + arch + ') must be configured with ldconfig or LD_LIBRARY_PATH');
+      log('** - To get libraries, install an Instant Client Basic or Basic Light package from');
+      log('**   ' + clientUrl);
+    } else if (process.platform === 'darwin') {
+      clientUrl = 'https://www.oracle.com/technetwork/topics/intel-macsoft-096467.html';
+      installUrl = 'https://oracle.github.io/node-oracledb/INSTALL.html#instosx';
+
+      log('** - An Oracle Instant Client Basic or Basic Light package must be in ~/lib or /usr/local/lib');
+      log('**   Download from ' + clientUrl);
+    } else if (process.platform === 'win32') {
+      if (process.arch === 'x64') {
+        clientUrl = 'https://www.oracle.com/technetwork/topics/winx64soft-089540.html';
+      } else {
+        clientUrl = 'https://www.oracle.com/technetwork/topics/winsoft-085727.html';
+      }
+
+      log('** - Oracle Client libraries (' + arch + ') must be in your PATH environment variable');
+      log('** - To get libraries, install an Instant Client Basic or Basic Light package from');
+      log('**   ' + clientUrl);
+      log('** - A Microsoft Visual Studio Redistributable suitable for your Oracle Client library version must be available');
+      log('**   See ' + installUrl + ' for details');
+    } else {
+      clientUrl = 'https://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html';
+      log('** - Oracle Client libraries (' + arch + ') must be in your operating system library search path');
+      log('** - To get libraries, install an Instant Client Basic or Basic Light package from:');
+      log('**   ' + clientUrl);
+    }
+
+    log('**');
+    log('** Installation instructions: ' + installUrl);
+    log('********************************************************************************\n');
+  }
+}
+
+// Check there is a usable binary file for the node-oracledb module
+function checkAvailable(cb) {
+  const binaryFile = nodbUtil.RELEASE_DIR + '/' + nodbUtil.BINARY_FILE;
+  try {
+    fs.statSync(binaryFile);
+    cb();
+  } catch (err) {
+    let m = process.version + ' (NODE_MODULE_VERSION=' + process.versions.modules + ') on ' + process.platform + ' ' + process.arch;
+    cb(new Error(nodbUtil.getErrorMessage('NJS-067', m)));
+  }
+}
+
+checkAvailable(done);

package/package/prunebinaries.js

@@ -0,0 +1,51 @@
+/* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. */
+
+/******************************************************************************
+ *
+ * You may not use the identified files except in compliance with the Apache
+ * License, Version 2.0 (the "License.")
+ *
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * NAME
+ *   prunebinaries.js
+ *
+ * DESCRIPTION
+ *   Removes pre-built binaries for all other Node.js releases and architectures.
+ *   It keeps only the binary for the current Node.js version and architecture.
+ *   This can be used to reduce the footprint of a node-oracledb install.
+ *
+ * USAGE
+ *   Invoke this from the top level directory.
+ *   After an 'npm install oracledb' installs pre-built binaries it
+ *   can be run with 'npm run prune'.
+ *
+ *****************************************************************************/
+
+'use strict';
+
+const fs = require('fs');
+const nodbUtil = require('../lib/util.js');
+
+const dir = nodbUtil.RELEASE_DIR;
+
+let re = new RegExp(nodbUtil.BINARY_FILE);
+
+try {
+  let f = fs.readdirSync(dir);
+  for (let i = 0; i < f.length; i++) {
+    if (!f[i].match(re) && (f[i].match(/oracledb.*\.node(-buildinfo.txt)*/))) {
+      fs.unlinkSync(dir + '/' + f[i]);
+    }
+  }
+} catch(err) {
+  console.error(err.message);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oracledb",
-  "version": "3.0.0",
+  "version": "3.1.2",
   "description": "A Node.js module for Oracle Database access",
   "license": "Apache-2.0",
   "homepage": "http://oracle.github.io/node-oracledb/",
@@ -28,19 +28,12 @@
     "type": "git",
     "url": "git://github.com/oracle/node-oracledb.git"
   },
-  "devDependencies": {
-    "mocha": "^2.4.5",
-    "should": "^8.3.1",
-    "async": "^1.5.0"
-  },
   "scripts": {
-    "install": "node package/oracledbinstall.js",
-    "testv6": "mocha --opts test/opts/mochaNodeV6.opts",
-    "test": "mocha --opts test/opts/mocha.opts",
-    "posttest": "node test/opts/version.js"
+    "install": "node package/install.js",
+    "prune": "node package/prunebinaries.js"
   },
   "engines": {
-    "node": ">=4"
+    "node": ">=6"
   },
   "maintainers": [
     {

package/binding.gyp

@@ -1,162 +0,0 @@
-{
-  "targets": [
-  {
-    "target_name" : "oracledb",
-    "sources" : [
-             "src/njsCommon.cpp",
-             "src/njsOracle.cpp",
-             "src/njsPool.cpp",
-             "src/njsConnection.cpp",
-             "src/njsResultSet.cpp",
-             "src/njsSubscription.cpp",
-             "src/njsMessages.cpp",
-             "src/njsIntLob.cpp",
-             "src/njsSodaDatabase.cpp",
-             "src/njsSodaCollection.cpp",
-             "src/njsSodaDocument.cpp",
-             "src/njsSodaOperation.cpp",
-             "src/njsSodaDocCursor.cpp",
-             "src/njsUtils.cpp",
-             "odpi/src/dpiConn.c",
-             "odpi/src/dpiContext.c",
-             "odpi/src/dpiData.c",
-             "odpi/src/dpiDebug.c",
-             "odpi/src/dpiDeqOptions.c",
-             "odpi/src/dpiEnqOptions.c",
-             "odpi/src/dpiEnv.c",
-             "odpi/src/dpiError.c",
-             "odpi/src/dpiGen.c",
-             "odpi/src/dpiGlobal.c",
-             "odpi/src/dpiHandleList.c",
-             "odpi/src/dpiHandlePool.c",
-             "odpi/src/dpiLob.c",
-             "odpi/src/dpiMsgProps.c",
-             "odpi/src/dpiObjectAttr.c",
-             "odpi/src/dpiObject.c",
-             "odpi/src/dpiObjectType.c",
-             "odpi/src/dpiOci.c",
-             "odpi/src/dpiOracleType.c",
-             "odpi/src/dpiPool.c",
-             "odpi/src/dpiRowid.c",
-             "odpi/src/dpiSodaColl.c",
-             "odpi/src/dpiSodaCollCursor.c",
-             "odpi/src/dpiSodaDb.c",
-             "odpi/src/dpiSodaDoc.c",
-             "odpi/src/dpiSodaDocCursor.c",
-             "odpi/src/dpiStmt.c",
-             "odpi/src/dpiSubscr.c",
-             "odpi/src/dpiUtils.c",
-             "odpi/src/dpiVar.c"
-    ],
-    "conditions" : [
-    [
-      'OS=="linux"', {
-        "variables" : {
-          "dpi_check%"    : "<!(INSTURL=\"https://oracle.github.io/node-oracledb/INSTALL.html#github\"; ERR=\"oracledb ERR! Error:\"; if [ -f odpi/include/dpi.h ]; then echo \"Has dpi.h\"; else echo \"$ERR Cannot find odpi/include/dpi.h.  For GitHub ZIP downloads you must separately download the odpi subdirectory from GitHub.\" >&2; echo \"$ERR See $INSTURL\" >&2; echo \"\" >&2; fi;)"
-        },
-        "cflags"        : ['-fexceptions'],
-        "cflags_cc"     : ['-fexceptions'],
-        "libraries"     : ['-ldl', '-lpthread'],
-      }
-    ],
-    [
-      'OS=="mac"', {
-        "variables" : {
-          "dpi_check%"    : "<!(INSTURL=\"https://oracle.github.io/node-oracledb/INSTALL.html#github\"; ERR=\"oracledb ERR! Error:\"; if [ -f odpi/include/dpi.h ]; then echo \"Has dpi.h\"; else echo \"$ERR Cannot find odpi/include/dpi.h.  For GitHub ZIP downloads you must separately download the odpi subdirectory from GitHub.\" >&2; echo \"$ERR See $INSTURL\" >&2; echo \"\" >&2; fi;)"
-        },
-        "xcode_settings": {
-          "GCC_ENABLE_CPP_EXCEPTIONS": "YES",
-          "GCC_ENABLE_CPP_RTTI": "YES"
-        },
-          "libraries"     : ['-ldl', '-lpthread']
-      }
-    ],
-    [
-      'OS=="aix"', {
-        "variables" : {
-          "dpi_check%"    : "<!(INSTURL=\"https://oracle.github.io/node-oracledb/INSTALL.html#github\"; ERR=\"oracledb ERR! Error:\"; if [ -f odpi/include/dpi.h ]; then echo \"Has dpi.h\"; else echo \"$ERR Cannot find odpi/include/dpi.h.  For GitHub ZIP downloads you must separately download the odpi subdirectory from GitHub.\" >&2; echo \"$ERR See $INSTURL\" >&2; echo \"\" >&2; fi;)"
-        },
-        "cflags"        : ['-fexceptions', '-fsigned-char'],
-        "cflags_cc"     : ['-fexceptions', '-fsigned-char'],
-        "libraries"     : ['-ldl', '-lpthread'],
-      }
-    ],
-    [
-      'OS=="solaris"', {
-        "variables" : {
-          "dpi_check%"    : "<!(INSTURL=\"https://oracle.github.io/node-oracledb/INSTALL.html#github\"; ERR=\"oracledb ERR! Error:\"; if [ -f odpi/include/dpi.h ]; then echo \"Has dpi.h\"; else echo \"$ERR Cannot find odpi/include/dpi.h.  For GitHub ZIP downloads you must separately download the odpi subdirectory from GitHub.\" >&2; echo \"$ERR See $INSTURL\" >&2; echo \"\" >&2; fi;)"
-        },
-        "cflags"        : ['-fexceptions'],
-        "cflags_cc"     : ['-fexceptions'],
-        "libraries"     : ['-ldl', '-lpthread'],
-      }
-    ],
-    [
-      "OS=='win'", {
-        "configurations" : {
-          "Release" : {
-            "msvs_settings": {
-              "VCCLCompilerTool": {
-                "RuntimeLibrary": 0,
-                "Optimization": 3,
-                "FavorSizeOrSpeed": 1,
-                "InlineFunctionExpansion": 2,
-                "WholeProgramOptimization": "true",
-                "OmitFramePointers": "true",
-                "EnableFunctionLevelLinking": "true",
-                "EnableIntrinsicFunctions": "true",
-                "RuntimeTypeInfo": "false",
-                "PreprocessorDefinitions": [
-                  "WIN32_LEAN_AND_MEAN"
-                ],
-                "ExceptionHandling": "0",
-                "AdditionalOptions": [
-                  "/EHsc"
-                ]
-              },
-              "VCLibrarianTool": {
-                "AdditionalOptions": [
-                    "/LTCG"
-                ]
-              },
-              "VCLinkerTool": {
-                "LinkTimeCodeGeneration": 1,
-                "OptimizeReferences": 2,
-                "EnableCOMDATFolding": 2,
-                "LinkIncremental": 1,
-              }
-            }
-          },
-          "Debug": {
-              "msvs_settings": {
-                  "VCCLCompilerTool": {
-                    "PreprocessorDefinitions": [
-                      "WIN32_LEAN_AND_MEAN"
-                    ],
-                    "ExceptionHandling": "0",
-                    "AdditionalOptions": [
-                        "/EHsc"
-                    ]
-                  },
-                  "VCLibrarianTool": {
-                      "AdditionalOptions": [
-                          "/LTCG"
-                      ]
-                  },
-                  "VCLinkerTool": {
-                      "LinkTimeCodeGeneration": 1,
-                      "LinkIncremental": 1,
-                  }
-              }
-          }
-        }
-      }
-    ],
-  ],
-  "include_dirs"  : [ "odpi/src/",
-                      "odpi/include/",
-                      "<!(node -e \"require('nan')\")"
-    ],
-  }
-  ]
-}

package/lib/rel.txt

@@ -1 +0,0 @@
-4eff9cf0209807e04115122bb40d4581750ed2d9 Mon  1 Oct 2018 08:35:04 UTC

package/odpi/.npmignore

@@ -1,4 +0,0 @@
-build
-lib
-doc/build
-test/build