From d37611215518dfb32737de0dd128ab790d4c1726 Mon Sep 17 00:00:00 2001
From: Yoshito Umaoka <y.umaoka@gmail.com>
Date: Thu, 9 Oct 2014 07:28:33 +0000
Subject: [PATCH] ICU-11326 Updated build scripts to use bootclasspath option
 when compiling ICU4J library classes. Also updated build.xml to print out
 warning message when build environment is not properly configured for
 release.

X-SVN-Rev: 36655
---
 icu4j/build.xml                              | 35 ++++++++++++++++++++
 icu4j/main/shared/build/common-targets.xml   | 20 +++++++++++
 icu4j/main/shared/build/locations.properties |  3 ++
 3 files changed, 58 insertions(+)

diff --git a/icu4j/build.xml b/icu4j/build.xml
index 694827d3638..26eb2ac410d 100644
--- a/icu4j/build.xml
+++ b/icu4j/build.xml
@@ -425,6 +425,35 @@
 
 
     <!-- release targets -->
+    <target name="_check_config_for_release">
+        <condition property="release.build.config.ok">
+            <and>
+                <isset property="java5.bootclasspath"/>
+                <isset property="java6.bootclasspath"/>
+                <isset property="jcite.libs"/>
+            </and>
+        </condition>
+    </target>
+
+    <target name="_verify_config_for_release" depends="_check_config_for_release" unless="release.build.config.ok">
+        <condition property="disp.java5.bootclasspath" value="${java5.bootclasspath}" else="Not Defined!">
+            <isset property="java5.bootclasspath"/>
+        </condition>
+        <condition property="disp.java6.bootclasspath" value="${java5.bootclasspath}" else="Not Defined!">
+            <isset property="java6.bootclasspath"/>
+        </condition>
+        <condition property="disp.jcite.libs" value="${jcite.libs}" else="Not Defined!">
+            <isset property="jcite.libs"/>
+        </condition>
+
+        <echo message="################################################################"/>
+        <echo message="[WARNING] Insufficient Build Configuration for ICU4J Release"/>
+        <echo message="JRE 5 System Library Path:      ${disp.java5.bootclasspath}"/>
+        <echo message="JRE 6 System Library Path:      ${disp.java6.bootclasspath}"/>
+        <echo message="JCite Library Path:             ${disp.jcite.libs}"/>
+        <echo message="################################################################"/>
+    </target>
+
     <target name="releaseVer" depends="info, releaseBinaries, releaseSrcJars, releaseDocs, releaseSourceArchiveTgz"
             description="Build all ICU4J release files for distribution with versioned file names">
         <!-- binaries -->
@@ -460,6 +489,8 @@
                 <fixcrlf eol="lf"/>
             </filterchain>
         </concat>
+
+        <antcall target="_verify_config_for_release"/>
     </target>
 
     <target name="release" depends="info, releaseBinaries, releaseSrcJars, releaseDocs, releaseSourceArchiveTgz" description="Build all ICU4J release files for distribution">
@@ -479,6 +510,8 @@
                 <fixcrlf eol="lf"/>
             </filterchain>
         </concat>
+
+        <antcall target="_verify_config_for_release"/>
     </target>
 
     <target name="releaseBinaries" depends="icu4jJar, charset, localespi" description="Build ICU4J binary files for distribution">
@@ -2000,6 +2033,8 @@
             <attach file="${maven.release.dir}/${maven.icu4jdocs.jar.file}" classifier="javadoc"/>
             <attach file="${maven.release.dir}/${maven.icu4jdocs.jar.file}.asc" classifier="javadoc" type="jar.asc"/>
         </deploy>
+
+        <antcall target="_verify_config_for_release"/>
     </target>
 
 </project>
diff --git a/icu4j/main/shared/build/common-targets.xml b/icu4j/main/shared/build/common-targets.xml
index fcac726a882..befa4daaa6a 100644
--- a/icu4j/main/shared/build/common-targets.xml
+++ b/icu4j/main/shared/build/common-targets.xml
@@ -7,6 +7,11 @@
 <project name="common-targets" basedir=".">
     <dirname property="common-targets.dir" file="${ant.file.common-targets}"/>
     <property file="${common-targets.dir}/locations.properties"/>
+
+    <!-- global (top-level) propeties - need locations.properties loaded first -->
+    <property file="${global.build-local.properties}"/>
+    <property file="${global.build.properties}"/>
+
     <property file="${common-targets.dir}/common.properties"/>
     <property environment="env"/>
 
@@ -17,9 +22,23 @@
     </target>
 
     <target name="@compile">
+        <echo message="build-local:     ${global.build-local.properties}"/>
+        <echo message="${java5.bootclasspath}"/>
+        <!-- set java5/6 bootclasspath to empty if not set -->
+        <property name="java5.bootclasspath" value=""/>
+        <property name="java6.bootclasspath" value=""/>
+
+        <condition property="javac.bootclasspath" value="${java5.bootclasspath}">
+            <equals arg1="${javac.target}" arg2="1.5"/>
+        </condition>
+        <condition property="javac.bootclasspath" value="${java6.bootclasspath}" else="">
+            <equals arg1="${javac.target}" arg2="1.6"/>
+        </condition>
+
         <echo message="--- java compiler arguments ------------------------"/>
         <echo message="source dir:     ${basedir}/${src.dir}"/>
         <echo message="output dir:     ${basedir}/${bin.dir}"/>
+        <echo message="bootclasspath:  ${javac.bootclasspath}"/>
         <echo message="classpath:      ${toString:javac.classpathref}"/>
         <echo message="source:         ${javac.source}"/>
         <echo message="target:         ${javac.target}"/>
@@ -32,6 +51,7 @@
         <javac
             srcdir="${src.dir}"
             destdir="${bin.dir}"
+            bootclasspath="${javac.bootclasspath}"
             classpathref="javac.classpathref"
             source="${javac.source}"
             target="${javac.target}"
diff --git a/icu4j/main/shared/build/locations.properties b/icu4j/main/shared/build/locations.properties
index f622b33a73d..c37ac31d3e8 100644
--- a/icu4j/main/shared/build/locations.properties
+++ b/icu4j/main/shared/build/locations.properties
@@ -28,3 +28,6 @@ icu4j.demos.dir = ${shared.dir}/../../demos
 icu4j.samples.dir = ${shared.dir}/../../samples
 
 icu4j.perf-tests.dir = ${shared.dir}/../../perf-tests
+
+global.build.properties = ${shared.dir}/../../build.properties
+global.build-local.properties = ${shared.dir}/../../build-local.properties