ICU-22601 v74.2 fix dangling LICENSE file #2749

srl295 · 2023-12-15T20:04:46Z

ICU-22601

'git archive' works on a subtree so did not include LICENSE
we copy the LICENSE file from the build dir

Checklist

Required: Issue filed: https://unicode-org.atlassian.net/browse/ICU-22601
Required: The PR title must be prefixed with a JIRA Issue number.
Required: The PR description must include the link to the Jira Issue, for example by completing the URL in the first checklist item
Required: Each commit message must be prefixed with a JIRA Issue number.
Issue accepted (done by Technical Committee after discussion)

broken by ICU-22309

jira-pull-request-webhook · 2023-12-15T20:06:45Z

Notice: the branch changed across the force-push!

icu4c/source/config/dist.mk is different

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

- 'git archive' works on a subtree so did not include LICENSE - we copy the LICENSE file from the build dir - broken by ICU-22309

sven-oly

This looks right to me. Thanks, Steven!

srl295 · 2023-12-15T22:12:40Z

This looks right to me. Thanks, Steven!

please go ahead and merge once the ticket's accepted

markusicu · 2023-12-15T22:20:29Z

Thanks @srl295 for figuring this out and fixing it!

We normally fix bugs on main and then cherry-pick them to the maintenance branch (see our gitdev page). Would you mind doing that here, or do you want to merge to maint/maint-74 and cherry-pick backwards?

markusicu · 2023-12-15T22:22:20Z

PS: If we don't roll yet another 74.x maintenance release, then we don't really need this fix on the maint/maint-74 branch at all.

srl295 · 2023-12-15T22:29:47Z

Thanks @srl295 for figuring this out and fixing it!

We normally fix bugs on main and then cherry-pick them to the maintenance branch (see our gitdev page). Would you mind doing that here, or do you want to merge to maint/maint-74 and cherry-pick backwards?

Sure, I'll rebase and post it to main.

Also pragmatically, it could be copied to a local workspace (such as on top of release-74-2) and then make dist run from there. make dist uses git archive, and so it does not use the local workspace directly for the source archive, other than for the LICENSE file.

jira-pull-request-webhook · 2023-12-15T22:31:12Z

Notice: the branch changed across the force-push!

.ci-builds/.azure-pipelines.yml is now changed in the branch
.github/workflows/icu_common.yml is now changed in the branch
.github/workflows/icu_docs.yml is now changed in the branch
.github/workflows/icu_valgrind.yml is now changed in the branch
.github/workflows/icu4c.yml is now changed in the branch
.github/workflows/icu4j.yml is now changed in the branch
.github/workflows/jekyll-gh-pages.yml is now changed in the branch
docs/processes/release/tasks/publish/index.md is now changed in the branch
docs/processes/release/tasks/versions.md is now changed in the branch
docs/userguide/icu/services.md is now changed in the branch
docs/userguide/icu4c/build.md is now changed in the branch
icu4c/build_qnx/build-hooks is now changed in the branch
icu4c/source/aclocal.m4 is now changed in the branch
icu4c/source/allinone/Build.Windows.IcuVersion.props is now changed in the branch
icu4c/source/allinone/Build.Windows.ProjectConfiguration.props is now changed in the branch
icu4c/source/common/caniter.cpp is now changed in the branch
icu4c/source/common/localematcher.cpp is now changed in the branch
icu4c/source/common/locdistance.cpp is now changed in the branch
icu4c/source/common/locdistance.h is now changed in the branch
icu4c/source/common/loclikely.cpp is now changed in the branch
icu4c/source/common/loclikelysubtags.cpp is now changed in the branch
icu4c/source/common/loclikelysubtags.h is now changed in the branch
icu4c/source/common/rbbinode.cpp is now changed in the branch
icu4c/source/common/rbbinode.h is now changed in the branch
icu4c/source/common/rbbiscan.cpp is now changed in the branch
icu4c/source/common/rbbitblb.cpp is now changed in the branch
icu4c/source/common/unicode/caniter.h is now changed in the branch
icu4c/source/common/unicode/localematcher.h is now changed in the branch
icu4c/source/common/unicode/locid.h is now changed in the branch
icu4c/source/common/unicode/platform.h is now changed in the branch
icu4c/source/common/unicode/uloc.h is now changed in the branch
icu4c/source/common/unicode/uvernum.h is now changed in the branch
icu4c/source/common/unistr.cpp is now changed in the branch
icu4c/source/config/mh-solaris is now changed in the branch
icu4c/source/configure is now changed in the branch
icu4c/source/configure.ac is now changed in the branch
icu4c/source/data/makedata.mak is now changed in the branch
icu4c/source/data/misc/icuver.txt is now changed in the branch
icu4c/source/Doxyfile.in is now changed in the branch
icu4c/source/i18n/calendar.cpp is now changed in the branch
icu4c/source/i18n/collationbuilder.cpp is now changed in the branch
icu4c/source/i18n/datefmt.cpp is now changed in the branch
icu4c/source/i18n/dtfmtsym.cpp is now changed in the branch
icu4c/source/i18n/dtptngen.cpp is now changed in the branch
icu4c/source/i18n/formatted_string_builder.cpp is now changed in the branch
icu4c/source/i18n/gregocal.cpp is now changed in the branch
icu4c/source/i18n/gregoimp.cpp is now changed in the branch
icu4c/source/i18n/gregoimp.h is now changed in the branch
icu4c/source/i18n/iso8601cal.cpp is now changed in the branch
icu4c/source/i18n/measunit_extra.cpp is now changed in the branch
icu4c/source/i18n/smpdtfmt.cpp is now changed in the branch
icu4c/source/i18n/tzfmt.cpp is now changed in the branch
icu4c/source/i18n/tznames_impl.cpp is now changed in the branch
icu4c/source/i18n/unicode/calendar.h is now changed in the branch
icu4c/source/i18n/unicode/formattednumber.h is now changed in the branch
icu4c/source/i18n/unicode/gregocal.h is now changed in the branch
icu4c/source/i18n/unicode/measunit.h is now changed in the branch
icu4c/source/i18n/unicode/simplenumberformatter.h is now changed in the branch
icu4c/source/samples/layout/gnomeglue.cpp is now changed in the branch
icu4c/source/samples/layout/gnomeglue.h is now changed in the branch
icu4c/source/samples/layout/Makefile.in is now changed in the branch
icu4c/source/samples/layout/rsurface.cpp is now changed in the branch
icu4c/source/samples/layout/rsurface.h is now changed in the branch
icu4c/source/samples/layout/sfnt.h is now changed in the branch
icu4c/source/test/cintltst/cbiditst.c is now changed in the branch
icu4c/source/test/cintltst/ccapitst.c is now changed in the branch
icu4c/source/test/cintltst/cintltst.vcxproj is now changed in the branch
icu4c/source/test/cintltst/cintltst.vcxproj.filters is now changed in the branch
icu4c/source/test/cintltst/cloctst.c is now changed in the branch
icu4c/source/test/cintltst/udatpg_test.c is now changed in the branch
icu4c/source/test/cintltst/usrchdat.inc is now changed in the branch
icu4c/source/test/cintltst/usrchtst.c is now changed in the branch
icu4c/source/test/depstest/dependencies.txt is now changed in the branch
icu4c/source/test/fuzzer/calendar_fuzzer.cpp is now changed in the branch
icu4c/source/test/fuzzer/collator_rulebased_fuzzer.cpp is now changed in the branch
icu4c/source/test/fuzzer/date_time_pattern_generator_fuzzer.cpp is now changed in the branch
icu4c/source/test/fuzzer/locale_util.h is now changed in the branch
icu4c/source/test/fuzzer/Makefile.in is now changed in the branch
icu4c/source/test/fuzzer/normalizer2_fuzzer.cpp is now changed in the branch
icu4c/source/test/fuzzer/number_formatter_fuzzer.cpp is now changed in the branch
icu4c/source/test/fuzzer/rule_based_break_iterator_fuzzer.cpp is now changed in the branch
icu4c/source/test/fuzzer/time_zone_names_fuzzer.cpp is now changed in the branch
icu4c/source/test/fuzzer/timezone_create_fuzzer.cpp is now changed in the branch
icu4c/source/test/fuzzer/unicodeset_fuzzer.cpp is now changed in the branch
icu4c/source/test/fuzzer/uprop_fuzzer.cpp is now changed in the branch
icu4c/source/test/hdrtst/testinternalheaders.sh is now changed in the branch
icu4c/source/test/intltest/caltest.cpp is now changed in the branch
icu4c/source/test/intltest/caltest.h is now changed in the branch
icu4c/source/test/intltest/dtifmtts.cpp is now changed in the branch
icu4c/source/test/intltest/dtptngts.cpp is now changed in the branch
icu4c/source/test/intltest/incaltst.cpp is now changed in the branch
icu4c/source/test/intltest/incaltst.h is now changed in the branch
icu4c/source/test/intltest/loctest.cpp is now changed in the branch
icu4c/source/test/intltest/measfmttest.cpp is now changed in the branch
icu4c/source/test/intltest/pluralmaptest.cpp is now changed in the branch
icu4c/source/test/intltest/rbbiapts.cpp is now changed in the branch
icu4c/source/test/intltest/rbbiapts.h is now changed in the branch
icu4c/source/test/intltest/rbbimonkeytest.cpp is now changed in the branch
icu4c/source/test/intltest/rbbitst.cpp is now changed in the branch
icu4c/source/test/intltest/rbbitst.h is now changed in the branch
icu4c/source/test/intltest/regcoll.cpp is now changed in the branch
icu4c/source/test/intltest/regcoll.h is now changed in the branch
icu4c/source/test/intltest/srchtest.cpp is now changed in the branch
icu4c/source/test/intltest/tzfmttst.cpp is now changed in the branch
icu4c/source/test/intltest/tzfmttst.h is now changed in the branch
icu4c/source/test/intltest/utxttest.cpp is now changed in the branch
icu4c/source/test/letest/FontObject.cpp is now changed in the branch
icu4c/source/test/letest/FontObject.h is now changed in the branch
icu4c/source/test/letest/SimpleFontInstance.cpp is now changed in the branch
icu4c/source/test/letest/testdata.cpp is now changed in the branch
icu4c/source/test/perf/leperf/cfonts.cpp is now changed in the branch
icu4c/source/test/perf/leperf/FontObject.cpp is now changed in the branch
icu4c/source/test/perf/leperf/FontObject.h is now changed in the branch
icu4c/source/test/perf/leperf/letrperf.cpp is now changed in the branch
icu4c/source/test/perf/leperf/Makefile.in is now changed in the branch
icu4c/source/test/perf/leperf/xmlreader.h is now changed in the branch
icu4c/source/test/perf/ubrkperf/ubrkperfold.cpp is now changed in the branch
icu4c/source/test/perf/ubrkperf/ubrkperfold.dsp is now changed in the branch
icu4c/source/test/testdata/ssearch.xml is now changed in the branch
icu4c/source/tools/genrb/rle.c is now changed in the branch
icu4c/source/tools/genrb/wrtjava.cpp is now changed in the branch
icu4j/coverage-exclusion.txt is now changed in the branch
icu4j/demos/pom.xml is now changed in the branch
icu4j/main/charset/pom.xml is now changed in the branch
icu4j/main/collate/pom.xml is now changed in the branch
icu4j/main/collate/src/test/java/com/ibm/icu/dev/test/collator/CollationRegressionTest.java is now changed in the branch
icu4j/main/common_tests/pom.xml is now changed in the branch
icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/MeasureUnitTest.java is now changed in the branch
icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java is now changed in the branch
icu4j/main/core/pom.xml is now changed in the branch
icu4j/main/core/src/main/java/com/ibm/icu/impl/locale/LikelySubtags.java is now changed in the branch
icu4j/main/core/src/main/java/com/ibm/icu/impl/locale/LocaleDistance.java is now changed in the branch
icu4j/main/core/src/main/java/com/ibm/icu/text/CanonicalIterator.java is now changed in the branch
icu4j/main/core/src/main/java/com/ibm/icu/text/DateTimePatternGenerator.java is now changed in the branch
icu4j/main/core/src/main/java/com/ibm/icu/text/RBBINode.java is now changed in the branch
icu4j/main/core/src/main/java/com/ibm/icu/text/RBBIRuleScanner.java is now changed in the branch
icu4j/main/core/src/main/java/com/ibm/icu/text/RBBITableBuilder.java is now changed in the branch
icu4j/main/core/src/main/java/com/ibm/icu/util/Calendar.java is now changed in the branch
icu4j/main/core/src/main/java/com/ibm/icu/util/LocaleMatcher.java is now changed in the branch
icu4j/main/core/src/main/java/com/ibm/icu/util/MeasureUnit.java is now changed in the branch
icu4j/main/core/src/main/java/com/ibm/icu/util/ULocale.java is now changed in the branch
icu4j/main/core/src/main/java/com/ibm/icu/util/VersionInfo.java is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt74b/icuver.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/af_NA.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/af_ZA.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/af.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/agq_CM.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/agq.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ak_GH.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ak.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/am_ET.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/am.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_001.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_AE.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_BH.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_DJ.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_DZ.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_EG.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_EH.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_ER.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_IL.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_IQ.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_JO.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_KM.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_KW.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_LB.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_LY.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_MA.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_MR.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_OM.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_PS.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_QA.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_SA.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_SD.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_SO.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_SS.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_SY.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_TD.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_TN.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar_YE.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ar.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ars.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/as_IN.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/as.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/asa_TZ.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/asa.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ast_ES.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ast.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/az_AZ.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/az_Cyrl_AZ.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/az_Cyrl.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/az_Latn_AZ.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/az_Latn.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/az.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/bas_CM.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/bas.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/be_BY.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/be.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/bem_ZM.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/bem.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/bez_TZ.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/bez.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/bg_BG.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/bg.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/bgc_IN.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/bgc.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/bho_IN.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/bho.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/blo_BJ.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/blo.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/bm_ML.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/bm.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/bn_BD.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/bn_IN.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/bn.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/bo_CN.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/bo_IN.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/bo.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/br_FR.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/br.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/burmesedict.dict is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/char.brk is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/cjdict.dict is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/de.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/el.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/en_US_POSIX.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/en_US.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/en.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/es.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/fi.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/fr.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/it.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/ja.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/khmerdict.dict is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/ko.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/laodict.dict is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/line_cj.brk is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/line_loose_cj.brk is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/line_loose_phrase_cj.brk is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/line_loose.brk is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/line_normal_cj.brk is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/line_normal_phrase_cj.brk is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/line_normal.brk is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/line_phrase_cj.brk is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/line.brk is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/pt.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/res_index.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/root.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/ru.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/sent_el.brk is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/sent.brk is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/sv.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/thaidict.dict is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/title.brk is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/word_fi_sv.brk is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/word_POSIX.brk is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/word.brk is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/zh_Hant.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brkitr/zh.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brx_IN.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/brx.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/bs_BA.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/bs_Cyrl_BA.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/bs_Cyrl.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/bs_Latn_BA.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/bs_Latn.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/bs.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ca_AD.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ca_ES.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ca_FR.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ca_IT.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ca.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ccp_BD.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ccp_IN.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ccp.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ce_RU.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ce.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ceb_PH.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ceb.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/cgg_UG.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/cgg.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/chr_US.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/chr.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ckb_IQ.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ckb_IR.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/ckb.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/cns-11643-1992.cnv is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/cnvalias.icu is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/coll/af.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/coll/am.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/coll/ar_SA.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/coll/ar.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/coll/ars.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/coll/as.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/coll/az.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/coll/be.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/coll/bg.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/coll/bn.res is now changed in the branch
icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudt75b/coll/bo.res is now changed in the branch

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

srl295 · 2023-12-15T22:31:39Z

@sven-oly @markusicu PTAL

srl295 · 2023-12-15T22:32:40Z

I should add that i would recommend re-releasing the source files with a LICENSE. Putting my license hat on..

markusicu · 2023-12-15T22:34:32Z

Also pragmatically, it could be copied to a local workspace (such as on top of release-74-2) and then make dist run from there. make dist uses git archive, and so it does not use the local workspace directly for the source archive, other than for the LICENSE file.

Makes sense. I asked Craig to try this. I think he normally runs this from Docker, but since we only need to update the source archives, that should not be necessary.

I should add that i would recommend re-releasing the source files with a LICENSE. Putting my license hat on..

Yes, we will update the source archives on the release page.

markusicu

thanks!

sven-oly · 2023-12-16T00:26:44Z

Problems: I've tried this by manually updating the dist.mk file in the downloaded ICU 74.2 source under
icu-docker/src/icu/icu4c/source/config:

diff --git a/icu4c/source/config/dist.mk b/icu4c/source/config/dist.mk
index d828632..6558c16 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

File icu4c-74_2-src.tgz has only a link for LICENSE, but no file.

icu4c-74_2-src.zip has no LICENSE file at all.

What am I missing?

thesamesam · 2023-12-16T01:30:34Z

I should add that i would recommend re-releasing the source files with a LICENSE. Putting my license hat on..

Sure. It's also just uninstallable without it for us ;)

srl295 · 2023-12-16T05:04:47Z

This after deleting those files? “cp -fv $(ICU4CTOP)/LICENSE "$(DISTY_TMP)/LICENSE" did this end up copying a file ? Should appear in logs. Can you paste the logs?

srl295 · 2023-12-16T05:05:13Z

I should add that i would recommend re-releasing the source files with a LICENSE. Putting my license hat on..

Sure. It's also just uninstallable without it for us ;)

That too!!

srl295 · 2023-12-19T16:24:22Z

Problems: I've tried this by manually updating the dist.mk file in the downloaded ICU 74.2 source under icu-docker/src/icu/icu4c/source/config

you should be able to just checkout this branch directly and build it under icu-docker. I'll try that also. It'll build main but it should then build correctly.

srl295 · 2023-12-19T21:50:30Z

@sven-oly: I

checked out icu-docker
checked out this PR's branch into the src/icu directory under icu-docker
noticed that the docker-compose.yml format is out of date in icu-docker. Worked around that with a new .yml file
ran make sdist
seems to be correct (size diff probably due to CR/LF):

$ tar tvfpz dist/*-src.d/icu4c-src.tgz | grep LICENSE
-rw-r--r-- build/build   25185 2023-12-19 21:35 icu/LICENSE
$ unzip -l dist/*-src.d/icu4c-src.zip | grep LICENSE
    25697  2023-12-19 21:35   icu/LICENSE

srl295 · 2023-12-20T23:47:08Z

@markusicu @sven-oly this is working for me locally and via docker as shown, should we merge this?

srl295 · 2023-12-22T03:31:15Z

ping?

srl295 requested review from echeran, mihnita, sven-oly, markusicu and DraganBesevic December 15, 2023 20:04

srl295 assigned srl295 and sven-oly Dec 15, 2023

srl295 force-pushed the icu-22601/fix-dangling-license branch from bd97ef0 to b4e4ca0 Compare December 15, 2023 20:06

ICU-22601 v74.2 fix dangling LICENSE file

dc9a6af

- 'git archive' works on a subtree so did not include LICENSE - we copy the LICENSE file from the build dir - broken by ICU-22309

sven-oly previously approved these changes Dec 15, 2023

View reviewed changes

mihnita previously approved these changes Dec 15, 2023

View reviewed changes

srl295 dismissed stale reviews from mihnita and sven-oly via dc9a6af December 15, 2023 22:31

srl295 force-pushed the icu-22601/fix-dangling-license branch from b4e4ca0 to dc9a6af Compare December 15, 2023 22:31

srl295 changed the base branch from maint/maint-74 to main December 15, 2023 22:31

markusicu approved these changes Dec 15, 2023

View reviewed changes

lazka mentioned this pull request Dec 17, 2023

icu: Update to 74.2 msys2/MINGW-packages#19389

Merged

srl295 mentioned this pull request Dec 19, 2023

ICU-21964 use a single LICENSE file #2415

Merged

5 tasks

Bo98 mentioned this pull request Dec 21, 2023

icu4c 74.2 Homebrew/homebrew-core#153108

Merged

6 tasks

markusicu merged commit 9d3e12b into unicode-org:main Dec 22, 2023
30 of 31 checks passed

markusicu mentioned this pull request Jan 25, 2024

Fix icu4c source dists not including an actual LICENSE file #2804

Closed

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ICU-22601 v74.2 fix dangling LICENSE file #2749

ICU-22601 v74.2 fix dangling LICENSE file #2749

srl295 commented Dec 15, 2023 •

edited

Loading

jira-pull-request-webhook bot commented Dec 15, 2023

sven-oly left a comment

srl295 commented Dec 15, 2023

markusicu commented Dec 15, 2023

markusicu commented Dec 15, 2023

srl295 commented Dec 15, 2023

jira-pull-request-webhook bot commented Dec 15, 2023

srl295 commented Dec 15, 2023

srl295 commented Dec 15, 2023

markusicu commented Dec 15, 2023

markusicu left a comment

sven-oly commented Dec 16, 2023 •

edited by markusicu

Loading

thesamesam commented Dec 16, 2023

srl295 commented Dec 16, 2023 via email

srl295 commented Dec 16, 2023

srl295 commented Dec 19, 2023

srl295 commented Dec 19, 2023 •

edited

Loading

srl295 commented Dec 20, 2023

srl295 commented Dec 22, 2023

ICU-22601 v74.2 fix dangling LICENSE file #2749

ICU-22601 v74.2 fix dangling LICENSE file #2749

Conversation

srl295 commented Dec 15, 2023 • edited Loading

Checklist

jira-pull-request-webhook bot commented Dec 15, 2023

sven-oly left a comment

Choose a reason for hiding this comment

srl295 commented Dec 15, 2023

markusicu commented Dec 15, 2023

markusicu commented Dec 15, 2023

srl295 commented Dec 15, 2023

jira-pull-request-webhook bot commented Dec 15, 2023

srl295 commented Dec 15, 2023

srl295 commented Dec 15, 2023

markusicu commented Dec 15, 2023

markusicu left a comment

Choose a reason for hiding this comment

sven-oly commented Dec 16, 2023 • edited by markusicu Loading

thesamesam commented Dec 16, 2023

srl295 commented Dec 16, 2023 via email

srl295 commented Dec 16, 2023

srl295 commented Dec 19, 2023

srl295 commented Dec 19, 2023 • edited Loading

srl295 commented Dec 20, 2023

srl295 commented Dec 22, 2023

srl295 commented Dec 15, 2023 •

edited

Loading

sven-oly commented Dec 16, 2023 •

edited by markusicu

Loading

srl295 commented Dec 19, 2023 •

edited

Loading