You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2008/02/06 16:31:14 UTC
svn commit: r619022 - in /harmony/enhanced/classlib/trunk: depends/files/
make/ make/linux.ia64/ make/linux.ppc32/ make/linux.ppc64/
make/linux.x86.libstdc++6/ make/linux.x86/ make/linux.x86_64.libstdc++6/
make/linux.x86_64/ make/windows.x86/ make/wind...
Author: hindessm
Date: Wed Feb 6 07:31:07 2008
New Revision: 619022
URL: http://svn.apache.org/viewvc?rev=619022&view=rev
Log:
DRLVM no longer reaches in to classlib to get ICU4C libraries so these are
(almost) not needed. A simple stub for the ICU4JNI dll remains because
the IBM VME is currently hardcoded to load it. Obviously this hack can
be removed when the IBM VME is next updated.
Added:
harmony/enhanced/classlib/trunk/depends/files/libhyempty.so (with props)
Removed:
harmony/enhanced/classlib/trunk/make/linux.ia64/
harmony/enhanced/classlib/trunk/make/linux.ppc32/
harmony/enhanced/classlib/trunk/make/linux.ppc64/
harmony/enhanced/classlib/trunk/make/linux.x86/
harmony/enhanced/classlib/trunk/make/linux.x86.libstdc++6/
harmony/enhanced/classlib/trunk/make/linux.x86_64/
harmony/enhanced/classlib/trunk/make/linux.x86_64.libstdc++6/
harmony/enhanced/classlib/trunk/make/windows.x86/
harmony/enhanced/classlib/trunk/make/windows.x86_64/
Modified:
harmony/enhanced/classlib/trunk/make/build-native.xml
harmony/enhanced/classlib/trunk/make/depends.properties
harmony/enhanced/classlib/trunk/make/depends.xml
Added: harmony/enhanced/classlib/trunk/depends/files/libhyempty.so
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/files/libhyempty.so?rev=619022&view=auto
==============================================================================
Binary file - no diff available.
Propchange: harmony/enhanced/classlib/trunk/depends/files/libhyempty.so
------------------------------------------------------------------------------
svn:executable = *
Propchange: harmony/enhanced/classlib/trunk/depends/files/libhyempty.so
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: harmony/enhanced/classlib/trunk/make/build-native.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-native.xml?rev=619022&r1=619021&r2=619022&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-native.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-native.xml Wed Feb 6 07:31:07 2008
@@ -36,6 +36,12 @@
<property name="depends.libs" location="depends/libs/${hy.platform}" />
<property name="depends.files" location="depends/files" />
<property name="native.lib.target" location="${hy.hdk}/lib" />
+ <condition property="needs.vme.v3.hack" value="true">
+ <or>
+ <equals arg1="${hy.platform}" arg2="windows.x86" />
+ <equals arg1="${hy.platform}" arg2="linux.x86" />
+ </or>
+ </condition>
<!-- =================================
target: default
@@ -108,7 +114,7 @@
<!-- =================================
target: layout
================================= -->
- <target name="layout" depends="-layout.windows,-layout.linklib"
+ <target name="layout" depends="-layout.windows,-layout.vme.v3.hack"
description="Construct the correct directory structure for native binaries">
<!-- Create the target directory structure -->
@@ -123,11 +129,6 @@
</fileset>
</copy>
- <!-- Copy across dependency shared libs -->
- <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
- <fileset dir="${icudll.dir}" includes="*${shlib.suffix}*" />
- </copy>
-
</target>
<target name="-layout.windows" if="is.windows"
@@ -137,11 +138,19 @@
<copy file="${msvcp.dll}" todir="${hy.jdk}/jre/bin" overwrite="yes" />
</target>
- <target name="-layout.linklib" unless="shlib.is.linklib">
- <!-- on windows copy .lib files and on z/OS copy across .x files
- to link against -->
- <copy todir="${hy.hdk}/lib" overwrite="yes">
- <fileset dir="${icudll.dir}" includes="*${linklib.suffix}*" />
+ <target name="-layout.vme.v3.hack" if="needs.vme.v3.hack">
+ <echo>Deploying empty ICU dynamic library stub</echo>
+ <copy todir="${hy.jdk}/jre/bin" verbose="true">
+ <fileset dir="${depends.files}">
+ <include name="hyempty.dll" if="is.windows" />
+ </fileset>
+ <globmapper from="*hyempty.dll" to="*ICUInterface34.dll" />
+ </copy>
+ <copy todir="${hy.jdk}/jre/bin" verbose="true">
+ <fileset dir="${depends.files}">
+ <include name="libhyempty.so" if="is.linux" />
+ </fileset>
+ <globmapper from="*libhyempty.so" to="*libICUInterface34.so" />
</copy>
</target>
@@ -169,10 +178,6 @@
<ant dir="modules/archive" antfile="build.xml"
target="overlay-oss" />
-
- <mkdir dir="${hy.hdk}/include/icu4c/unicode" />
- <unzip src="${icuhdr.zip}" dest="${hy.hdk}/include/icu4c/unicode" />
- <chmod dir="${hy.hdk}/include/icu4c/unicode" perm="ugo+r" />
</target>
<!-- =================================
@@ -238,7 +243,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>
Modified: harmony/enhanced/classlib/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.properties?rev=619022&r1=619021&r2=619022&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ harmony/enhanced/classlib/trunk/make/depends.properties Wed Feb 6 07:31:07 2008
@@ -135,10 +135,6 @@
derby.md5=f28d6047ab26445de53c4c96126494df
depends.url=http://svn.apache.org/repos/asf/harmony/standard/depends
-icudll.dir=${depends.dir}/libs/${hy.platform.variant}/icu-3.4
-icudll.zip=${depends.dir}/libs/${hy.platform.variant}/icu-3.4/icu-3.4.zip
-icudll.url=${depends.url}/libs/${hy.platform.variant}/icu-3.4.zip
-icuhdr.zip=${depends.dir}/oss/icu4c-3.4-harmony-includes.zip
bcprov.ver=bcprov-jdk15-138
bcprov.dir=${depends.jars}/${bcprov.ver}
Modified: harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.xml?rev=619022&r1=619021&r2=619022&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ harmony/enhanced/classlib/trunk/make/depends.xml Wed Feb 6 07:31:07 2008
@@ -26,7 +26,6 @@
</description>
<import file="${basedir}/make/properties.xml" />
- <property file="make/${hy.platform.variant}/depends.properties" />
<property file="make/depends.properties" />
<target name="check" description="Check whether dependencies are available"
@@ -48,7 +47,6 @@
<check-one-file src="${servlet-api.url}" dest="${servlet-api.jar}" />
<check-one-file src="${dejavu-fonts.url}" dest="${dejavu-fonts.zip}" />
<check-one-file src="${derby.url}" dest="${derby.jar}" />
- <check-one-file src="${icudll.url}" dest="${icudll.zip}" />
</target>
<target name="-check-win" if="is.windows" depends="-really-check-win" />
@@ -107,29 +105,8 @@
<antcall target="-awt-tar-extract" />
</target>
- <target name="-temporary-warning" if="is.windows">
- <!-- TODO: Remove this target in a week or two or when we
- update to icu4c 3.8
- -->
- <condition property="windows.warn">
- <not><available file="${icudll.dir}/icuuc.lib" /></not>
- </condition>
- <fail if="windows.warn">
-...
-
-
-Please remove the directory:
-
- ${icudll.dir}
-
-and re-run "ant fetch-depends" to get a new version of icu-3.4.zip. Sorry
-for the inconvinience.
-
- </fail>
- </target>
-
<target name="-extract"
- depends="-extract-props,-extract-mx4j,-extract-dejavu-fonts,-extract-xerces,-extract-icudlls,-temporary-warning" />
+ depends="-extract-props,-extract-mx4j,-extract-dejavu-fonts,-extract-xerces" />
<target name="-extract-props">
<uptodate property="dejavu-fonts.uptodate"
@@ -141,10 +118,6 @@
<uptodate property="xerces.uptodate"
srcfile="${xerces.zip}"
targetfile="${xerces.dir}/xercesImpl.jar" />
- <uptodate property="icudlls.uptodate"
- srcfile="${icudll.zip}"
- targetfile="${icudll.dir}/uptodate" />
-
</target>
@@ -191,11 +164,6 @@
<touch file="${xerces.dir}/xercesImpl.jar" />
</target>
- <target name="-extract-icudlls" unless="icudlls.uptodate">
- <unzip src="${icudll.zip}" dest="${icudll.dir}" />
- <touch file="${icudll.dir}/uptodate" />
- </target>
-
<!--
* FIXME : the following awful little hack is because we noticed that for whatever
* reason, we can't link with libjpg.a et al on at least to kinds of 64-bit linux
@@ -424,10 +392,6 @@
<download-one-file src="${derby.url}"
dest="${derby.jar}"
md5="${derby.md5}" />
- <mkdir dir="${icudll.dir}" />
- <download-one-file src="${icudll.url}"
- dest="${icudll.zip}"
- md5="${icudll.md5}" />
</target>
<target name="-download-win" if="is.windows" depends="-select-win-deps-x86_64,-select-win-deps-x86">