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 /auto/modules/nodejs | |
| parent | 315a864c27aa27a48c013c4a1ef67a099ffea894 (diff) | |
| parent | df02b03824065389c73213b19736140442cf63bc (diff) | |
| download | unit-3c3720cba7154bc168cbd00c74817626bb53e140.tar.gz unit-3c3720cba7154bc168cbd00c74817626bb53e140.tar.bz2 | |
Merged with the default branch.
Diffstat (limited to 'auto/modules/nodejs')
| -rw-r--r-- | auto/modules/nodejs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/auto/modules/nodejs b/auto/modules/nodejs index e0208f5d..edaf99ac 100644 --- a/auto/modules/nodejs +++ b/auto/modules/nodejs @@ -145,7 +145,6 @@ cat << END >> $NXT_MAKEFILE .PHONY: ${NXT_NODE}-build .PHONY: ${NXT_NODE}-publish - ${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 @@ -154,13 +153,14 @@ ${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_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} . |