From dc9a6afee7b3c74d4527ef06faf57520d19479c2 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Fri, 15 Dec 2023 14:06:30 -0600 Subject: [PATCH] ICU-22601 v74.2 fix dangling LICENSE file - 'git archive' works on a subtree so did not include LICENSE - we copy the LICENSE file from the build dir - broken by ICU-22309 --- icu4c/source/config/dist.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/icu4c/source/config/dist.mk b/icu4c/source/config/dist.mk index d82863221b26..6558c16477e5 100644 --- a/icu4c/source/config/dist.mk +++ b/icu4c/source/config/dist.mk @@ -66,13 +66,15 @@ $(DISTY_FILE_TGZ) $(DISTY_FILE_ZIP) $(DISTY_DATA_ZIP): $(DISTY_DAT) $(DISTY_TMP -$(RMV) $(DISTY_FILE) $(DISTY_TMP) $(MKINSTALLDIRS) $(DISTY_TMP) ( cd $(ICU4CTOP)/.. && git archive --format=tar --prefix=icu/ HEAD:icu4c/ ) | ( cd "$(DISTY_TMP)" && tar xf - ) + # special handling for LICENSE file. The symlinks will be included as files by tar and zip. + cp -fv $(ICU4CTOP)/LICENSE "$(DISTY_TMP)/LICENSE" ( cd $(DISTY_TMP)/icu/source ; zip -rlq $(DISTY_DATA_ZIP) data ) $(MKINSTALLDIRS) $(DISTY_IN) echo DISTY_DAT=$(DISTY_DAT) cp $(DISTY_DAT) $(DISTY_IN) $(RMV) $(DISTY_RMDIR) ( cd $(DISTY_TMP)/icu ; python as_is/bomlist.py > as_is/bomlist.txt || rm -f as_is/bomlist.txt ) - ( cd $(DISTY_TMP) ; tar cfpz $(DISTY_FILE_TGZ) icu ) + ( cd $(DISTY_TMP) ; tar cfpzh $(DISTY_FILE_TGZ) icu ) ( cd $(DISTY_TMP) ; zip -rlq $(DISTY_FILE_ZIP) icu ) $(RMV) $(DISTY_TMP) ln -sf $(shell basename $(DISTY_FILE_ZIP)) $(DISTY_FILE_DIR)/icu4c-src.zip