ICU-10696 Updates for 4.4 plug-in & plug-in build to use an appropriate Java runtime jar(s)
X-SVN-Rev: 35158
diff --git a/.gitattributes b/.gitattributes
index 9f65439..9e8d354 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -51,6 +51,7 @@
/build.properties -text
demos/.settings/org.eclipse.core.resources.prefs -text
demos/manifest.stub -text
+eclipse-build/build-local.properties.template -text
eclipse-build/features.template/com.ibm.icu.base/.project -text
eclipse-build/features.template/com.ibm.icu.base/build.properties -text
eclipse-build/plugins.template/com.ibm.icu.base.tests/.classpath -text
diff --git a/eclipse-build/build-local.properties.template b/eclipse-build/build-local.properties.template
new file mode 100644
index 0000000..8f450ca
--- /dev/null
+++ b/eclipse-build/build-local.properties.template
@@ -0,0 +1,33 @@
+#*******************************************************************************
+#* Copyright (C) 2014, International Business Machines Corporation and *
+#* others. All Rights Reserved. *
+#*******************************************************************************
+
+#
+# Eclipse installation location
+# Specify the folder that contains eclipse.exe, for example: eclipse.home=C:/eclipse
+#
+# Note:
+# By default, this value is set by an environment variable 'ECLIPSE_HOME'.
+# You could uncomment below and specify the path in this file alternatively (recommended).
+#
+#eclipse.home=
+
+#
+# Java 5 runtime jar location
+# Specify jar file path(es) including J2SE runtime classes
+#
+# Note:
+#
+# [Oracle JDK] All of J2SE runtime classes are in <JRE dir>/lib/rt.jar
+#
+# [IBM JDK] J2SE runtime classes are in multiple jar files. To build ICU4J
+# plug-in, you need followings:
+# - <JRE dir>/lib/vm.jar
+# - <JRE dir>/lib/core.jar
+# - <JRE dir>/lib/graphics.jar
+# - <JRE dir>/lib/xml.jar
+#
+# 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
+#
+#java.rt=
diff --git a/eclipse-build/build.properties b/eclipse-build/build.properties
index c7eb348..e5f3124 100644
--- a/eclipse-build/build.properties
+++ b/eclipse-build/build.properties
@@ -3,7 +3,7 @@
#* others. All Rights Reserved. *
#*******************************************************************************
icu4j.plugin.impl.version.string=52.1.0
-copyright.eclipse=Licensed Materials - Property of IBM \n (C) Copyright IBM Corp. 2000, 2013. All Rights Reserved. \n IBM is a registered trademark of IBM Corp.
+copyright.eclipse=Licensed Materials - Property of IBM \n (C) Copyright IBM Corp. 2000, 2014. All Rights Reserved. \n IBM is a registered trademark of IBM Corp.
icu4j.data.version.number=52
-icu4j.eclipse.build.version.string=52.1.0.v20140212
+icu4j.eclipse.build.version.string=52.1.0.v20140218
diff --git a/eclipse-build/build.xml b/eclipse-build/build.xml
index 137c6ab..a9ef2cb 100644
--- a/eclipse-build/build.xml
+++ b/eclipse-build/build.xml
@@ -1,13 +1,14 @@
<!--
/*
*******************************************************************************
-* Copyright (C) 2010-2012, 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>
diff --git a/eclipse-build/misc/about_icu.html b/eclipse-build/misc/about_icu.html
index ff5c450..39454e0 100644
--- a/eclipse-build/misc/about_icu.html
+++ b/eclipse-build/misc/about_icu.html
@@ -8,7 +8,7 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>February 12, 2014</p>
+<p>February 18, 2014</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
@@ -31,7 +31,7 @@
for informational purposes only, and you should look to the Redistributor's license for
terms and conditions of use.</p>
- <p><strong>ICU4J 52.1.0.v20140212 plug-in</strong> <br/><br/>
+ <p><strong>ICU4J 52.1.0.v20140218 plug-in</strong> <br/><br/>
The plug-in includes software ("ICU4J") developed by International Business Machines
Corporation and others.
<br/><br/>
diff --git a/eclipse-build/misc/about_icu_base.html b/eclipse-build/misc/about_icu_base.html
index 4ed77c4..dc7da4c 100644
--- a/eclipse-build/misc/about_icu_base.html
+++ b/eclipse-build/misc/about_icu_base.html
@@ -8,7 +8,7 @@
<body lang="EN-US">
<h2>About This Content</h2>
-<p>February 12, 2014</p>
+<p>February 18, 2014</p>
<h3>License</h3>
<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
@@ -31,7 +31,7 @@
for informational purposes only, and you should look to the Redistributor's license for
terms and conditions of use.</p>
- <p><strong>ICU4J 52.1.0.v20140212 base plug-in</strong> <br/><br/>
+ <p><strong>ICU4J 52.1.0.v20140218 base plug-in</strong> <br/><br/>
The plug-in includes software ("ICU4J") developed by International Business Machines
Corporation and others.
<br/><br/>
diff --git a/eclipse-build/pdebuild/build.properties b/eclipse-build/pdebuild/build.properties
index e66e851..a1b1084 100644
--- a/eclipse-build/pdebuild/build.properties
+++ b/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 @@
#J2SE-1.3=
#J2SE-1.4=
#J2SE-1.5=
+J2SE-1.5=@JAVA_RT@
#JavaSE-1.6=
#PersonalJava-1.1=
#PersonalJava-1.2=
diff --git a/readme.html b/readme.html
index df89336..c4e6705 100644
--- a/readme.html
+++ b/readme.html
@@ -15,7 +15,7 @@
link="#0000ff" vlink="#800080">
<h2>International Components for Unicode for Java (ICU4J)</h2>
<h3>Read Me for ICU4J 52</h3>
-(Last Update: 2014-Feb-12)
+(Last Update: 2014-Feb-18)
<hr size="2" width="100%">
<p><b>Note:</b> This is major release of ICU4J. It contains bug fixes and adds implementations
