diff options
| author | Andrei Belov <defan@nginx.com> | 2018-12-20 20:25:50 +0300 |
|---|---|---|
| committer | Andrei Belov <defan@nginx.com> | 2018-12-20 20:25:50 +0300 |
| commit | 82e12d0cdeeb707ad4b1aef91c5e90b4347b0831 (patch) | |
| tree | 19ef4cf3dea340fa365af022c76543f92d1e2e0a /pkg/npm | |
| parent | b140ac29e5571e9abaafce006932f15d86b78803 (diff) | |
| parent | 4195a29fabfe65f5a28baf2405c2077e2ba3c09a (diff) | |
| download | unit-82e12d0cdeeb707ad4b1aef91c5e90b4347b0831.tar.gz unit-82e12d0cdeeb707ad4b1aef91c5e90b4347b0831.tar.bz2 | |
Merged with the default branch.
Diffstat (limited to 'pkg/npm')
| -rw-r--r-- | pkg/npm/Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkg/npm/Makefile b/pkg/npm/Makefile index 2696c226..dfa9ccdc 100644 --- a/pkg/npm/Makefile +++ b/pkg/npm/Makefile @@ -3,7 +3,11 @@ DEFAULT_VERSION := $(shell grep 'define NXT_VERSION' ../../src/nxt_main.h \ | sed -e 's/^.*"\(.*\)".*/\1/') +DEFAULT_VERNUM := $(shell grep 'define NXT_VERNUM' ../../src/nxt_main.h \ + | sed -e 's/[^0-9]//g') + VERSION ?= $(DEFAULT_VERSION) +VERNUM ?= $(DEFAULT_VERNUM) NPM ?= npm default: @@ -11,6 +15,7 @@ default: copy: cp -rp ../../src/nodejs/unit-http . + echo '#define NXT_NODE_VERNUM ${VERNUM}' > unit-http/version.h mv unit-http/binding_pub.gyp unit-http/binding.gyp sed -e 's/"version"\s*:.*/"version": "${VERSION}.0",/' \ unit-http/package.json > unit-http/package.json.tmp |