harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r390172 - in /incubator/harmony/enhanced/classlib/trunk: depends/libs/win.IA32/msvcr71.dll make/depends.properties make/depends.xml make/properties.xml
Date Thu, 30 Mar 2006 16:45:33 GMT
Author: tellison
Date: Thu Mar 30 08:45:30 2006
New Revision: 390172

URL: http://svn.apache.org/viewcvs?rev=390172&view=rev
Log:
Apply patch HARMONY-282 (download msvcr71.dll rather than distributing it)

Added:
    incubator/harmony/enhanced/classlib/trunk/make/properties.xml
Removed:
    incubator/harmony/enhanced/classlib/trunk/depends/libs/win.IA32/msvcr71.dll
Modified:
    incubator/harmony/enhanced/classlib/trunk/make/depends.properties
    incubator/harmony/enhanced/classlib/trunk/make/depends.xml

Modified: incubator/harmony/enhanced/classlib/trunk/make/depends.properties
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/depends.properties?rev=390172&r1=390171&r2=390172&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/depends.properties Thu Mar 30 08:45:30
2006
@@ -49,3 +49,8 @@
 signed.bcprov.jar=${bcprov.dir}/signed.bcprov.jar
 signed.bcprov.md5=a0c7889452d8b1ab430c1c4404358ef0
 bcprov.url=http://www.bouncycastle.org/download/bcprov-jdk14-131.jar
+
+msvcr71.dir=${depends.dir}/libs/win.IA32
+msvcr71.dll=${msvcr71.dir}/msvcr71.dll
+msvcr71.url=http://www.dlldump.com/cgi-bin/testwrap/downloadcounts.cgi?rt=count&path=dllfiles/M/MSVCR71.dll
+msvcr71.md5=86f1895ae8c5e8b17d99ece768a70732

Modified: incubator/harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/depends.xml?rev=390172&r1=390171&r2=390172&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/depends.xml Thu Mar 30 08:45:30 2006
@@ -20,151 +20,150 @@
  -->
 
 <project name="dependencies" default="check" basedir="..">
-	<description>
+    <description>
     Confirm that dependencies are present and fetch missing dependencies
     where possible.
-	</description>
+    </description>
 
-	<property file="make/depends.properties" />
+    <property file="make/depends.properties" />
+    <import file="${basedir}/make/properties.xml" />
 
-	<target name="check">
+    <target name="check">
 
-		<antcall target="check-one-jar">
-			<param name="src" value="${xalan.url}" />
-			<param name="dest" value="${xalan.jar}" />
-		</antcall>
-
-		<antcall target="check-one-jar">
-			<param name="src" value="${resolver.url}" />
-			<param name="dest" value="${resolver.jar}" />
-		</antcall>
-
-		<antcall target="check-one-jar">
-			<param name="src" value="${xerces.impl.url}" />
-			<param name="dest" value="${xerces.impl.jar}" />
-		</antcall>
-
-		<antcall target="check-one-jar">
-			<param name="src" value="${xml.apis.url}" />
-			<param name="dest" value="${xml.apis.jar}" />
-		</antcall>
-
-		<antcall target="check-one-jar">
-			<param name="src" value="${junit.url}" />
-			<param name="dest" value="${junit.jar}" />
-		</antcall>
-
-		<antcall target="check-one-jar">
-			<param name="src" value="${bcprov.url}" />
-			<param name="dest" value="${signed.bcprov.jar}" />
-		</antcall>
-		<uptodate property="bcprov.uptodate" srcfile="${signed.bcprov.jar}" targetfile="${bcprov.jar}"
/>
-		<antcall target="create-unsigned-bcprov-jar" />
-	</target>
-
-	<target name="download" description="Download required jars">
-
-		<mkdir dir="${xalan.dir}" />
-		<antcall target="download-one-jar">
-			<param name="src" value="${xalan.url}" />
-			<param name="dest" value="${xalan.jar}" />
-                        <param name="md5" value="${xalan.md5}" />
-		</antcall>
-
-		<mkdir dir="${xerces.dir}" />
-		<antcall target="download-one-jar">
-			<param name="src" value="${resolver.url}" />
-			<param name="dest" value="${resolver.jar}" />
-                        <param name="md5" value="${resolver.md5}" />
-		</antcall>
-
-		<antcall target="download-one-jar">
-			<param name="src" value="${xerces.impl.url}" />
-			<param name="dest" value="${xerces.impl.jar}" />
-                        <param name="md5" value="${xerces.impl.md5}" />
-		</antcall>
-
-		<antcall target="download-one-jar">
-			<param name="src" value="${xml.apis.url}" />
-			<param name="dest" value="${xml.apis.jar}" />
-                        <param name="md5" value="${xml.apis.md5}" />
-		</antcall>
-
-		<mkdir dir="${junit.dir}" />
-		<antcall target="download-one-jar">
-			<param name="src" value="${junit.url}" />
-			<param name="dest" value="${junit.jar}" />
-                        <param name="md5" value="${junit.md5}" />
-		</antcall>
-
-		<mkdir dir="${bcprov.dir}" />
-		<antcall target="download-one-jar">
-			<param name="src" value="${bcprov.url}" />
-			<param name="dest" value="${signed.bcprov.jar}" />
-                        <param name="md5" value="${signed.bcprov.md5}" />
-		</antcall>
-	</target>
-
-	<target name="download-one-jar">
-		<get src="${src}" dest="${dest}" usetimestamp="true"
-                     verbose="true" />
-                <checksum file="${dest}" property="new.md5" />
-                <condition property="md5.verified" value="true">
-                        <equals arg1="${new.md5}"
-                                arg2="${md5}" />
-                </condition>
-                <antcall target="remove-bad-jar">
-                        <param name="jar" value="${dest}" />
-                </antcall>
-		<fail unless="md5.verified">
+	<check-one-file src="${xalan.url}" dest="${xalan.jar}" />
+
+	<check-one-file src="${resolver.url}" dest="${resolver.jar}" />
+
+	<check-one-file src="${xerces.impl.url}" dest="${xerces.impl.jar}" />
+
+	<check-one-file src="${xml.apis.url}" dest="${xml.apis.jar}" />
+
+	<check-one-file src="${junit.url}" dest="${junit.jar}" />
+
+	<check-one-file src="${bcprov.url}" dest="${signed.bcprov.jar}" />
+
+	<uptodate property="bcprov.uptodate"
+                  srcfile="${signed.bcprov.jar}"
+                  targetfile="${bcprov.jar}" />
+	<antcall target="create-unsigned-bcprov-jar" />
+
+        <antcall target="check-win" />
+
+    </target>
+
+    <target name="check-win" if="is.windows">
+        
+	<check-one-file src="${msvcr71.url}" dest="${msvcr71.dll}" />
+
+    </target>
+
+    <target name="download" description="Download required jars">
+
+	<mkdir dir="${xalan.dir}" />
+	<download-one-file src="${xalan.url}" dest="${xalan.jar}"
+                           md5="${xalan.md5}" />
+
+	<mkdir dir="${xerces.dir}" />
+	<download-one-file src="${resolver.url}" dest="${resolver.jar}"
+                           md5="${resolver.md5}" />
+
+	<download-one-file src="${xerces.impl.url}" dest="${xerces.impl.jar}"
+                           md5="${xerces.impl.md5}" />
+
+	<download-one-file src="${xml.apis.url}" dest="${xml.apis.jar}"
+                           md5="${xml.apis.md5}" />
+
+	<mkdir dir="${junit.dir}" />
+	<download-one-file src="${junit.url}" dest="${junit.jar}"
+                           md5="${junit.md5}" />
+
+	<mkdir dir="${bcprov.dir}" />
+	<download-one-file src="${bcprov.url}" dest="${signed.bcprov.jar}"
+                           md5="${signed.bcprov.md5}" />
+
+        <antcall target="download-win" />
+
+    </target>
+
+    <target name="download-win" if="is.windows">
+        
+	<download-one-file src="${msvcr71.url}" dest="${msvcr71.dll}"
+                           md5="${msvcr71.md5}" />
+
+    </target>
+
+    <macrodef name="download-one-file">
+        <attribute name="src" />
+        <attribute name="dest" />
+        <attribute name="md5" />
+        <sequential>
+            <echo>Fetching @{dest}</echo>
+	    <get src="@{src}" dest="@{dest}" usetimestamp="true"
+                 verbose="true" />
+            <checksum file="@{dest}" property="new.md5" />
+            <condition property="md5.verified" value="true">
+                <equals arg1="${new.md5}" arg2="@{md5}" />
+            </condition>
+            <antcall target="remove-file-if-bad">
+                <param name="jar" value="@{dest}" />
+            </antcall>
+	    <fail unless="md5.verified">
 ...
 
-File ${dest} has incorrect md5 checksum.  Expected:
-  ${md5}
+File @{dest} has incorrect md5 checksum.  Expected:
+  @{md5}
 found:
   ${new.md5}
 
-                </fail>
-                <echo>Checksum verified (${md5.verified})</echo>
-	</target>
-
-        <target name="remove-bad-jar" unless="md5.verified">
-                <delete file="${dest}" />
-        </target>
-
-	<target name="check-one-jar">
-		<available file="${dest}" type="file"
-                           property="${dest}.exists" />
-		<fail>
-			<condition>
-				<not>
-					<isset property="${dest}.exists" />
-				</not>
-			</condition>
+            </fail>
+            <echo>Checksum verified (${md5.verified})</echo>
+        </sequential>
+    </macrodef>
+
+    <target name="remove-file-if-bad" unless="md5.verified">
+        <delete file="${dest}" />
+    </target>
+
+    <macrodef name="check-one-file">
+        <attribute name="src" />
+        <attribute name="dest" />
+        <sequential>
+            <echo>Checking for @{dest}</echo>
+	    <available file="@{dest}" type="file"
+                       property="@{dest}.exists" />
+	    <fail>
+		<condition>
+		    <not>
+			<isset property="@{dest}.exists" />
+		    </not>
+		</condition>
 ...
 
 Missing dependency.  The jar from:
 
-  ${src}
+  @{src}
 
 should be downloaded to:
 
-  ${dest}
+  @{dest}
 
-Run  "ant -f make/depends.xml download"  to automatically fetch dependencies.
-Note: Some of Harmony's dependencies are licensed under terms other than the ASLv2.
-</fail>
-	</target>
-
-	<target name="create-unsigned-bcprov-jar" unless="bcprov.uptodate">
-		<delete dir="${bcprov.dir}/temp" />
-		<unzip src="${signed.bcprov.jar}" dest="${bcprov.dir}/temp">
-			<patternset>
-				<exclude name="META-INF/BCKEY.SF" />
-			</patternset>
-		</unzip>
-		<jar destfile="${bcprov.jar}" basedir="${bcprov.dir}/temp"
-          manifest="${bcprov.dir}/temp/META-INF/MANIFEST.MF" />
-		<delete dir="${bcprov.dir}/temp" />
-	</target>
+Run "ant -f make/depends.xml download" to automatically fetch
+dependencies.  Note: Some of Harmony's dependencies are licensed under
+terms other than the ASLv2.
+            </fail>
+        </sequential>
+    </macrodef>
+
+    <target name="create-unsigned-bcprov-jar" unless="bcprov.uptodate">
+        <echo>Removing signature from bcprov.jar</echo>
+	<delete dir="${bcprov.dir}/temp" />
+	<unzip src="${signed.bcprov.jar}" dest="${bcprov.dir}/temp">
+	    <patternset>
+		<exclude name="META-INF/BCKEY.SF" />
+	    </patternset>
+	</unzip>
+	<jar destfile="${bcprov.jar}" basedir="${bcprov.dir}/temp"
+             manifest="${bcprov.dir}/temp/META-INF/MANIFEST.MF" />
+	<delete dir="${bcprov.dir}/temp" />
+    </target>
 </project>

Added: incubator/harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/properties.xml?rev=390172&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/properties.xml (added)
+++ incubator/harmony/enhanced/classlib/trunk/make/properties.xml Thu Mar 30 08:45:30 2006
@@ -0,0 +1,136 @@
+<!--
+
+  Copyright 2006 The Apache Software Foundation or its
+  licensors, as applicable
+
+  Licensed 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.
+
+ -->
+
+<project name="Common Platform definitions" default="echo" basedir="..">
+
+    <!-- Conditions for operating systems -->
+    <condition property="is.windows">
+        <os family="Windows" />
+    </condition>
+    <condition property="is.linux">
+        <os name="linux" />
+    </condition>
+    <condition property="is.unix">
+        <os family="unix" />
+    </condition>
+
+    <!-- Normalized operating system name -->
+
+    <!-- this special case makes sense -->
+    <condition property="hy.os" value="windows">
+        <isset property="is.windows"/>
+    </condition>
+    <condition property="hy.os" value="linux">
+        <os name="linux" />
+    </condition>
+
+    <property name="hy.os" value="${os.name}" />
+
+
+
+    <!-- Conditions for different architectures -->
+    <condition property="is.x86_64">
+        <os arch="x86_64"/>
+    </condition>
+    <condition property="is.x86">
+        <os arch="x86"/>
+    </condition>
+    <condition property="is.ia64">
+        <os arch="ia64" />
+    </condition>
+    <condition property="is.64bit">
+        <or>
+            <os arch="ia64" />
+            <os arch="x86_64"/>
+        </or>
+    </condition>
+    <condition property="is.32bit">
+        <or>
+            <os arch="x86"/>
+        </or>
+    </condition>
+    <condition property="hy.bits" value="32">
+        <isset property="is.32bit" />
+    </condition>
+    <property name="hy.bits" value="64" />
+
+    <!-- Normalized architecture name -->
+    <property name="hy.arch" value="${os.arch}" />
+
+    <!-- Normalized platform name -->
+    <property name="hy.platform" value="${hy.os}.${hy.arch}"/>
+    <property name="hy.platform.path" value="${hy.os}/${hy.arch}"/>
+
+    <condition property="exe.suffix" value=".exe">
+        <isset property="is.windows"/>
+    </condition>
+    <property name="exe.suffix" value="" />
+
+    <condition property="shlib.suffix" value=".dll">
+        <isset property="is.windows"/>
+    </condition>
+    <property name="shlib.suffix" value=".so" />
+
+    <target name="echo" depends="svn-prop" >
+        <echo>
+
+  hy.os = ${hy.os}
+  hy.arch = ${hy.arch}
+  hy.bits = ${hy.bits}
+  hy.platform = ${hy.platform}
+  hy.platform.path = ${hy.platform.path}
+
+  is.windows = ${is.windows}
+  is.unix = ${is.unix}
+  is.linux = ${is.linux}
+  is.32bit = ${is.32bit}
+  is.64bit = ${is.64bit}
+  is.x86 = ${is.x86}
+  is.x86_64 = ${is.x86_64}
+  is.ia64 = ${is.ia64}
+
+  svn.revision = ${svn.revision}
+
+  exe.suffix = ${exe.suffix}
+  shlib.suffix = ${shlib.suffix}
+
+  os.name = ${os.name}
+  os.arch = ${os.arch}
+
+        </echo>
+    </target>
+
+    <target name="svn-prop">
+        <exec executable="svn">
+            <arg value="--non-interactive" />
+            <arg value="info" />
+            <redirector outputproperty="svn.revision">
+                <outputfilterchain>
+                    <linecontains>
+                        <contains value="Revision: " />
+                    </linecontains>
+                    <tokenfilter>
+                        <replacestring from="Revision: " to=""/>
+                    </tokenfilter>
+                </outputfilterchain>
+            </redirector>
+        </exec>
+    </target>
+
+</project>



Mime
View raw message