Skip to content

Commit

Permalink
Mention C++11 requirement and also mention Node 4 & 5
Browse files Browse the repository at this point in the history
  • Loading branch information
cjbj committed Nov 17, 2015
1 parent 177fc9f commit dab1b02
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 12 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

## node-oracledb v1.4.0 (DD Mon YYYY)

- Upgrade NAN dependency to version 2 allowing node-oracledb to build
with Node 4 and 5.
- Upgraded NAN dependency to version 2 allowing node-oracledb to build
with Node 0.10, 0.12, 4 and 5. Note: a compiler supporting C++11 is now required.

- Fixed a cursor leak when statement execution fails.

Expand Down
22 changes: 14 additions & 8 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,24 @@ The [*node-oracledb*](https://github.com/oracle/node-oracledb) add-on for Node.j
The steps below create a Node.js installation for testing. Adjust the
steps for your environment.

This node-oracledb release has been tested with Node 0.10 and 0.12 on
64-bit Oracle Linux and Windows. The add-on can also build in some
Mac OS X, 32-bit Linux, 32-bit Windows, Solaris and AIX environments,
but these architectures have not been fully tested.
This node-oracledb release has been tested with Node 0.10, 0.12, 4.2
and 5.0 on 64-bit Oracle Linux and Windows. The add-on can also build
in some Mac OS X, 32-bit Linux, 32-bit Windows, Solaris and AIX
environments, but these architectures have not been fully tested.

### Prerequisites

Installation requires Oracle 11.2 or 12.1 client libraries.
These are included in Oracle Instant Client RPMs or ZIPs, a full
Oracle Client, or a database on the same machine. Oracle's standard
client-server network compatibility applies. For example, with Oracle
client 12.1 you can connect to Oracle Database 10.2 or greater. Use
Oracle client 11.2 if you need to connect to Oracle Database 9.2.
Client 12.1 you can connect to Oracle Database 10.2 or greater. Use
Oracle Client 11.2 if you need to connect to Oracle Database 9.2.

A compiler is needed. Use Visual Studio on Windows, gcc on Linux or
Xcode on OS X.
A compiler supporting C++11 is required. Use Visual Studio on
Windows, gcc on Linux or Xcode on OS X. Note the default compiler on
Oracle Linux 6 and RHEL 6 does not have the required support. Install
a newer compiler or upgrade to Oracle Linux 7.

Python 2.7 is needed by node-gyp. If another version of Python occurs
first in your binary path then, when you install node-oracledb, use
Expand Down Expand Up @@ -149,6 +151,8 @@ the run time linker is configured to find this other software via
the Instant Client RPM libraries, for example
`/usr/lib/oracle/12.1/client64/lib`.

Note: A compiler supporting C++11 is required.

### 2.4 Run an example program

Download the
Expand Down Expand Up @@ -263,6 +267,8 @@ npm install oracledb
If you are installing with `sudo`, you may need to use `sudo -E` to
preserve the environment variable values.

Note: A compiler supporting C++11 is required.

### 3.4 Run an example program

Download the
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

The node-oracledb add-on for Node.js powers high performance Oracle Database applications.

Node-oracledb connects Node.js 0.10, Node.js 0.12, and io.js to
Oracle Database.
Node-oracledb connects Node.js 0.10, 0.12, 4.2 and 5.0 to Oracle
Database.

This is an open source project maintained by Oracle Corp.

Expand Down

0 comments on commit dab1b02

Please sign in to comment.