From 3d331932897c31c3eafae6079c919a8bbc21df7c Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 2 Dec 2019 11:41:30 -0500 Subject: [PATCH] Include ICU in nodejs-tarball.sh Also print the libnode SOversion. Signed-off-by: Stephen Gallagher --- nodejs-tarball.sh | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/nodejs-tarball.sh b/nodejs-tarball.sh index 2cd913c..2aed5cd 100755 --- a/nodejs-tarball.sh +++ b/nodejs-tarball.sh @@ -101,6 +101,7 @@ assign_positional_args 1 "${_positionals[@]}" # [ <-- needed because of Argbash +set -e echo $_arg_version @@ -111,12 +112,23 @@ else fi rm -f node-v${version}.tar.gz node-v${version}-stripped.tar.gz -wget http://nodejs.org/dist/v${version}/node-v${version}.tar.gz +wget http://nodejs.org/dist/v${version}/node-v${version}.tar.gz \ + http://nodejs.org/dist/v${version}/SHASUMS256.txt +sha256sum -c SHASUMS256.txt --ignore-missing tar -zxf node-v${version}.tar.gz rm -rf node-v${version}/deps/openssl tar -zcf node-v${version}-stripped.tar.gz node-v${version} -fedpkg new-sources node-v${version}-stripped.tar.gz +# Download the matching version of ICU +rm -f icu4c*-src.tgz icu.md5 +ICUMD5=$(cat node-v${version}/tools/icu/current_ver.dep |jq -r '.[0].md5') +wget $(cat node-v${version}/tools/icu/current_ver.dep |jq -r '.[0].url') +ICUTARBALL=$(ls -1 icu4c*-src.tgz) +echo "$ICUMD5 $ICUTARBALL" > icu.md5 +md5sum -c icu.md5 +rm -f icu.md5 SHASUMS256.txt + +fedpkg new-sources node-v${version}-stripped.tar.gz icu4c*-src.tgz rm -f node-v${version}.tar.gz @@ -124,6 +136,10 @@ rm -f node-v${version}.tar.gz echo "Bundled software versions" echo "-------------------------" echo +echo "libnode shared object version" +echo "=========================" +grep "define NODE_MODULE_VERSION" node-v${version}/src/node_version.h +echo echo "V8" echo "=========================" grep "define V8_MAJOR_VERSION" node-v${version}/deps/v8/include/v8-version.h @@ -172,4 +188,6 @@ echo "=========================" grep "\"version\":" node-v${version}/deps/npm/package.json echo echo "Make sure these versions match what is in the RPM spec file" + +rm -rf node-v${version} # ] <-- needed because of Argbash