diff options
| author | Andrei Belov <defan@nginx.com> | 2019-03-01 18:30:09 +0300 |
|---|---|---|
| committer | Andrei Belov <defan@nginx.com> | 2019-03-01 18:30:09 +0300 |
| commit | 3c3720cba7154bc168cbd00c74817626bb53e140 (patch) | |
| tree | da1500f7c6bd5e90ecf45299b6f4b19a29d521cd /pkg/npm | |
| parent | 315a864c27aa27a48c013c4a1ef67a099ffea894 (diff) | |
| parent | df02b03824065389c73213b19736140442cf63bc (diff) | |
| download | unit-3c3720cba7154bc168cbd00c74817626bb53e140.tar.gz unit-3c3720cba7154bc168cbd00c74817626bb53e140.tar.bz2 | |
Merged with the default branch.
Diffstat (limited to 'pkg/npm')
| -rw-r--r-- | pkg/npm/Makefile | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkg/npm/Makefile b/pkg/npm/Makefile index dfa9ccdc..ef8ef7b5 100644 --- a/pkg/npm/Makefile +++ b/pkg/npm/Makefile @@ -1,13 +1,9 @@ #!/usr/bin/make -DEFAULT_VERSION := $(shell grep 'define NXT_VERSION' ../../src/nxt_main.h \ - | sed -e 's/^.*"\(.*\)".*/\1/') +include ../../version -DEFAULT_VERNUM := $(shell grep 'define NXT_VERNUM' ../../src/nxt_main.h \ - | sed -e 's/[^0-9]//g') - -VERSION ?= $(DEFAULT_VERSION) -VERNUM ?= $(DEFAULT_VERNUM) +VERSION ?= $(NXT_VERSION) +VERNUM ?= $(NXT_VERNUM) NPM ?= npm default: @@ -17,7 +13,7 @@ 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",/' \ + sed -e 's/"version"\s*:.*/"version": "${VERSION}",/' \ unit-http/package.json > unit-http/package.json.tmp mv unit-http/package.json.tmp unit-http/package.json |