ICU-8328 switched to separate icudata.jar and icutzdata.jar

X-SVN-Rev: 30710

diff --git a/.gitattributes b/.gitattributes
index 341d9610a1a812e958444d193547e742d130e064..d0efcebdb59075d55d54b343d7a5e13db866746c 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -299,6 +299,7 @@ icu4j/main/classes/translit/translit-build.launch -text
 icu4j/main/shared/.project -text
 icu4j/main/shared/.settings/org.eclipse.core.resources.prefs -text
 icu4j/main/shared/data/icudata.jar -text
+icu4j/main/shared/data/icutzdata.jar -text
 icu4j/main/shared/data/testdata.jar -text
 icu4j/main/tests/charset/.classpath -text
 icu4j/main/tests/charset/.project -text

diff --git a/icu4j/build.xml b/icu4j/build.xml
index 12c5afd2c7e8cfca3f2f3392ccb4311ccfbd8aa4..ed1400b579f26dae91ddde1f23ba788ab3a2d213 100644 (file)
--- a/icu4j/build.xml
+++ b/icu4j/build.xml
@@ -1099,6 +1099,11 @@
                 <exclude name="**/translit/*.res" />
             </patternset>
         </unjar>
+        <unjar src="${icu4j.tzdata.jar}" dest="${module.bin.dir}">
+            <patternset>
+                <include name="**/*.res" />
+            </patternset>
+        </unjar>
     </target>
 
     <target name="calendarTests" depends="calendar" description="Modular build of calendar test suite">
@@ -1264,6 +1269,11 @@
                 <exclude name="**/translit/*.res"/>
             </patternset>
         </unjar>
+        <unjar src="${icu4j.tzdata.jar}" dest="${module.bin.dir}">
+            <patternset>
+                <include name="**/*.res" />
+            </patternset>
+        </unjar>
     </target>
 
     <target name="formatTests" depends="format" description="Modular build of format test suite">
@@ -1395,6 +1405,11 @@
                 <exclude name="**/rbnf/*.res"/>
             </patternset>
         </unjar>
+        <unjar src="${icu4j.tzdata.jar}" dest="${module.bin.dir}">
+            <patternset>
+                <include name="**/*.res" />
+            </patternset>
+        </unjar>
     </target>
 
     <target name="_propertiesClasses">

diff --git a/icu4j/main/classes/core/build.xml b/icu4j/main/classes/core/build.xml
index 0971e073b41a41d671411c6d8a2ace17b205bb93..5dd3722cc7cc951bf60b5b25684b57e441fe5376 100644 (file)
--- a/icu4j/main/classes/core/build.xml
+++ b/icu4j/main/classes/core/build.xml
@@ -41,6 +41,11 @@
                 <exclude name="**/cnvalias.icu"/>
             </patternset>
         </unjar>
+        <unjar src="${icu4j.tzdata.jar}" dest="${bin.dir}">
+            <patternset>
+                <include name="**/*.res" />
+            </patternset>
+        </unjar>
 
         <antcall target="@full-locale-names">
             <param name="res.dir" value="${bin.dir}/${icu4j.data.path}"/>

diff --git a/icu4j/main/shared/build/common.properties b/icu4j/main/shared/build/common.properties
index ce9884844ce153bc3c91ba402fe7b7501ccefa99..f7f37050030859d7db1e49d9d17635105871dac9 100644 (file)
--- a/icu4j/main/shared/build/common.properties
+++ b/icu4j/main/shared/build/common.properties
@@ -34,6 +34,7 @@ jar.exec.env = ${default.exec.env}
 
 # Jar locations
 icu4j.data.jar = ${shared.dir}/data/icudata.jar
+icu4j.tzdata.jar = ${shared.dir}/data/icutzdata.jar
 icu4j.testdata.jar = ${shared.dir}/data/testdata.jar
 
 icu4j.core.jar = ${icu4j.core.dir}/${jar.dir}/icu4j-core.jar

diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
index fe6763e5a756de8b41e1096cecc2d8c45df14576..17bc7a27def05031f0756bb3ad9c964dae4b6e9f 100755 (executable)
--- a/icu4j/main/shared/data/icudata.jar
+++ b/icu4j/main/shared/data/icudata.jar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed88ed52744ef2610b103a916012f67a63abc38b53c6193aca8028403cb0b821
-size 7998307
+oid sha256:2625cfaf68d182e0cd65ba3de1575cbbe0a461380c8430062aa7802b605ceffc
+size 7906398

diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar
new file mode 100644 (file)
index 0000000..514dd23
--- /dev/null
+++ b/icu4j/main/shared/data/icutzdata.jar
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5237be98cb2ad3394bdf9bba5689219b86cd1b9a8c4cb65847c45d4f2e46f157
+size 92318