Commit 7182f5f
Myles Borins
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: #7119
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Steven R Loomis <srloomis@us.ibm.com>1 parent 4a7e333 commit 7182f5f
1 file changed
Lines changed: 11 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -22,7 +22,7 @@ $(echo -e "$3" | sed -e 's/^/ /' -e 's/^ $//' -e 's/ *$//' | sed -e '/./,$ | |||
| 22 | 22 | } | |
| 23 | 23 | ||
| 24 | 24 | ||
| 25 | - if ! [ -d "${rootdir}/deps/icu/" ]; then | ||
| 25 | + if ! [ -d "${rootdir}/deps/icu/" ] && ! [ -d "${rootdir}/deps/icu-small/" ]; then | ||
| 26 | 26 | echo "ICU not installed, run configure to download it, e.g. ./configure --with-intl=small-icu --download=icu" | |
| 27 | 27 | exit 1 | |
| 28 | 28 | fi | |
@@ -42,6 +42,16 @@ elif [ -f "${rootdir}/deps/icu/license.html" ]; then | |||
| 42 | 42 | addlicense "ICU" "deps/icu" \ | |
| 43 | 43 | "$(sed -e '1,/ICU License - ICU 1\.8\.1 and later/d' -e :a \ | |
| 44 | 44 | -e 's/<[^>]*>//g;s/ / /g;s/ +$//;/</N;//ba' ${rootdir}/deps/icu/license.html)" | |
| 45 | + elif [ -f "${rootdir}/deps/icu-small/LICENSE" ]; then | ||
| 46 | + # ICU 57 and following. Drop the BOM | ||
| 47 | + addlicense "ICU" "deps/icu-small" \ | ||
| 48 | + "$(sed -e '1s/^[^a-zA-Z ]*ICU/ICU/' -e :a \ | ||
| 49 | + -e 's/<[^>]*>//g;s/ / /g;s/ +$//;/</N;//ba' ${rootdir}/deps/icu-small/LICENSE)" | ||
| 50 | + elif [ -f "${rootdir}/deps/icu-small/license.html" ]; then | ||
| 51 | + # ICU 56 and prior | ||
| 52 | + addlicense "ICU" "deps/icu-small" \ | ||
| 53 | + "$(sed -e '1,/ICU License - ICU 1\.8\.1 and later/d' -e :a \ | ||
| 54 | + -e 's/<[^>]*>//g;s/ / /g;s/ +$//;/</N;//ba' ${rootdir}/deps/icu-small/license.html)" | ||
| 45 | 55 | else | |
| 46 | 56 | echo "Could not find an ICU license file." | |
| 47 | 57 | exit 1 | |
0 commit comments