harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r939663 - in /harmony/enhanced/java/trunk/classlib: depends/oss/ depends/oss/zlib_1.2.3.zip modules/archive/build.xml modules/archive/make/depends.properties
Date Fri, 30 Apr 2010 13:31:54 GMT
Author: hindessm
Date: Fri Apr 30 13:31:54 2010
New Revision: 939663

URL: http://svn.apache.org/viewvc?rev=939663&view=rev
Log:
Upgrade to zlib 1.2.5.  The zconf.h modification for zos is no longer
required so an unmodified zlib download can be used.

Added:
    harmony/enhanced/java/trunk/classlib/modules/archive/make/depends.properties   (with props)
Removed:
    harmony/enhanced/java/trunk/classlib/depends/oss/zlib_1.2.3.zip
Modified:
    harmony/enhanced/java/trunk/classlib/depends/oss/   (props changed)
    harmony/enhanced/java/trunk/classlib/modules/archive/build.xml

Propchange: harmony/enhanced/java/trunk/classlib/depends/oss/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Apr 30 13:31:54 2010
@@ -1,2 +1,3 @@
 findbugs-1.3.9
 fdlibm-5.3
+zlib-1.2.5

Modified: harmony/enhanced/java/trunk/classlib/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/archive/build.xml?rev=939663&r1=939662&r2=939663&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/archive/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/modules/archive/build.xml Fri Apr 30 13:31:54 2010
@@ -23,15 +23,25 @@
     <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 file="make/depends.properties" />
 
-    <property name="zlib.zip" location="${depends.oss}/zlib_1.2.3.zip" />
-
-    <target name="build" depends="compile-java, build-jar" />
+    <target name="build" depends="check-depends,compile-java, build-jar" />
     
     <target name="clean" depends="clean-java,clean-native,clean-test" />
 
+    <target name="check-depends" unless="hy.skip.zlib">
+        <check-one-file src="${zlib.url}" dest="${zlib.tar}" />
+    </target>
+
+    <target name="fetch-depends" unless="hy.skip.zlib">
+        <mkdir dir="${zlib.dir}" />
+        <download-one-file src="${zlib.url}" dest="${zlib.tar}"
+                           md5="${zlib.md5}" />
+    </target>
+
     <target name="copy-native-includes"
             depends="overlay-oss, copy-zipsup-include, copy-zlib-include" />
 
@@ -56,15 +66,24 @@
             depends="-extract-props,-unzip-oss,-ascii2ebcdic-conversion"
             unless="hy.skip.zlib" />
 
-    <target name="-extract-props">
-        <uptodate property="zlib.uptodate"
-                  srcfile="${zlib.zip}"
+    <target name="-extract-props" unless="hy.skip.zlib">
+        <uptodate property="zlib.extracted"
+                  srcfile="${zlib.tar}"
                   targetfile="src/main/native/zlib_dist/README" />
+        <condition property="zlib.uptodate" value="true">
+            <or>
+                <isset property="hy.skip.zlib" />
+                <isset property="zlib.extracted" />
+            </or>
+        </condition>
     </target>
 
     <target name="-unzip-oss" unless="zlib.uptodate">
         <mkdir dir="src/main/native/zlib_dist" />
-        <unzip src="${zlib.zip}" dest="src/main/native/zlib_dist" />
+        <untar src="${zlib.tar}" dest="src/main/native/zlib_dist"
+               compression="gzip">
+            <mapper type="flatten"/>
+        </untar>
         <chmod dir="src/main/native/zlib_dist" perm="ugo+r" />
         <touch file="src/main/native/zlib_dist/README" />
     </target>
@@ -82,7 +101,8 @@
                 <exclude name="**/*.o" />
             </fileset>               
         </copy>
-        <fixcrlf srcdir="src/main/native/zlib_dist" includes="**/*"  excludes="**/*.o"
eol="unix" />
+        <fixcrlf srcdir="src/main/native/zlib_dist"
+                 includes="**/*" excludes="**/*.o" eol="unix" />
         <delete dir="src/main/native/zlib_dist_ascii" />
     </target>
     

Added: harmony/enhanced/java/trunk/classlib/modules/archive/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/archive/make/depends.properties?rev=939663&view=auto
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/archive/make/depends.properties (added)
+++ harmony/enhanced/java/trunk/classlib/modules/archive/make/depends.properties Fri Apr 30
13:31:54 2010
@@ -0,0 +1,26 @@
+# 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.
+
+depends.dir=depends
+
+# ZLIB, version 1.2.5 or above
+# http://www.zlib.net/
+zlib.ver=1.2.5
+zlib.md5=c735eab2d659a96e5a594c9e8541ad63
+zlib.basename=zlib-${zlib.ver}
+zlib.dir=${depends.dir}/oss/${zlib.basename}
+zlib.tarname=zlib-${zlib.ver}.tar.gz
+zlib.tar=${zlib.dir}/${zlib.tarname}
+zlib.url=http://zlib.net/${zlib.tarname}

Propchange: harmony/enhanced/java/trunk/classlib/modules/archive/make/depends.properties
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message