No objections, so patch applied and icu4c header zips removed at repo
revision r594206.
Regards,
Oliver
Oliver Deakin wrote:
Hi all,
I noticed that the icu4c header files are still being unpacked into
deploy/include by the classlib build-native.xml "overlay-oss" target.
This is no longer necessary for classlib, so I was going to remove
these lines and also the archived header files in depends/oss [1].
Before I do this, I just wanted to check that they are not required by
DRLVM. Does anyone object to their removal?
Regards,
Oliver
[1]
Index: build-native.xml
===================================================================
--- build-native.xml (revision 593110)
+++ build-native.xml (working copy)
@@ -160,26 +160,12 @@
<!-- =================================
target: overlay-oss
================================= -->
- <condition property="iculib.zip"
- value="${depends.oss}/icu4c-3.4-harmony-windows.x86_64.zip"
- else="${depends.oss}/icu4c-3.4-harmony.zip">
- <and>
- <isset property="is.windows"/>
- <isset property="is.x86_64"/>
- </and>
- </condition>
-
<target name="overlay-oss">
<ant dir="modules/luni" antfile="build.xml"
target="overlay-oss" />
<ant dir="modules/archive" antfile="build.xml"
target="overlay-oss" /> - - <mkdir
dir="${hy.hdk}/include/icu4c/unicode" />
- <unzip src="${iculib.zip}"
dest="${hy.hdk}/include/icu4c/unicode" />
- <chmod dir="${hy.hdk}/include/icu4c/unicode" perm="ugo+r" />
- <copy file="${hy.hdk}/include/icu4c/unicode/icuuc.lib"
todir="${native.lib.target}" overwrite="yes"/>
</target>
<!-- =================================
@@ -245,7 +231,6 @@
target="clean-overlay-oss" />
<ant dir="modules/archive" antfile="build.xml"
target="clean-overlay-oss" />
- <delete dir="${hy.hdk}/include/icu4c" quiet="true" />
</target>
</project>
--
Oliver Deakin
Unless stated otherwise above:
IBM United Kingdom Limited - Registered in England and Wales with number 741598.
Registered office: PO Box 41, North Harbour, Portsmouth, Hampshire PO6 3AU
