Skip to content

Commit

Permalink
Bump to 3.1.1 for package rebuild
Browse files Browse the repository at this point in the history
  • Loading branch information
cjbj committed Jan 23, 2019
1 parent 4993a01 commit c99d478
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 19 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## node-oracledb v3.1.1 (25 Jan 2019)

- Rebuild npm package to resolve Linux binary build issue.

## node-oracledb v3.1.0 (22 Jan 2019)

- Support tagging of pooled connections when releasing them to the
Expand Down
34 changes: 17 additions & 17 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ version 2.0.
- Install a C Compiler with support for C++ 11 (such as Xcode,
GCC 4.8, Visual Studio 2015, or similar)

- Run `npm install oracle/node-oracledb.git#v3.1.0`, or add
`oracle/node-oracledb.git#v3.1.0` to your `package.json`
- Run `npm install oracle/node-oracledb.git#v3.1.1`, or add
`oracle/node-oracledb.git#v3.1.1` to your `package.json`
dependencies. Substitute your desired [GitHub tag][40].

- Add Oracle 18, 12, or 11.2 client libraries to your operating
Expand Down Expand Up @@ -1030,19 +1030,19 @@ export CC=gcc
```

Locate the [GitHub tag][40] of the desired node-oracledb version, for
example `v3.1.0`, and use the `npm` package manager (which is
example `v3.1.1`, and use the `npm` package manager (which is
included in Node.js) to install it.

If you have the `git` utility, you can install with:

```
npm install oracle/node-oracledb.git#v3.1.0
npm install oracle/node-oracledb.git#v3.1.1
```

Otherwise install using:

```
npm install https://github.com/oracle/node-oracledb/releases/download/v3.1.0/oracledb-src-3.1.0.tgz
npm install https://github.com/oracle/node-oracledb/releases/download/v3.1.1/oracledb-src-3.1.1.tgz
```

#### 3.9.4 Install the free Oracle Instant Client 'Basic' ZIP file
Expand Down Expand Up @@ -1150,19 +1150,19 @@ export MAKE=gmake
```

Locate the [GitHub tag][40] of the desired node-oracledb version, for
example `v3.1.0`, and use the `npm` package manager (which is
example `v3.1.1`, and use the `npm` package manager (which is
included in Node.js) to install it.

If you have the `git` utility, you can install with:

```
npm install oracle/node-oracledb.git#v3.1.0
npm install oracle/node-oracledb.git#v3.1.1
```

Otherwise install using:

```
npm install https://github.com/oracle/node-oracledb/releases/download/v3.1.0/oracledb-src-3.1.0.tgz
npm install https://github.com/oracle/node-oracledb/releases/download/v3.1.1/oracledb-src-3.1.1.tgz
```

#### 3.9.4 Install the free Oracle Instant Client 'Basic' ZIP file
Expand Down Expand Up @@ -1269,12 +1269,12 @@ The `git` utility is required for this method.

Build node-oracledb from source code by changing the package specifier
so that `npm` downloads from GitHub instead of from npmjs.com. For
example, to install the code from the GitHub tag 'v3.1.0', add
`oracle/node-oracledb#v3.1.0` to your `package.json` dependencies, or
example, to install the code from the GitHub tag 'v3.1.1', add
`oracle/node-oracledb#v3.1.1` to your `package.json` dependencies, or
use the command:

```
npm install oracle/node-oracledb#v3.1.0
npm install oracle/node-oracledb#v3.1.1
```

This will download, compile and install node-oracledb.
Expand All @@ -1288,7 +1288,7 @@ Users without `git`, or with older versions of `npm` such as included in
Node.js 6, may alternatively need to use pre-bundled source code:

```
npm install https://github.com/oracle/node-oracledb/releases/download/v3.1.0/oracledb-src-3.1.0.tgz
npm install https://github.com/oracle/node-oracledb/releases/download/v3.1.1/oracledb-src-3.1.1.tgz
```

Note it may take some time before compilation begins due to the slow
Expand Down Expand Up @@ -1320,7 +1320,7 @@ installing.
#### <a name="nogithubaccess"></a> 3.10.3 Compiling node-oracledb without GitHub Access

Some companies block access to github.com so compiling source code
from GitHub with `npm install oracle/node-oracledb.git#v3.1.0` will
from GitHub with `npm install oracle/node-oracledb.git#v3.1.1` will
fail.

Oracle has a mirror of the GitHub repository source code that can be
Expand Down Expand Up @@ -1418,7 +1418,7 @@ See [Node.js for Oracle Linux][46] for details.
You can host node-oracledb packages locally.

Download the node-oracledb package from npm, for example from
`https://registry.npmjs.com/oracledb/-/oracledb-3.1.0.tgz`
`https://registry.npmjs.com/oracledb/-/oracledb-3.1.1.tgz`
Alternatively, if you want to build your own binaries and
node-oracledb package, the maintainer scripts in
[/package](https://github.com/oracle/node-oracledb/tree/master/package)
Expand All @@ -1427,19 +1427,19 @@ can be used. See
for details.

If you make the package accessible on your local web server, for
example at https://www.example.com/oracledb-3.1.0.tgz, then your
example at https://www.example.com/oracledb-3.1.1.tgz, then your
install command would be:

```
npm install https://www.example.com/oracledb-3.1.0.tgz
npm install https://www.example.com/oracledb-3.1.1.tgz
```

or your `package.json` would contain:

```
. . .
"dependencies": {
"oracledb": "https://www.example.com/oracledb-3.1.0.tgz"
"oracledb": "https://www.example.com/oracledb-3.1.1.tgz"
},
. . .
```
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "oracledb",
"version": "3.1.0",
"version": "3.1.1",
"description": "A Node.js module for Oracle Database access",
"license": "Apache-2.0",
"homepage": "http://oracle.github.io/node-oracledb/",
Expand Down
2 changes: 1 addition & 1 deletion src/njsOracle.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ using namespace v8;
// For production, leave NJS_NODE_ORACLEDB_SUFFIX undefined (not "")
#define NJS_NODE_ORACLEDB_MAJOR 3
#define NJS_NODE_ORACLEDB_MINOR 1
#define NJS_NODE_ORACLEDB_PATCH 0
#define NJS_NODE_ORACLEDB_PATCH 1
#define NJS_NODE_ORACLEDB_SUFFIX

// define stringified version and driver name
Expand Down

0 comments on commit c99d478

Please sign in to comment.