ICU-10713 Resolved ICU4J plug-in build script problem with Eclipse 4.4.

X-SVN-Rev: 35153

diff --git a/.gitattributes b/.gitattributes
index 713742eab166638503452bbf4e1af8b3d3b8dd32..ac908d3d93ba11712de1edf9de80a99e444a9fae 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -228,6 +228,7 @@ icu4c/source/tools/tzcode/icuregions -text
 icu4j/build.properties -text
 icu4j/demos/.settings/org.eclipse.core.resources.prefs -text
 icu4j/demos/manifest.stub -text
+icu4j/eclipse-build/build-local.properties.template -text
 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

diff --git a/icu4j/eclipse-build/build-local.properties.template b/icu4j/eclipse-build/build-local.properties.template
new file mode 100644 (file)
index 0000000..dd6acb6
--- /dev/null
+++ b/icu4j/eclipse-build/build-local.properties.template
@@ -0,0 +1,33 @@
+#*******************************************************************************\r
+#* Copyright (C) 2014, International Business Machines Corporation and         *\r
+#* others. All Rights Reserved.                                                *\r
+#*******************************************************************************\r
+\r
+#\r
+# Eclipse installation location\r
+# Specify the folder that contains eclipse.exe, for example: eclipse.home=C:/eclipse\r
+#\r
+# Note:\r
+#      By default, this value is set by an environment variable 'ECLIPSE_HOME'.\r
+#      You could uncomment below and specify the path in this file alternatively (recommended). \r
+#\r
+#eclipse.home=\r
+\r
+#\r
+# Java 5 runtime jar location\r
+# Specify jar file path(es) including J2SE runtime classes\r
+#\r
+# Note: \r
+#\r
+#   [Oracle JDK]   All of J2SE runtime classes are in <JRE dir>/lib/rt.jar\r
+#\r
+#   [IBM JDK]      J2SE runtime classes are in multiple jar files. To build ICU4J\r
+#                  plug-in, you need followings:\r
+#                      - <JRE dir>/lib/vm.jar\r
+#                      - <JRE dir>/lib/core.jar\r
+#                      - <JRE dir>/lib/graphics.jar\r
+#                      - <JRE dir>/lib/xml.jar\r
+#\r
+# For example: java.rt=C:/ibmjava5/jre/lib/vm.jar;C:/ibmjava5/jre/lib/core.jar;C:/ibmjava5/jre/lib/graphics.jar;C:/ibmjava5/jre/lib/xml.jar\r
+#\r
+java.rt=\r

diff --git a/icu4j/eclipse-build/build.xml b/icu4j/eclipse-build/build.xml
index b83f0a685e22cd9dfd2c9eef6006dece693ebb15..a9ef2cb7c4d51fc5e47ade201aa6cc65f76fada7 100644 (file)
--- a/icu4j/eclipse-build/build.xml
+++ b/icu4j/eclipse-build/build.xml
@@ -1,13 +1,14 @@
 <!--
 /*
 *******************************************************************************
-* Copyright (C) 2010-2013, International Business Machines Corporation and    *
+* Copyright (C) 2010-2014, International Business Machines Corporation and    *
 * others. All Rights Reserved.                                                *
 *******************************************************************************
 */
 -->
 
 <project name="icu4j-eclipse" default="build" basedir=".">
+  <property file="build-local.properties"/>
   <property file="build.properties"/>
 
   <property name="out.dir" value="out"/>
@@ -27,7 +28,7 @@
   </target>
 
   <target name="build"
-          depends="initEnv,icuProjectFiles,icuTestsProjectFiles,icuBaseProjectFiles,icuBaseTestsProjectFiles"
+          depends="checkProps,initEnv,icuProjectFiles,icuTestsProjectFiles,icuBaseProjectFiles,icuBaseTestsProjectFiles"
           description="Build icu4j plug-ins">
 
     <!-- copy OSGi jar file to baseLocation -->
@@ -50,6 +51,36 @@
 
   </target>
 
+  <target name="initEclipseHome"
+          if="env.ECLIPSE_HOME"
+          unless="eclipse.home"
+          description="Initialize the property eclipse.home from the environment variable ECLIPSE_HOME">
+    <property name="eclipse.home" value="${env.ECLIPSE_HOME}"/>
+  </target>
+
+  <target name="checkProps" depends="initEclipseHome">
+      <fail message="Eclipse home (eclipse.home or env.ECLIPSE_HOME) is not set">
+        <condition>
+          <or>
+            <equals arg1="${eclipse.home}" arg2=""/>
+            <not>
+              <isset property="eclipse.home"/>
+            </not>
+          </or>
+        </condition>
+      </fail>
+      <fail message="Java runtime jar path (java.rt) is not set">
+        <condition>
+          <or>
+            <equals arg1="${java.rt}" arg2=""/>
+            <not>
+              <isset property="java.rt"/>
+            </not>
+          </or>
+        </condition>
+      </fail>
+  </target>
+
   <target name="initPluginVersion">
     <tstamp>
       <format property="build.date" pattern="yyyyMMdd"/>
@@ -58,7 +89,7 @@
   </target>
 
   <target name="initEnv"
-          depends="initEclipseHome,initEclipseLauncher,initEclipseOSGiJar,initEclipsePDE"
+          depends="checkProps,initEclipseLauncher,initEclipseOSGiJar,initEclipsePDE"
           description="Initialize eclipse PDE build environment">
     <echo message="[PDE build configuration properties]"/>
     <echo message="    Eclipse home:    ${eclipse.home}"/>
@@ -69,13 +100,6 @@
     <echo message="    Base ARCH:       ${eclipse.basearch}"/>
   </target>
 
-  <target name="initEclipseHome"
-          if="env.ECLIPSE_HOME"
-          unless="eclipse.home"
-          description="Initialize the property eclipse.home from the environment variable ECLIPSE_HOME">
-    <property name="eclipse.home" value="${env.ECLIPSE_HOME}"/>
-  </target>
-
   <target name="initEclipseLauncher"
           if="eclipse.home"
           description="Locate org.eclipse.equinox.launcher jar file for eclipse 3.3 and beyond">
@@ -132,6 +156,7 @@
             <filter token="BASE_OS" value="${eclipse.baseos}"/>
             <filter token="BASE_WS" value="${eclipse.basews}"/>
             <filter token="BASE_ARCH" value="${eclipse.basearch}"/>
+            <filter token="JAVA_RT" value="${java.rt}"/>
           </filterset>
       </copy>
 
@@ -268,7 +293,6 @@
       <fileset dir="${icu4j.core-tests.dir}/src"/>
       <fileset dir="${icu4j.collate-tests.dir}/src"/>
       <fileset dir="${icu4j.translit-tests.dir}/src"/>
-      <fileset dir="${icu4j.testall.dir}/src"/>
     </copy>
 
     <!-- icu test data -->

diff --git a/icu4j/eclipse-build/pdebuild/build.properties b/icu4j/eclipse-build/pdebuild/build.properties
index e66e85161398d15c2dcbcbb452be856d7ee8da5b..a1b10843ce79a10c8d8b58c60bda5eba5b27d1d8 100644 (file)
--- a/icu4j/eclipse-build/pdebuild/build.properties
+++ b/icu4j/eclipse-build/pdebuild/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2003-2013 IBM Corporation and others.
+# Copyright (c) 2003-2014 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -188,6 +188,7 @@ skipFetch=true
 #J2SE-1.3=
 #J2SE-1.4=
 #J2SE-1.5=
+J2SE-1.5=@JAVA_RT@
 #JavaSE-1.6=
 #PersonalJava-1.1=
 #PersonalJava-1.2=