From 2bc8fb7b43a5106ab8cdf8adae4834837ae7fc16 Mon Sep 17 00:00:00 2001
From: Alexander Borisov <alexander.borisov@nginx.com>
Date: Wed, 23 Jan 2019 17:47:53 +0300
Subject: Node.js: fixed module version on installation from sources.

---
 auto/modules/nodejs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'auto/modules/nodejs')

diff --git a/auto/modules/nodejs b/auto/modules/nodejs
index e0208f5d..57bf9d3a 100644
--- a/auto/modules/nodejs
+++ b/auto/modules/nodejs
@@ -145,6 +145,8 @@ cat << END >> $NXT_MAKEFILE
 .PHONY: ${NXT_NODE}-build
 .PHONY: ${NXT_NODE}-publish
 
+NXT_UNIT_VERSION=\$(shell grep 'define NXT_VERSION' \
+    src/nxt_main.h | sed -e 's/^.*"\(.*\)".*/\1/')
 
 ${NXT_NODE}: ${NXT_NODE}-copy $NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC
 	${NXT_NODE_EXPORTS} && \\
@@ -161,6 +163,9 @@ ${NXT_NODE_VERSION_FILE}: src/nxt_main.h
 		| sed -e 's/[^0-9]//g' >> $NXT_NODE_VERSION_FILE
 
 ${NXT_NODE_TARBALL}: ${NXT_NODE}-copy
+	sed -e 's/"version"\s*:.*/"version": "\$(NXT_UNIT_VERSION).0",/' \
+		${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} .
 
 
-- 
cgit 


From 608e09e9def182756e2f1650c6f3416b209fbf58 Mon Sep 17 00:00:00 2001
From: Alexander Borisov <alexander.borisov@nginx.com>
Date: Fri, 22 Feb 2019 16:31:44 +0300
Subject: Improvement and unification of version processing in build scripts.

This also eliminates expressions that incompatible with BSD make, thus fixing
installation of Node.js module on FreeBSD (broken by dace60fc4926).
---
 auto/modules/nodejs | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'auto/modules/nodejs')

diff --git a/auto/modules/nodejs b/auto/modules/nodejs
index 57bf9d3a..6fd00496 100644
--- a/auto/modules/nodejs
+++ b/auto/modules/nodejs
@@ -145,9 +145,6 @@ cat << END >> $NXT_MAKEFILE
 .PHONY: ${NXT_NODE}-build
 .PHONY: ${NXT_NODE}-publish
 
-NXT_UNIT_VERSION=\$(shell grep 'define NXT_VERSION' \
-    src/nxt_main.h | sed -e 's/^.*"\(.*\)".*/\1/')
-
 ${NXT_NODE}: ${NXT_NODE}-copy $NXT_BUILD_DIR/$NXT_LIB_UNIT_STATIC
 	${NXT_NODE_EXPORTS} && \\
 	cd ${NXT_NODE_TMP} && ${NXT_NODE_GYP} configure build clean
@@ -156,14 +153,12 @@ ${NXT_NODE}-copy: ${NXT_NODE_VERSION_FILE}
 	mkdir -p ${NXT_BUILD_DIR}/src/
 	cp -rp src/nodejs/* ${NXT_BUILD_DIR}/src/${NXT_NODE}
 
-${NXT_NODE_VERSION_FILE}: src/nxt_main.h
+${NXT_NODE_VERSION_FILE}: ${NXT_VERSION_H}
 	mkdir -p ${NXT_NODE_TMP}
-	$echo -n '#define NXT_NODE_VERNUM ' > $NXT_NODE_VERSION_FILE
-	grep 'define NXT_VERNUM' src/nxt_main.h \\
-		| sed -e 's/[^0-9]//g' >> $NXT_NODE_VERSION_FILE
+	$echo '#define NXT_NODE_VERNUM \$(NXT_VERNUM)' > $NXT_NODE_VERSION_FILE
 
 ${NXT_NODE_TARBALL}: ${NXT_NODE}-copy
-	sed -e 's/"version"\s*:.*/"version": "\$(NXT_UNIT_VERSION).0",/' \
+	sed -e 's/"version"\s*:.*/"version": "\$(NXT_VERSION).0",/' \
 		${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} .
-- 
cgit 


From 5c9fe8c3060f8204b143abae6d81ee8363aba060 Mon Sep 17 00:00:00 2001
From: Valentin Bartenev <vbart@nginx.com>
Date: Wed, 27 Feb 2019 17:25:28 +0300
Subject: 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 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'auto/modules/nodejs')

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} .
-- 
cgit