Author: regisxu
Date: Wed Mar 10 09:29:34 2010
New Revision: 921268
URL: http://svn.apache.org/viewvc?rev=921268&view=rev
Log:
Apply patch for HARMONY-6460: [classlib][fdlibm]Upgrade fdlibm5.2 to 5.3
Added:
harmony/enhanced/classlib/trunk/modules/luni/make/depends.properties (with props)
Removed:
harmony/enhanced/classlib/trunk/depends/oss/fdlibm_5.2.zip
Modified:
harmony/enhanced/classlib/trunk/LICENSE
harmony/enhanced/classlib/trunk/depends/oss/README.txt
harmony/enhanced/classlib/trunk/modules/luni/build.xml
Modified: harmony/enhanced/classlib/trunk/LICENSE
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/LICENSE?rev=921268&r1=921267&r2=921268&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/LICENSE (original)
+++ harmony/enhanced/classlib/trunk/LICENSE Wed Mar 10 09:29:34 2010
@@ -263,7 +263,7 @@ their respective owners.
-License Notice for FDLIBM version 5.2
+License Notice for FDLIBM version 5.3
=====================================
Copyright (C) 2004 by Sun Microsystems, Inc. All rights reserved.
Modified: harmony/enhanced/classlib/trunk/depends/oss/README.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/oss/README.txt?rev=921268&r1=921267&r2=921268&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/oss/README.txt (original)
+++ harmony/enhanced/classlib/trunk/depends/oss/README.txt Wed Mar 10 09:29:34 2010
@@ -17,13 +17,11 @@ document please refer to the file THIRD_
-FDLIBM version 5.2
+FDLIBM version 5.3
------------------
FDLIBM (Freely Distributable LIBM) is a C math library for supporting IEEE 754
-floating-point arithmetic. File fdlibm_5.2.zip mostly contains the original
-source as downloaded from the FDLIBM home page with the
-exception of a few files whose names clashed with others in Harmony. In the
-zip file these files have all been given the ".orig" suffix.
+floating-point arithmetic. File fdlibm53.tar.gz contains the original source
+as downloaded from the FDLIBM home page.
The official FDLIBM page is located at http://www.netlib.org/fdlibm/
Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=921268&r1=921267&r2=921268&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Wed Mar 10 09:29:34 2010
@@ -21,16 +21,23 @@
<property name="hy.module" value="luni" />
<property name="hy.hdk" location="${basedir}/../../deploy" />
+ <property name="depends.dir" location="${basedir}/../../depends" />
<import file="${hy.hdk}/build/ant/properties.xml" />
+ <import file="${hy.hdk}/build/ant/depends.xml" />
<property file="../../make/depends.properties" />
- <property name="fdlibm.zip" location="${depends.oss}/fdlibm_5.2.zip" />
+ <property name="fdlibm.dist" location="src/main/native/fdlibm_dist"/>
<target name="build" depends="compile-java, build-jar" />
<target name="clean" depends="clean-java,clean-native,clean-test" />
+ <target name="check-depends">
+ <check-one-file src="${fdlibm.url}" dest="${fdlibm.tar}" />
+ </target>
+
+
<target name="copy-native-includes">
<copy todir="${hy.hdk}/include" preservelastmodified="true">
<fileset dir="src/main/native/include">
@@ -112,7 +119,24 @@
<target name="overlay-oss" depends="-unzip-oss,-ascii2ebcdic-conversion" />
<target name="-unzip-oss">
- <unzip src="${fdlibm.zip}" dest="src/main/native/fdlibm_dist" />
+ <untar src="${fdlibm.tar}" compression="gzip" dest="${fdlibm.dist}">
+ <patternset>
+ <exclude name="fdlibm53"/>
+ </patternset>
+ <mapper type="flatten"/>
+ </untar>
+
+ <!-- These files are not used by Harmony, rename them in case misused -->
+ <move todir="${fdlibm.dist}">
+ <fileset dir="${fdlibm.dist}" >
+ <include name="fdlibm.h"/>
+ <include name="s_lib_version.c"/>
+ <include name="configure*"/>
+ <include name="Makefile*"/>
+ </fileset>
+ <mapper type="glob" from="*" to="*.orig" />
+ </move>
+
<chmod dir="src/main/native/fdlibm_dist" perm="ugo+r" />
</target>
@@ -133,6 +157,12 @@
<delete dir="src/main/native/fdlibm_dist_ascii" />
</target>
+ <target name="fetch-depends" >
+ <mkdir dir="${fdlibm.dir}" />
+ <download-one-file src="${fdlibm.url}" dest="${fdlibm.tar}"
+ md5="${fdlibm.md5}" />
+ </target>
+
<target name="test" depends="-test-module">
<fail message="Some tests failed">
<condition>
@@ -282,10 +312,9 @@
</tokenfilter>
</filterchain>
</copy>
-
- <copy file="../../${junit.jar}"
+ <copy file="${junit.jar}"
tofile="${hy.hdk}/build/test/junit.jar" />
- <copy file="../../${jetty.jar}" todir="${hy.hdk}/build/test" />
+ <copy file="${jetty.jar}" todir="${hy.hdk}/build/test" />
</target>
<!-- compile both api tests and impl tests-->
Added: harmony/enhanced/classlib/trunk/modules/luni/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/make/depends.properties?rev=921268&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/make/depends.properties (added)
+++ harmony/enhanced/classlib/trunk/modules/luni/make/depends.properties Wed Mar 10 09:29:34
2010
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+fdlibm.dir=${depends.dir}/oss/fdlibm-5.3
+fdlibm.tar=${fdlibm.dir}/fdlibm53.tar.gz
+fdlibm.url=http://www.validlab.com/software/fdlibm53.tar.gz
+fdlibm.md5=e56ca86c077dee87faf6a2c2cc1c10a5
Propchange: harmony/enhanced/classlib/trunk/modules/luni/make/depends.properties
------------------------------------------------------------------------------
svn:eol-style = native
|