From 788b89321454f3eeb20782032c8444aabba42417 Mon Sep 17 00:00:00 2001 From: Mihai Nita Date: Wed, 22 May 2024 03:09:56 -0700 Subject: [PATCH] ICU-22769 Fix the jar generation to not use versioned folder --- icu4c/source/data/Makefile.in | 2 +- icu4c/source/data/makedata.mak | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/icu4c/source/data/Makefile.in b/icu4c/source/data/Makefile.in index 454dec8a8c3d..641bc6c9f0c9 100644 --- a/icu4c/source/data/Makefile.in +++ b/icu4c/source/data/Makefile.in @@ -313,7 +313,7 @@ JAR=jar ICU4J_TZDATA=$(OUTDIR)/icu4j/icutzdata.jar ICU4J_TZDATA_FILES=zoneinfo64 metaZones timezoneTypes windowsZones -ICU4J_DATA_DIRNAME=com/ibm/icu/impl/data/$(ICUDATA_BASENAME_VERSION)b +ICU4J_DATA_DIRNAME=com/ibm/icu/impl/data/icudata ICU4J_TZDATA_PATHS=$(ICU4J_TZDATA_FILES:%="$(ICU4J_DATA_DIRNAME)/%.res") # generate icu4j-related data to $(OUTDIR)/icu4j/com/ibm/icu/impl/data/... diff --git a/icu4c/source/data/makedata.mak b/icu4c/source/data/makedata.mak index a9f7e0ed62f7..5dd12bc0f797 100644 --- a/icu4c/source/data/makedata.mak +++ b/icu4c/source/data/makedata.mak @@ -330,7 +330,7 @@ uni-core-data: GODATA "$(ICUBLD_PKG)\pnames.icu" "$(ICUBLD_PKG)\uprops.icu" "$(I # see icu4j-readme.txt ICU4J_TZDATA="$(ICUOUT)\icu4j\icutzdata.jar" -ICU4J_DATA_DIRNAME=com\ibm\icu\impl\data\$(U_ICUDATA_NAME)b +ICU4J_DATA_DIRNAME=com\ibm\icu\impl\data\icudata ICU4J_TZDATA_PATHS=$(ICU4J_DATA_DIRNAME)\zoneinfo64.res $(ICU4J_DATA_DIRNAME)\metaZones.res $(ICU4J_DATA_DIRNAME)\timezoneTypes.res $(ICU4J_DATA_DIRNAME)\windowsZones.res generate-data: GODATA "$(ICUOUT)\$(ICUPKG).dat" uni-core-data