From 5fd6d75c4442123a818701817c5fbbca925648e5 Mon Sep 17 00:00:00 2001 From: Myles Borins Date: Thu, 2 Jun 2016 17:14:37 -0700 Subject: [PATCH] tools: fix license builder to work with icu-small Currently the license builder is expecting the ICU package to be found at `deps/icu`. ICU is now included by default and found at `deps/icu-small`. This commit adds logic to find the license at the new location. This could likely be done in a more elegant way, but it works! PR-URL: https://github.com/nodejs/node/pull/7119 Reviewed-By: James M Snell Reviewed-By: Steven R Loomis --- tools/license-builder.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/license-builder.sh b/tools/license-builder.sh index 3d587227b41..eb3980e7d02 100755 --- a/tools/license-builder.sh +++ b/tools/license-builder.sh @@ -22,7 +22,7 @@ $(echo -e "$3" | sed -e 's/^/ /' -e 's/^ $//' -e 's/ *$//' | sed -e '/./,$ } -if ! [ -d "${rootdir}/deps/icu/" ]; then +if ! [ -d "${rootdir}/deps/icu/" ] && ! [ -d "${rootdir}/deps/icu-small/" ]; then echo "ICU not installed, run configure to download it, e.g. ./configure --with-intl=small-icu --download=icu" exit 1 fi @@ -42,6 +42,16 @@ elif [ -f "${rootdir}/deps/icu/license.html" ]; then addlicense "ICU" "deps/icu" \ "$(sed -e '1,/ICU License - ICU 1\.8\.1 and later/d' -e :a \ -e 's/<[^>]*>//g;s/ / /g;s/ +$//;/]*>//g;s/ / /g;s/ +$//;/]*>//g;s/ / /g;s/ +$//;/