From 3a39eb34aa4fe8f0541cbd23b8a6329027738e11 Mon Sep 17 00:00:00 2001
From: Yoshito Umaoka <y.umaoka@gmail.com>
Date: Tue, 4 Sep 2012 04:44:50 +0000
Subject: [PATCH] ICU-9413 Fixed some issues in the Eclipse plug-in build
 script.

X-SVN-Rev: 32325
---
 .gitattributes                                       |  4 ++++
 icu4j/eclipse-build/build.xml                        | 12 +++++++++++-
 .../.settings/org.eclipse.core.resources.prefs       |  2 ++
 .../.settings/org.eclipse.core.resources.prefs       |  2 ++
 .../.settings/org.eclipse.core.resources.prefs       |  2 ++
 .../.settings/org.eclipse.core.resources.prefs       |  2 ++
 icu4j/main/classes/core/build.xml                    |  7 +++++--
 7 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 icu4j/eclipse-build/plugins.template/com.ibm.icu.base.tests/.settings/org.eclipse.core.resources.prefs
 create mode 100644 icu4j/eclipse-build/plugins.template/com.ibm.icu.base/.settings/org.eclipse.core.resources.prefs
 create mode 100644 icu4j/eclipse-build/plugins.template/com.ibm.icu.tests/.settings/org.eclipse.core.resources.prefs
 create mode 100644 icu4j/eclipse-build/plugins.template/com.ibm.icu/.settings/org.eclipse.core.resources.prefs

diff --git a/.gitattributes b/.gitattributes
index e3102ecbad7..6f0abff5dea 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -213,6 +213,7 @@ icu4j/eclipse-build/features.template/com.ibm.icu.base/.project -text
 icu4j/eclipse-build/features.template/com.ibm.icu.base/build.properties -text
 icu4j/eclipse-build/plugins.template/com.ibm.icu.base.tests/.classpath -text
 icu4j/eclipse-build/plugins.template/com.ibm.icu.base.tests/.project -text
+icu4j/eclipse-build/plugins.template/com.ibm.icu.base.tests/.settings/org.eclipse.core.resources.prefs -text
 icu4j/eclipse-build/plugins.template/com.ibm.icu.base.tests/.settings/org.eclipse.jdt.core.prefs -text
 icu4j/eclipse-build/plugins.template/com.ibm.icu.base.tests/.settings/org.eclipse.jdt.ui.prefs -text
 icu4j/eclipse-build/plugins.template/com.ibm.icu.base.tests/META-INF/MANIFEST.MF -text
@@ -220,13 +221,16 @@ icu4j/eclipse-build/plugins.template/com.ibm.icu.base.tests/build.properties -te
 icu4j/eclipse-build/plugins.template/com.ibm.icu.base.tests/plugin.properties -text
 icu4j/eclipse-build/plugins.template/com.ibm.icu.base/.classpath -text
 icu4j/eclipse-build/plugins.template/com.ibm.icu.base/.project -text
+icu4j/eclipse-build/plugins.template/com.ibm.icu.base/.settings/org.eclipse.core.resources.prefs -text
 icu4j/eclipse-build/plugins.template/com.ibm.icu.base/.settings/org.eclipse.jdt.core.prefs -text
 icu4j/eclipse-build/plugins.template/com.ibm.icu.base/.settings/org.eclipse.jdt.ui.prefs -text
 icu4j/eclipse-build/plugins.template/com.ibm.icu.base/META-INF/MANIFEST.MF -text
 icu4j/eclipse-build/plugins.template/com.ibm.icu.base/build.properties -text
 icu4j/eclipse-build/plugins.template/com.ibm.icu.base/plugin.properties -text
+icu4j/eclipse-build/plugins.template/com.ibm.icu.tests/.settings/org.eclipse.core.resources.prefs -text
 icu4j/eclipse-build/plugins.template/com.ibm.icu.tests/META-INF/MANIFEST.MF -text
 icu4j/eclipse-build/plugins.template/com.ibm.icu.tests/plugin.properties -text
+icu4j/eclipse-build/plugins.template/com.ibm.icu/.settings/org.eclipse.core.resources.prefs -text
 icu4j/eclipse-build/plugins.template/com.ibm.icu/META-INF/MANIFEST.MF -text
 icu4j/main/classes/charset/.classpath -text
 icu4j/main/classes/charset/.project -text
diff --git a/icu4j/eclipse-build/build.xml b/icu4j/eclipse-build/build.xml
index 282243fd826..179a17a07dc 100644
--- a/icu4j/eclipse-build/build.xml
+++ b/icu4j/eclipse-build/build.xml
@@ -1,7 +1,7 @@
 <!--
 /*
 *******************************************************************************
-* Copyright (C) 2010-2011, International Business Machines Corporation and    *
+* Copyright (C) 2010-2012, International Business Machines Corporation and    *
 * others. All Rights Reserved.                                                *
 *******************************************************************************
 */
@@ -183,11 +183,21 @@
     <!-- icu data -->
     <unjar src="${icu4j.data.jar}" dest="${eclipse.projects.dir}/plugins/com.ibm.icu/src">
       <patternset>
+        <exclude name="META-INF"/>
+        <exclude name="META-INF/**/*"/>
         <exclude name="**/*.cnv"/>
         <exclude name="**/cnvalias.icu"/>
       </patternset>
     </unjar>
 
+    <!-- icu tz data -->
+    <unjar src="${icu4j.tzdata.jar}" dest="${eclipse.projects.dir}/plugins/com.ibm.icu/src">
+      <patternset>
+        <exclude name="META-INF"/>
+        <exclude name="META-INF/**/*"/>
+      </patternset>
+    </unjar>
+
     <!-- full locale names lists -->
     <antcall target="@full-locale-names">
         <param name="res.dir" value="${eclipse.projects.dir}/plugins/com.ibm.icu/src/${icu4j.data.path}"/>
diff --git a/icu4j/eclipse-build/plugins.template/com.ibm.icu.base.tests/.settings/org.eclipse.core.resources.prefs b/icu4j/eclipse-build/plugins.template/com.ibm.icu.base.tests/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..4824b802631
--- /dev/null
+++ b/icu4j/eclipse-build/plugins.template/com.ibm.icu.base.tests/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/icu4j/eclipse-build/plugins.template/com.ibm.icu.base/.settings/org.eclipse.core.resources.prefs b/icu4j/eclipse-build/plugins.template/com.ibm.icu.base/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..4824b802631
--- /dev/null
+++ b/icu4j/eclipse-build/plugins.template/com.ibm.icu.base/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/icu4j/eclipse-build/plugins.template/com.ibm.icu.tests/.settings/org.eclipse.core.resources.prefs b/icu4j/eclipse-build/plugins.template/com.ibm.icu.tests/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..4824b802631
--- /dev/null
+++ b/icu4j/eclipse-build/plugins.template/com.ibm.icu.tests/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/icu4j/eclipse-build/plugins.template/com.ibm.icu/.settings/org.eclipse.core.resources.prefs b/icu4j/eclipse-build/plugins.template/com.ibm.icu/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..4824b802631
--- /dev/null
+++ b/icu4j/eclipse-build/plugins.template/com.ibm.icu/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/icu4j/main/classes/core/build.xml b/icu4j/main/classes/core/build.xml
index 76aa1666532..9213baa33a9 100644
--- a/icu4j/main/classes/core/build.xml
+++ b/icu4j/main/classes/core/build.xml
@@ -1,6 +1,6 @@
 <!--
 *******************************************************************************
-* Copyright (C) 2009-2011, International Business Machines Corporation and    *
+* Copyright (C) 2009-2012, International Business Machines Corporation and    *
 * others. All Rights Reserved.                                                *
 *******************************************************************************
 -->
@@ -34,6 +34,8 @@
     <target name="copy-data" description="Extract pre-built ICU core data files and copy them to the project's binary directory">
         <unjar src="${icu4j.data.jar}" dest="${bin.dir}">
             <patternset>
+                <exclude name="META-INF"/>
+                <exclude name="META-INF/**/*"/>
                 <exclude name="${icu4j.data.path}/coll/**"/>
                 <exclude name="${icu4j.data.path}/curr/**"/>
                 <exclude name="${icu4j.data.path}/lang/**"/>
@@ -45,7 +47,8 @@
         </unjar>
         <unjar src="${icu4j.tzdata.jar}" dest="${bin.dir}">
             <patternset>
-                <include name="**/*.res" />
+                <exclude name="META-INF"/>
+                <exclude name="META-INF/**/*"/>
             </patternset>
         </unjar>
 
-- 
2.40.0