ICU-22769 Rename of the ICU4J data folder to not contain a version (s…

…cript)
unicode-org · May 8, 2024 · 63afc76 · 63afc76
1 parent 2962061
commit 63afc76
Showing 1 changed file with 20 additions and 25 deletions.
diff --git a/icu4j/extract-data-files.sh b/icu4j/extract-data-files.sh
@@ -2,11 +2,6 @@
 # Copyright (C) 2023 and later: Unicode, Inc. and others.
 # License & terms of use: http://www.unicode.org/copyright.html
 
-if [ -z "$ICU_DATA_VER" ]; then
-  echo "ICU_DATA_VER must be set to the icu folder name (for example icudt74b)"
-  exit
-fi
-
 # Check that all the .jar files are present
 JAR_FILE=main/shared/data/icudata.jar
 if [ ! -f "$JAR_FILE" ]; then
@@ -27,40 +22,40 @@ fi
 # Unpack the pre-built .jar files with data only
 
 echo "Unpacking icudata.jar"
-rm -fr      main/core/src/main/resources/com/ibm/icu/impl/data/icudt*
+rm -fr      main/core/src/main/resources/com/ibm/icu/impl/data/icudata
 unzip -q -d main/core/src/main/resources/ main/shared/data/icudata.jar
 rm -fr      main/core/src/main/resources/META-INF
 
 echo "  Moving charset data"
-rm   -fr main/charset/src/main/resources/com/ibm/icu/impl/data/icudt*
-mkdir -p main/charset/src/main/resources/com/ibm/icu/impl/data/${ICU_DATA_VER}/
-mv       main/core/src/main/resources/com/ibm/icu/impl/data/${ICU_DATA_VER}/*.cnv        main/charset/src/main/resources/com/ibm/icu/impl/data/${ICU_DATA_VER}/
-mv       main/core/src/main/resources/com/ibm/icu/impl/data/${ICU_DATA_VER}/cnvalias.icu main/charset/src/main/resources/com/ibm/icu/impl/data/${ICU_DATA_VER}/
+rm   -fr main/charset/src/main/resources/com/ibm/icu/impl/data/icudata
+mkdir -p main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/
+mv       main/core/src/main/resources/com/ibm/icu/impl/data/icudata/*.cnv        main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/
+mv       main/core/src/main/resources/com/ibm/icu/impl/data/icudata/cnvalias.icu main/charset/src/main/resources/com/ibm/icu/impl/data/icudata/
 
 echo "  Moving currency data"
-rm   -fr main/currdata/src/main/resources/com/ibm/icu/impl/data/icudt*
-mkdir -p main/currdata/src/main/resources/com/ibm/icu/impl/data/${ICU_DATA_VER}/
-mv       main/core/src/main/resources/com/ibm/icu/impl/data/${ICU_DATA_VER}/curr         main/currdata/src/main/resources/com/ibm/icu/impl/data/${ICU_DATA_VER}/curr
+rm   -fr main/currdata/src/main/resources/com/ibm/icu/impl/data/icudata
+mkdir -p main/currdata/src/main/resources/com/ibm/icu/impl/data/icudata/
+mv       main/core/src/main/resources/com/ibm/icu/impl/data/icudata/curr         main/currdata/src/main/resources/com/ibm/icu/impl/data/icudata/curr
 
 echo "  Moving collate data"
-rm   -fr main/collate/src/main/resources/com/ibm/icu/impl/data/icudt*
-mkdir -p main/collate/src/main/resources/com/ibm/icu/impl/data/${ICU_DATA_VER}/
-mv       main/core/src/main/resources/com/ibm/icu/impl/data/${ICU_DATA_VER}/coll         main/collate/src/main/resources/com/ibm/icu/impl/data/${ICU_DATA_VER}/coll
+rm   -fr main/collate/src/main/resources/com/ibm/icu/impl/data/icudata
+mkdir -p main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/
+mv       main/core/src/main/resources/com/ibm/icu/impl/data/icudata/coll         main/collate/src/main/resources/com/ibm/icu/impl/data/icudata/coll
 
 echo "  Moving langdata data"
-rm   -fr main/langdata/src/main/resources/com/ibm/icu/impl/data/icudt*
-mkdir -p main/langdata/src/main/resources/com/ibm/icu/impl/data/${ICU_DATA_VER}/
-mv       main/core/src/main/resources/com/ibm/icu/impl/data/${ICU_DATA_VER}/lang         main/langdata/src/main/resources/com/ibm/icu/impl/data/${ICU_DATA_VER}/lang
+rm   -fr main/langdata/src/main/resources/com/ibm/icu/impl/data/icudata
+mkdir -p main/langdata/src/main/resources/com/ibm/icu/impl/data/icudata/
+mv       main/core/src/main/resources/com/ibm/icu/impl/data/icudata/lang         main/langdata/src/main/resources/com/ibm/icu/impl/data/icudata/lang
 
 echo "  Moving regiondata data"
-rm   -fr main/regiondata/src/main/resources/com/ibm/icu/impl/data/icudt*
-mkdir -p main/regiondata/src/main/resources/com/ibm/icu/impl/data/${ICU_DATA_VER}/
-mv       main/core/src/main/resources/com/ibm/icu/impl/data/${ICU_DATA_VER}/region       main/regiondata/src/main/resources/com/ibm/icu/impl/data/${ICU_DATA_VER}/region
+rm   -fr main/regiondata/src/main/resources/com/ibm/icu/impl/data/icudata
+mkdir -p main/regiondata/src/main/resources/com/ibm/icu/impl/data/icudata/
+mv       main/core/src/main/resources/com/ibm/icu/impl/data/icudata/region       main/regiondata/src/main/resources/com/ibm/icu/impl/data/icudata/region
 
 echo "  Moving translit data"
-rm   -fr main/translit/src/main/resources/com/ibm/icu/impl/data/icudt*
-mkdir -p main/translit/src/main/resources/com/ibm/icu/impl/data/${ICU_DATA_VER}/
-mv       main/core/src/main/resources/com/ibm/icu/impl/data/${ICU_DATA_VER}/translit     main/translit/src/main/resources/com/ibm/icu/impl/data/${ICU_DATA_VER}/translit
+rm   -fr main/translit/src/main/resources/com/ibm/icu/impl/data/icudata
+mkdir -p main/translit/src/main/resources/com/ibm/icu/impl/data/icudata/
+mv       main/core/src/main/resources/com/ibm/icu/impl/data/icudata/translit     main/translit/src/main/resources/com/ibm/icu/impl/data/icudata/translit
 
 echo "Unpacking icutzdata.jar"
 # This unzips together with other existing core files