From 5c9fe8c3060f8204b143abae6d81ee8363aba060 Mon Sep 17 00:00:00 2001 From: Valentin Bartenev Date: Wed, 27 Feb 2019 17:25:28 +0300 Subject: [PATCH] Added trailing zero to version string. While it looks nicer without zero 3-rd version number, this should improve interoperability. Version string can be parsed or used for sorting. And it is easier to handle and less confusing when there is constant number of version parts. Moreover, NPM also expects version format with 3 parts. So ".0" has already been used in Node.js module version. --- auto/modules/nodejs | 2 +- pkg/npm/Makefile | 2 +- version | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/auto/modules/nodejs b/auto/modules/nodejs index 6fd00496..edaf99ac 100644 --- a/auto/modules/nodejs +++ b/auto/modules/nodejs @@ -158,7 +158,7 @@ ${NXT_NODE_VERSION_FILE}: ${NXT_VERSION_H} $echo '#define NXT_NODE_VERNUM \$(NXT_VERNUM)' > $NXT_NODE_VERSION_FILE ${NXT_NODE_TARBALL}: ${NXT_NODE}-copy - sed -e 's/"version"\s*:.*/"version": "\$(NXT_VERSION).0",/' \ + sed -e 's/"version"\s*:.*/"version": "\$(NXT_VERSION)",/' \ ${NXT_NODE_TMP}/package.json > ${NXT_NODE_TMP}/package.json.tmp mv ${NXT_NODE_TMP}/package.json.tmp ${NXT_NODE_TMP}/package.json tar -zcvf ${NXT_NODE_TARBALL} -C ${NXT_NODE_TMP} . diff --git a/pkg/npm/Makefile b/pkg/npm/Makefile index 8636dd0b..ef8ef7b5 100644 --- a/pkg/npm/Makefile +++ b/pkg/npm/Makefile @@ -13,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 diff --git a/version b/version index 36e0b1b3..07985001 100644 --- a/version +++ b/version @@ -1,5 +1,5 @@ # Copyright (C) NGINX, Inc. -NXT_VERSION=1.8 +NXT_VERSION=1.8.0 NXT_VERNUM=10800