harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r443545 [1/2] - in /incubator/harmony/enhanced/classlib/trunk/make: build-java.xml build-native.xml build-test.xml depends.properties depends.xml properties.xml resources/README-snapshot.txt
Date Fri, 15 Sep 2006 01:43:34 GMT
Author: ndbeyer
Date: Thu Sep 14 18:43:34 2006
New Revision: 443545

URL: http://svn.apache.org/viewvc?view=rev&rev=443545
Log:
Set eol-style = native for make files.

Modified:
    incubator/harmony/enhanced/classlib/trunk/make/build-java.xml   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/make/build-native.xml   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/make/build-test.xml   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/make/depends.properties   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/make/depends.xml   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/make/properties.xml   (contents, props changed)
    incubator/harmony/enhanced/classlib/trunk/make/resources/README-snapshot.txt   (contents, props changed)

Modified: incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build-java.xml?view=diff&rev=443545&r1=443544&r2=443545
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Thu Sep 14 18:43:34 2006
@@ -1,220 +1,220 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Copyright 1998, 2005 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. -->
-
-<!-- ====================================================================== 
-     build-java-source    
-     Compile the Java source and package in component archives.
-     ====================================================================== -->
-<project name="build-java-source" default="default" basedir="..">
-    <description>
-        Compile the Java source and package in component archives.
-    </description>
-
-    <!-- import common properties -->
-    <import file="${basedir}/make/properties.xml" />
-
-    <property name="build.output" location="build/classes" />
-    <property name="depends.jars" location="depends/jars" />
-    <property name="depends.manifests" location="depends/manifests" />
-    <property name="depends.files" location="depends/files" />
-    <property name="hy.hdk" location="deploy" />
-    <property name="hy.jdk" location="${hy.hdk}/jdk" />
-    <property file="make/depends.properties" />
-
-
-    <!-- ================================= 
-          target: default              
-         ================================= -->
-    <target name="default" 
-        description="Compile the Java source and package in component archives." 
-        depends="clean, build" />
-
-    <!-- ================================= 
-          target: build
-         ================================= -->
-    <target name="build" depends="compile, layout" />
-
-    <!-- ================================= 
-          target: clean            
-         ================================= -->
-    <target name="clean" depends="clean-bin, clean-layout" />
-
-
-    <!-- ================================= 
-          target: clean-bin              
-         ================================= -->
-    <target name="clean-bin" description="Delete all built classes">
-        <call-modules target="clean" />
-        <antcall target="clean-kernel-patternsets" />
-        <delete includeemptydirs="true" failonerror="false">
-            <fileset dir="${build.output}">
-                <include name="**/**" />
-            </fileset>
-        </delete>
-    </target>
-
-    <target name="copy-kernel-patternsets">
-        <mkdir dir="${hy.hdk}/build/patternsets" />
-        <copy file="modules/luni-kernel/make/patternset.txt"
-              tofile="${hy.hdk}/build/patternsets/luni-kernel.txt" />
-        <copy file="modules/security-kernel/make/patternset.txt"
-              tofile="${hy.hdk}/build/patternsets/security-kernel.txt" />
-    </target>
-
-    <target name="clean-kernel-patternsets">
-        <delete dir="${hy.hdk}/build/patternsets" />
-    </target>
-
-    <!-- =================================
-          target: compile
-         ================================= -->
-    <target name="compile" depends="copy-kernel-patternsets, prepare-depends"
-            description="Compile the source">
-        <mkdir dir="${build.output}" />
-
-        <javac fork="yes" 
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               destdir="${build.output}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-            <src path="modules/accessibility/src/main/java/" />
-            <src path="modules/annotation/src/main/java/" />
-            <src path="modules/applet/src/main/java" />
-            <src path="modules/archive/src/main/java" />
-            <src path="modules/auth/src/main/java/${hy.os}" />
-            <src path="modules/auth/src/main/java/common" />
-            <src path="modules/awt/src/main/java/${hy.os}" />
-            <src path="modules/awt/src/main/java/common" />
-            <src path="modules/beans/src/main/java" />
-            <src path="modules/concurrent/src/main/java/" />
-            <src path="modules/crypto/src/main/java" />
-            <src path="modules/instrument/src/main/java" />
-            <src path="modules/jndi/src/main/java" />
-            <src path="modules/logging/src/main/java" />
-            <src path="modules/lang-management/src/main/java/" />
-            <src path="modules/luni-kernel/src/main/java" />
-            <src path="modules/luni/src/main/java" />
-            <src path="modules/math/src/main/java" />
-            <src path="modules/misc/src/main/java" />
-            <src path="modules/nio/src/main/java" />
-            <src path="modules/nio_char/src/main/java" />
-            <src path="modules/prefs/src/main/java" />
-            <src path="modules/regex/src/main/java" />
-            <src path="modules/rmi/src/main/java" />
-            <src path="modules/security-kernel/src/main/java" />
-            <src path="modules/security/src/main/java/${hy.os}" />
-            <src path="modules/security/src/main/java/common" />
-            <src path="modules/sql/src/main/java" />
-            <src path="modules/suncompat/src/main/java" />
-            <src path="modules/swing/src/main/java/${hy.os}" />
-            <src path="modules/swing/src/main/java/common" />
-            <src path="modules/text/src/main/java" />
-            <src path="modules/x-net/src/main/java/" />
-            <classpath location="${build.output}" />
-            <classpath>
-                <fileset dir="${depends.jars}">
-                    <include name="**/*.jar" />
-                </fileset>
-            </classpath>
-        </javac>
-
-        <mkdir dir="${hy.jdk}/jre/lib/boot" />
-
-        <call-modules target="build" />
-
-    </target>
-
-
-    <!-- ================================= 
-          target: layout              
-         ================================= -->
-    <target name="layout" 
-        depends="compile" 
-        description="Construct the correct directory structure for the class libs">
-        <!-- Create the structure -->
-        <mkdir dir="${hy.jdk}/jre/bin" />
-        <mkdir dir="${hy.jdk}/jre/lib/boot" />
-        <mkdir dir="${hy.jdk}/jre/lib/ext" />
-        <mkdir dir="${hy.jdk}/jre/lib/security" />
-
-        <!-- Copy across the boot dependency jars -->
-        <copy todir="${hy.jdk}/jre/lib/boot" overwrite="yes"
-              verbose="yes">
-            <fileset dir="${depends.jars}">
-                <patternset includes="*.jar" />
-                <patternset includes="xerces_2.8.0/*.jar" />
-                <patternset includes="xalan-j_2.7.0/*.jar" />
-                <patternset includes="icu4j_3.4.4/*.jar" />
-                <patternset includes="mx4j_3.0.1/*.jar" />
-                <patternset includes="yoko/*.jar" />
-            </fileset>
-            <fileset dir="${depends.manifests}"/>
-        </copy>
-
-        <!-- Copy across the extension dependency jars -->
-        <copy todir="${hy.jdk}/jre/lib/ext" overwrite="yes"
-              verbose="yes" flatten="yes">
-            <fileset file="${bcprov.jar}" />
-        </copy>
-
-        <!-- Copy across the jdk/lib dependency jars -->
-        <copy todir="${hy.jdk}/lib" overwrite="yes"
-              verbose="yes" flatten="yes">
-            <fileset file="${ecj.jar}" />
-        </copy>
-
-        <!-- Copy across the support files -->
-        <copy todir="${hy.jdk}/jre/lib/boot" overwrite="yes">
-            <fileset dir="${depends.files}">
-                <include name="bootclasspath.properties" />
-            </fileset>
-        </copy>
-        <fixcrlf srcdir="${hy.jdk}/jre/lib/boot"
-            includes="bootclasspath.properties" />
-
-        <copy todir="${hy.jdk}/jre/lib/security" overwrite="yes">
-             <fileset dir="${depends.files}">
-                 <include name="java.policy" />
-                 <include name="java.security" />
-             </fileset>
-         </copy>
-
-    </target>
-
-
-    <!-- ================================= 
-          target: clean-layout              
-         ================================= -->
-    <target name="clean-layout">
-        <delete includeemptydirs="true" failonerror="false">
-            <fileset dir="${hy.jdk}">
-                <exclude name="jre/bin/default/**" />
-                <exclude name="jre/bin/**" />
-                <exclude name="jre/lib/ext/**" />
-            </fileset>
-        </delete>
-    </target>
-
-    <target name="prepare-depends"
-            description="Check for jars required to compile prefs">
-        
-      <ant antfile="make/depends.xml" inheritall="false" target="check"/>
-
-    </target>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Copyright 1998, 2005 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. -->
+
+<!-- ====================================================================== 
+     build-java-source    
+     Compile the Java source and package in component archives.
+     ====================================================================== -->
+<project name="build-java-source" default="default" basedir="..">
+    <description>
+        Compile the Java source and package in component archives.
+    </description>
+
+    <!-- import common properties -->
+    <import file="${basedir}/make/properties.xml" />
+
+    <property name="build.output" location="build/classes" />
+    <property name="depends.jars" location="depends/jars" />
+    <property name="depends.manifests" location="depends/manifests" />
+    <property name="depends.files" location="depends/files" />
+    <property name="hy.hdk" location="deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property file="make/depends.properties" />
+
+
+    <!-- ================================= 
+          target: default              
+         ================================= -->
+    <target name="default" 
+        description="Compile the Java source and package in component archives." 
+        depends="clean, build" />
+
+    <!-- ================================= 
+          target: build
+         ================================= -->
+    <target name="build" depends="compile, layout" />
+
+    <!-- ================================= 
+          target: clean            
+         ================================= -->
+    <target name="clean" depends="clean-bin, clean-layout" />
+
+
+    <!-- ================================= 
+          target: clean-bin              
+         ================================= -->
+    <target name="clean-bin" description="Delete all built classes">
+        <call-modules target="clean" />
+        <antcall target="clean-kernel-patternsets" />
+        <delete includeemptydirs="true" failonerror="false">
+            <fileset dir="${build.output}">
+                <include name="**/**" />
+            </fileset>
+        </delete>
+    </target>
+
+    <target name="copy-kernel-patternsets">
+        <mkdir dir="${hy.hdk}/build/patternsets" />
+        <copy file="modules/luni-kernel/make/patternset.txt"
+              tofile="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <copy file="modules/security-kernel/make/patternset.txt"
+              tofile="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </target>
+
+    <target name="clean-kernel-patternsets">
+        <delete dir="${hy.hdk}/build/patternsets" />
+    </target>
+
+    <!-- =================================
+          target: compile
+         ================================= -->
+    <target name="compile" depends="copy-kernel-patternsets, prepare-depends"
+            description="Compile the source">
+        <mkdir dir="${build.output}" />
+
+        <javac fork="yes" 
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               destdir="${build.output}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
+            <src path="modules/accessibility/src/main/java/" />
+            <src path="modules/annotation/src/main/java/" />
+            <src path="modules/applet/src/main/java" />
+            <src path="modules/archive/src/main/java" />
+            <src path="modules/auth/src/main/java/${hy.os}" />
+            <src path="modules/auth/src/main/java/common" />
+            <src path="modules/awt/src/main/java/${hy.os}" />
+            <src path="modules/awt/src/main/java/common" />
+            <src path="modules/beans/src/main/java" />
+            <src path="modules/concurrent/src/main/java/" />
+            <src path="modules/crypto/src/main/java" />
+            <src path="modules/instrument/src/main/java" />
+            <src path="modules/jndi/src/main/java" />
+            <src path="modules/logging/src/main/java" />
+            <src path="modules/lang-management/src/main/java/" />
+            <src path="modules/luni-kernel/src/main/java" />
+            <src path="modules/luni/src/main/java" />
+            <src path="modules/math/src/main/java" />
+            <src path="modules/misc/src/main/java" />
+            <src path="modules/nio/src/main/java" />
+            <src path="modules/nio_char/src/main/java" />
+            <src path="modules/prefs/src/main/java" />
+            <src path="modules/regex/src/main/java" />
+            <src path="modules/rmi/src/main/java" />
+            <src path="modules/security-kernel/src/main/java" />
+            <src path="modules/security/src/main/java/${hy.os}" />
+            <src path="modules/security/src/main/java/common" />
+            <src path="modules/sql/src/main/java" />
+            <src path="modules/suncompat/src/main/java" />
+            <src path="modules/swing/src/main/java/${hy.os}" />
+            <src path="modules/swing/src/main/java/common" />
+            <src path="modules/text/src/main/java" />
+            <src path="modules/x-net/src/main/java/" />
+            <classpath location="${build.output}" />
+            <classpath>
+                <fileset dir="${depends.jars}">
+                    <include name="**/*.jar" />
+                </fileset>
+            </classpath>
+        </javac>
+
+        <mkdir dir="${hy.jdk}/jre/lib/boot" />
+
+        <call-modules target="build" />
+
+    </target>
+
+
+    <!-- ================================= 
+          target: layout              
+         ================================= -->
+    <target name="layout" 
+        depends="compile" 
+        description="Construct the correct directory structure for the class libs">
+        <!-- Create the structure -->
+        <mkdir dir="${hy.jdk}/jre/bin" />
+        <mkdir dir="${hy.jdk}/jre/lib/boot" />
+        <mkdir dir="${hy.jdk}/jre/lib/ext" />
+        <mkdir dir="${hy.jdk}/jre/lib/security" />
+
+        <!-- Copy across the boot dependency jars -->
+        <copy todir="${hy.jdk}/jre/lib/boot" overwrite="yes"
+              verbose="yes">
+            <fileset dir="${depends.jars}">
+                <patternset includes="*.jar" />
+                <patternset includes="xerces_2.8.0/*.jar" />
+                <patternset includes="xalan-j_2.7.0/*.jar" />
+                <patternset includes="icu4j_3.4.4/*.jar" />
+                <patternset includes="mx4j_3.0.1/*.jar" />
+                <patternset includes="yoko/*.jar" />
+            </fileset>
+            <fileset dir="${depends.manifests}"/>
+        </copy>
+
+        <!-- Copy across the extension dependency jars -->
+        <copy todir="${hy.jdk}/jre/lib/ext" overwrite="yes"
+              verbose="yes" flatten="yes">
+            <fileset file="${bcprov.jar}" />
+        </copy>
+
+        <!-- Copy across the jdk/lib dependency jars -->
+        <copy todir="${hy.jdk}/lib" overwrite="yes"
+              verbose="yes" flatten="yes">
+            <fileset file="${ecj.jar}" />
+        </copy>
+
+        <!-- Copy across the support files -->
+        <copy todir="${hy.jdk}/jre/lib/boot" overwrite="yes">
+            <fileset dir="${depends.files}">
+                <include name="bootclasspath.properties" />
+            </fileset>
+        </copy>
+        <fixcrlf srcdir="${hy.jdk}/jre/lib/boot"
+            includes="bootclasspath.properties" />
+
+        <copy todir="${hy.jdk}/jre/lib/security" overwrite="yes">
+             <fileset dir="${depends.files}">
+                 <include name="java.policy" />
+                 <include name="java.security" />
+             </fileset>
+         </copy>
+
+    </target>
+
+
+    <!-- ================================= 
+          target: clean-layout              
+         ================================= -->
+    <target name="clean-layout">
+        <delete includeemptydirs="true" failonerror="false">
+            <fileset dir="${hy.jdk}">
+                <exclude name="jre/bin/default/**" />
+                <exclude name="jre/bin/**" />
+                <exclude name="jre/lib/ext/**" />
+            </fileset>
+        </delete>
+    </target>
+
+    <target name="prepare-depends"
+            description="Check for jars required to compile prefs">
+        
+      <ant antfile="make/depends.xml" inheritall="false" target="check"/>
+
+    </target>
+
+</project>

Propchange: incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/make/build-native.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build-native.xml?view=diff&rev=443545&r1=443544&r2=443545
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-native.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-native.xml Thu Sep 14 18:43:34 2006
@@ -1,222 +1,222 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Copyright 1998, 2005 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. -->
-
-<!-- ====================================================================== 
-     build-native-source    
-     Compile the native source into component shared libs.
-     ====================================================================== -->
-<project name="build-native-source" default="default" basedir="..">
-    <description>
-		Compile the native source into component shared libs.
-    </description>
-
-    <!-- import common properties -->
-    <import file="${basedir}/make/properties.xml" />
-
-    <property file="make/depends.properties" />
-
-    <property name="hy.hdk" location="deploy" />
-    <property name="hy.jdk" location="${hy.hdk}/jdk" />
-    <property name="depends.build" location="depends/build" />
-    <property name="depends.oss" location="depends/oss" />
-    <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" />
-
-    <!-- ================================= 
-          target: default              
-         ================================= -->
-    <target name="default" 
-        description="Compile the native source into component shared libs." 
-        depends="clean, build" />
-
-
-    <!-- ================================= 
-          target: build
-         ================================= -->
-    <target name="build"
-        depends="overlay-oss, copy-includes, make-all, layout" />
-
-
-    <!-- ================================= 
-          target: clean              
-         ================================= -->
-    <target name="clean"
-        depends="make-clean, clean-includes, clean-overlay-oss, clean-layout" />
-
-
-    <!-- This target invokes make on the all target to compile all natives -->
-    <target name="make-all" depends="copy-makefile-includes">
-    	<!-- Create the target directory structure -->
-        <mkdir dir="${hy.jdk}/jre/bin" />
-        <mkdir dir="${hy.jdk}/include" />
-    	<mkdir dir="${native.lib.target}"/>
-    	
-    	<!-- These module targets take care of building and copying
-             their shared libs -->
-    	<ant dir="modules/luni" antfile="build.xml" target="build.native.core" />
-    	<ant dir="modules/archive" antfile="build.xml" target="build.native" />
-    	<ant dir="modules/auth" antfile="build.xml" target="build.native" />
-    	<ant dir="modules/text" antfile="build.xml" target="build.native" />
-    	<ant dir="modules/prefs" antfile="build.xml" target="build.native" />
-    	<ant dir="modules/luni" antfile="build.xml" target="build.native.secondary" />
-        <ant dir="modules/nio" antfile="build.xml" target="build.native" />    	
-        <ant dir="modules/misc" antfile="build.xml" target="build.native" />    	
-        <ant dir="modules/awt" antfile="build.xml" target="build.native" />    	
-        <ant dir="modules/security" antfile="build.xml" target="build.native" />    	
-        <ant dir="modules/instrument" antfile="build.xml" target="build.native" />    	
-    </target>
-
-
-    <!-- ================================= 
-          target: make-clean              
-         ================================= -->
-    <target name="make-clean"
-        depends="copy-makefile-includes,-make-clean,clean-makefile-includes" />
-
-    <target name="-make-clean">
-    	<ant dir="modules/auth" antfile="build.xml" target="clean.native" />
-    	<ant dir="modules/archive" antfile="build.xml" target="clean.native" />
-       	<ant dir="modules/text" antfile="build.xml" target="clean.native" />
-    	<ant dir="modules/prefs" antfile="build.xml" target="clean.native" />
-    	<ant dir="modules/luni" antfile="build.xml" target="clean.native" />
-    	<ant dir="modules/nio" antfile="build.xml" target="clean.native" />
-    	<ant dir="modules/misc" antfile="build.xml" target="clean.native" />
-    	<ant dir="modules/awt" antfile="build.xml" target="clean.native" />
-    	<ant dir="modules/security" antfile="build.xml" target="clean.native" />
-    	<ant dir="modules/instrument" antfile="build.xml" target="clean.native" />
-    	<delete dir="${native.lib.target}" />
-    </target>
-
-
-    <!-- ================================= 
-          target: layout              
-         ================================= -->
-    <target name="layout" depends="layout.windows"
-        description="Construct the correct directory structure for native binaries">
-
-    	<!-- NLS catalog files -->
-        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-            <fileset dir="${depends.files}">
-                <include name="harmony*.properties" />
-            </fileset>
-        </copy>
-
-        <!-- Copy across dependency shared libs -->
-        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-            <fileset dir="${depends.libs}" includes="*${shlib.suffix}*" />
-        </copy>
-
-    </target>
-
-    <target name="layout.windows" if="is.windows">
-        <!-- workaround until msdll is moved. -->
-        <copy file="${msvcr71.dll}" todir="${hy.jdk}/jre/bin" overwrite="yes" />
-    </target>
-
-    <!-- ================================= 
-          target: clean-layout              
-         ================================= -->
-    <target name="clean-layout">
-        <delete includeemptydirs="true" failonerror="false">
-            <fileset dir="${hy.jdk}">
-                <include name="**/bin/java${exe.suffix}" />
-                <include name="**/bin/javaw${exe.suffix}" />
-                <include name="**/bin/*${shlib.suffix}*" />
-            	<include name="**/bin/harmony*.properties" />
-            </fileset>
-        </delete>
-    </target>
-
-
-    <!-- ================================= 
-          target: overlay-oss              
-         ================================= -->
-    <target name="overlay-oss">
-        <ant dir="modules/luni" antfile="build.xml"
-             target="overlay-oss" />
-
-    	<ant dir="modules/archive" antfile="build.xml" 
-	     target="overlay-oss" />        
-    	
-    	<ant dir="modules/text" antfile="build.xml" 
-    	     target="overlay-oss" /> 
-    </target>
-
-    <!-- ================================= 
-          target: copy-includes              
-         ================================= -->
-    <target name="copy-includes" >
-	<!-- Call copy.native.includes targets to copy across
-	     global includes to deploy/includes/harmony -->
-    	<ant dir="modules/archive" antfile="build.xml"
-             target="copy.native.includes" />
-    	<ant dir="modules/luni" antfile="build.xml" 
-    	     target="copy.native.includes" />
-    </target>
-	
-    <!-- ================================= 
-          target: clean-includes              
-         ================================= -->
-    <target name="clean-includes" >
-	<!-- Call clean.native.includes targets to delete global
-   	     includes under deploy/includes/harmony -->
-        
-    	<ant dir="modules/archive" antfile="build.xml" 
-    	     target="clean.native.includes" />
-    	<ant dir="modules/luni" antfile="build.xml" 
-    	     target="clean.native.includes" />
-
-        <!-- delete the deploy/include and deploy/jdk/include directories -->
-        <delete dir="${hy.hdk}/include" />
-        <delete dir="${hy.hdk}/jdk/include" />
-    </target>
-
-    <!-- ================================= 
-          target: copy-makefile-includes              
-         ================================= -->
-    <target name="copy-makefile-includes">
-	<!-- copy generic defines and rules for each platform into a shared
-	     place -->
-	<mkdir dir="${hy.hdk}/build/make" />
-	<copy todir="${hy.hdk}/build/make" overwrite="yes">
-            <fileset dir="${depends.build}">
-                <include name="*" />
-            </fileset>
-        </copy>
-    </target>
-	
-    <!-- ================================= 
-          target: clean-makefile-includes              
-         ================================= -->
-    <target name="clean-makefile-includes">
-	<!-- delete generic defines and rules -->
-	<delete dir="${hy.hdk}/build/make" />
-    </target>
-
-    <!-- ================================= 
-          target: clean-overlay-oss              
-         ================================= -->
-    <target name="clean-overlay-oss">
-        <ant dir="modules/luni" antfile="build.xml" 
-             target="clean-overlay-oss" />
-     	<ant dir="modules/archive" antfile="build.xml" 
-    	     target="clean-overlay-oss" />
-    	<ant dir="modules/text" antfile="build.xml" 
-    	     target="clean-overlay-oss" />
-    </target>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Copyright 1998, 2005 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. -->
+
+<!-- ====================================================================== 
+     build-native-source    
+     Compile the native source into component shared libs.
+     ====================================================================== -->
+<project name="build-native-source" default="default" basedir="..">
+    <description>
+		Compile the native source into component shared libs.
+    </description>
+
+    <!-- import common properties -->
+    <import file="${basedir}/make/properties.xml" />
+
+    <property file="make/depends.properties" />
+
+    <property name="hy.hdk" location="deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+    <property name="depends.build" location="depends/build" />
+    <property name="depends.oss" location="depends/oss" />
+    <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" />
+
+    <!-- ================================= 
+          target: default              
+         ================================= -->
+    <target name="default" 
+        description="Compile the native source into component shared libs." 
+        depends="clean, build" />
+
+
+    <!-- ================================= 
+          target: build
+         ================================= -->
+    <target name="build"
+        depends="overlay-oss, copy-includes, make-all, layout" />
+
+
+    <!-- ================================= 
+          target: clean              
+         ================================= -->
+    <target name="clean"
+        depends="make-clean, clean-includes, clean-overlay-oss, clean-layout" />
+
+
+    <!-- This target invokes make on the all target to compile all natives -->
+    <target name="make-all" depends="copy-makefile-includes">
+    	<!-- Create the target directory structure -->
+        <mkdir dir="${hy.jdk}/jre/bin" />
+        <mkdir dir="${hy.jdk}/include" />
+    	<mkdir dir="${native.lib.target}"/>
+    	
+    	<!-- These module targets take care of building and copying
+             their shared libs -->
+    	<ant dir="modules/luni" antfile="build.xml" target="build.native.core" />
+    	<ant dir="modules/archive" antfile="build.xml" target="build.native" />
+    	<ant dir="modules/auth" antfile="build.xml" target="build.native" />
+    	<ant dir="modules/text" antfile="build.xml" target="build.native" />
+    	<ant dir="modules/prefs" antfile="build.xml" target="build.native" />
+    	<ant dir="modules/luni" antfile="build.xml" target="build.native.secondary" />
+        <ant dir="modules/nio" antfile="build.xml" target="build.native" />    	
+        <ant dir="modules/misc" antfile="build.xml" target="build.native" />    	
+        <ant dir="modules/awt" antfile="build.xml" target="build.native" />    	
+        <ant dir="modules/security" antfile="build.xml" target="build.native" />    	
+        <ant dir="modules/instrument" antfile="build.xml" target="build.native" />    	
+    </target>
+
+
+    <!-- ================================= 
+          target: make-clean              
+         ================================= -->
+    <target name="make-clean"
+        depends="copy-makefile-includes,-make-clean,clean-makefile-includes" />
+
+    <target name="-make-clean">
+    	<ant dir="modules/auth" antfile="build.xml" target="clean.native" />
+    	<ant dir="modules/archive" antfile="build.xml" target="clean.native" />
+       	<ant dir="modules/text" antfile="build.xml" target="clean.native" />
+    	<ant dir="modules/prefs" antfile="build.xml" target="clean.native" />
+    	<ant dir="modules/luni" antfile="build.xml" target="clean.native" />
+    	<ant dir="modules/nio" antfile="build.xml" target="clean.native" />
+    	<ant dir="modules/misc" antfile="build.xml" target="clean.native" />
+    	<ant dir="modules/awt" antfile="build.xml" target="clean.native" />
+    	<ant dir="modules/security" antfile="build.xml" target="clean.native" />
+    	<ant dir="modules/instrument" antfile="build.xml" target="clean.native" />
+    	<delete dir="${native.lib.target}" />
+    </target>
+
+
+    <!-- ================================= 
+          target: layout              
+         ================================= -->
+    <target name="layout" depends="layout.windows"
+        description="Construct the correct directory structure for native binaries">
+
+    	<!-- NLS catalog files -->
+        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+            <fileset dir="${depends.files}">
+                <include name="harmony*.properties" />
+            </fileset>
+        </copy>
+
+        <!-- Copy across dependency shared libs -->
+        <copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+            <fileset dir="${depends.libs}" includes="*${shlib.suffix}*" />
+        </copy>
+
+    </target>
+
+    <target name="layout.windows" if="is.windows">
+        <!-- workaround until msdll is moved. -->
+        <copy file="${msvcr71.dll}" todir="${hy.jdk}/jre/bin" overwrite="yes" />
+    </target>
+
+    <!-- ================================= 
+          target: clean-layout              
+         ================================= -->
+    <target name="clean-layout">
+        <delete includeemptydirs="true" failonerror="false">
+            <fileset dir="${hy.jdk}">
+                <include name="**/bin/java${exe.suffix}" />
+                <include name="**/bin/javaw${exe.suffix}" />
+                <include name="**/bin/*${shlib.suffix}*" />
+            	<include name="**/bin/harmony*.properties" />
+            </fileset>
+        </delete>
+    </target>
+
+
+    <!-- ================================= 
+          target: overlay-oss              
+         ================================= -->
+    <target name="overlay-oss">
+        <ant dir="modules/luni" antfile="build.xml"
+             target="overlay-oss" />
+
+    	<ant dir="modules/archive" antfile="build.xml" 
+	     target="overlay-oss" />        
+    	
+    	<ant dir="modules/text" antfile="build.xml" 
+    	     target="overlay-oss" /> 
+    </target>
+
+    <!-- ================================= 
+          target: copy-includes              
+         ================================= -->
+    <target name="copy-includes" >
+	<!-- Call copy.native.includes targets to copy across
+	     global includes to deploy/includes/harmony -->
+    	<ant dir="modules/archive" antfile="build.xml"
+             target="copy.native.includes" />
+    	<ant dir="modules/luni" antfile="build.xml" 
+    	     target="copy.native.includes" />
+    </target>
+	
+    <!-- ================================= 
+          target: clean-includes              
+         ================================= -->
+    <target name="clean-includes" >
+	<!-- Call clean.native.includes targets to delete global
+   	     includes under deploy/includes/harmony -->
+        
+    	<ant dir="modules/archive" antfile="build.xml" 
+    	     target="clean.native.includes" />
+    	<ant dir="modules/luni" antfile="build.xml" 
+    	     target="clean.native.includes" />
+
+        <!-- delete the deploy/include and deploy/jdk/include directories -->
+        <delete dir="${hy.hdk}/include" />
+        <delete dir="${hy.hdk}/jdk/include" />
+    </target>
+
+    <!-- ================================= 
+          target: copy-makefile-includes              
+         ================================= -->
+    <target name="copy-makefile-includes">
+	<!-- copy generic defines and rules for each platform into a shared
+	     place -->
+	<mkdir dir="${hy.hdk}/build/make" />
+	<copy todir="${hy.hdk}/build/make" overwrite="yes">
+            <fileset dir="${depends.build}">
+                <include name="*" />
+            </fileset>
+        </copy>
+    </target>
+	
+    <!-- ================================= 
+          target: clean-makefile-includes              
+         ================================= -->
+    <target name="clean-makefile-includes">
+	<!-- delete generic defines and rules -->
+	<delete dir="${hy.hdk}/build/make" />
+    </target>
+
+    <!-- ================================= 
+          target: clean-overlay-oss              
+         ================================= -->
+    <target name="clean-overlay-oss">
+        <ant dir="modules/luni" antfile="build.xml" 
+             target="clean-overlay-oss" />
+     	<ant dir="modules/archive" antfile="build.xml" 
+    	     target="clean-overlay-oss" />
+    	<ant dir="modules/text" antfile="build.xml" 
+    	     target="clean-overlay-oss" />
+    </target>
+
+</project>

Propchange: incubator/harmony/enhanced/classlib/trunk/make/build-native.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/make/build-test.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build-test.xml?view=diff&rev=443545&r1=443544&r2=443545
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-test.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-test.xml Thu Sep 14 18:43:34 2006
@@ -1,221 +1,221 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Copyright 2005 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="classlib-test" default="test-all" basedir="..">
-
-    <description> Tests for classlib package</description>
-
-    <!-- import common properties -->
-    <import file="${basedir}/make/properties.xml" />
-
-    <!-- set global properties for this build. -->
-
-    <property name="tests.output" location="build/test_report" />
-    <property name="hy.hdk" location="deploy" />
-    <property name="hy.jdk" location="${hy.hdk}/jdk" />
-
-    <property name="tests.build.output" location="build/tests" />
-    <property name="tests.support.output" location="build/test_support" />
-    <property name="support.dir" location="support"/>
-    <property name="tests.depends.jars" location="deploy/jdk/jre/lib/boot" />
-    <property file="make/depends.properties" />
-
-    <!-- this list of components to test will grow to eventually be all modules -->
-    <target name="test-all"
-        depends="clean, test-modules, gen-report, check-test-result">
-    </target>
-
-    <target name="clean">
-    <delete dir="${tests.output}" />
-    <delete dir="${tests.build.output}" />
-    <delete dir="${tests.support.output}" />
-        <delete file="${hy.hdk}/build/test/support.jar" />
-    </target>
-
-    <target name="test-modules" depends="support.jar">
-        <call-modules target="test" />
-    </target>
-
-    <target name="gen-report">
-    <junitreport todir="${tests.output}">
-        <fileset dir="${tests.output}">
-        <include name="TEST*-*.xml"/>
-        </fileset>
-        <report format="frames" todir="${tests.output}/html"/>
-    </junitreport>
-
-    <!-- use this property just to get the slashes to display right in the echo -->
-    <property name="display-location" location="${tests.output}/html/index.html"/>
-    <echo message="The test report is in ${display-location}"/>
-    </target>
-
-    <target name="support.jar" depends="compile-support">
-        <mkdir dir="${hy.hdk}/build/test" />
-        <jar destfile="${hy.hdk}/build/test/support.jar"
-             manifest="support/META-INF/MANIFEST.MF">
-            <fileset dir="${tests.support.output}" />
-        </jar>
-    </target>
-
-    <target name="compile-support" depends="copy-test-resources, check-support-jars"
-            description="Compile the unit test source">
-        <mkdir dir="${tests.support.output}" />
-        <javac 
-               destdir="${tests.support.output}"
-               compiler="${hy.javac.compiler}"
-               memoryMaximumSize="${hy.javac.maxmem}"
-               source="${hy.javac.source}" 
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-            <src path="${support.dir}/src/test/java" />
-            <classpath location="${junit.jar}" />
-            <classpath location="${tests.support.output}" />
-            <bootclasspath>
-                <fileset dir="${tests.depends.jars}">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </javac>
-        
-    </target>
-    
-    <target name="check-test-result">
-        <available property="test.errors"
-                   file="${tests.output}/test.errors" />
-        <available property="test.failures"
-                   file="${tests.output}/test.failures" />
-        <fail if="test.errors" message="There were test errors." />
-        <fail if="test.failures" message="There were test failures." />
-    </target>
-
-    <!-- ================================= 
-          target: copy-test-resources              
-         ================================= -->
-    <target name="copy-test-resources"
-            description="Copy non-Java files from test support tree to the support output tree">
-
-        <mkdir dir="${tests.support.output}" />
-        <copy todir="${tests.support.output}" includeemptydirs="false">
-            <fileset dir="${support.dir}/src/test/java">
-                <exclude name="**/*.java" />
-            </fileset>
-            <fileset file="${support.dir}/src/test/resources/hyts_Foo.c"/>
-        </copy>
-    </target>
-
-    <target name="check-support-jars"
-            description="Check for jars required to compile and run unit tests">
-
-      <ant antfile="make/depends.xml" inheritall="false" target="check"/>
-
-    </target>
-
-    <target name="run-tests" description="Run JUnit tests">
-        <!-- The location of the Harmony launcher can be overridden by 
-             the "harmony.vm.exe" property. Default value of property
-             is set assuming it is under the deploy tree -->
-        <property name="harmony.vm.exe" location="${hy.jdk}/jre/bin/java"/>
-        
-        <!-- Delete "junitCompleted" - an empty file that can be used to
-             check that the junit test VM does not exit prematurely -->
-        <delete file="${user.home}/junitCompleted" failonerror="false" />
-
-        <path id="classpath.id" location="${tests.build.output}" />
-        
-        <java classname="tests.main.AllTests"
-              fork="true"
-              jvm="${harmony.vm.exe}">
-            
-
-            <!-- Required by various tests that set security manager etc -->
-            <jvmarg value="-Djava.security.policy=${support.dir}/src/test/resources/config/testing.policy" />
-
-            <!-- Required for running the java.net unit tests -->
-            <jvmarg value="-Dtest.ini.file=${support.dir}/src/test/resources/config/localhosttest.ini" />
-
-            <!-- Required if using the test excluder decorator -->
-            <jvmarg value="-Dexcludes.file.uri=file:///${support.dir}/src/test/resources/config/jcltest-excludes.xml" />
-            
-            <classpath>
-                <path refid="classpath.id" />
-                <pathelement location="${junit.jar}" />
-            </classpath>
-    </java>
-    </target>
-
-    
-    <!-- ================================= 
-          target: run-tests-with-junit-task
-         ================================= -->
-    <target name="run-tests-with-junit-task" description="Run JUnit tests">
-        <!-- The location of the Harmony launcher can be overridden by 
-             the "harmony.vm.exe" property. Default value of property
-             is set assuming it is under the deploy tree -->
-        <property name="harmony.vm.exe" location="${hy.jdk}/jre/bin/java"/>
-
-        <!-- Delete "junitCompleted" - an empty file that can be used to
-             check that the junit test VM does not exit prematurely -->
-        <delete file="${user.home}/junitCompleted" failonerror="false" />
-
-        <path id="classpath.id" location="${tests.build.output}" />
-        
-        <junit fork="true"
-               forkmode="once"
-               jvm="${harmony.vm.exe}"
-               errorproperty="tests.failed"
-               failureproperty="tests.failed">
-            <env key="JAVA_HOME" value="${hy.jdk}/jre" />
-            <env key="LD_LIBRARY_PATH" value="" />
-            <!-- required to be unset on Linux -->
-
-            <!-- Required by various tests that set security manager etc -->
-            <jvmarg value="-Djava.security.policy=${support.dir}/src/test/resources/config/testing.policy" />
-
-            <!-- Required for running the java.net unit tests -->
-            <jvmarg value="-Dtest.ini.file=${support.dir}/src/test/resources/config/localhosttest.ini" />
-
-            <!-- Required if using the test excluder decorator -->
-            <jvmarg value="-Dexcludes.file.uri=file:///${support.dir}/src/test/resources/config/jcltest-excludes.xml" />
-            
-            <classpath>
-                <path refid="classpath.id" />
-                <pathelement location="${junit.jar}" />
-            </classpath>
-            
-            <formatter type="plain" usefile="false" />
-            <formatter type="xml" />
-            
-            <test todir="${tests.results.dir}" name="tests.main.AllTests" />
-        </junit>
-
-        <fail if="tests.failed" message="Some Tests Failed !" />
-
-        <!-- if the junit test process completed as expected, this file
-             should now exist -->
-        <fail message="JUnit task ended prematurely - Hint: This may have been caused by the test VM terminating unexpectedly during the test run">
-            <condition>
-                <not>
-                    <available file="${user.home}/junitCompleted" />
-                </not>
-            </condition>
-        </fail>
-        <!-- Clean up after ourselves -->
-        <delete file="${user.home}/junitCompleted" />
-    </target>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Copyright 2005 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="classlib-test" default="test-all" basedir="..">
+
+    <description> Tests for classlib package</description>
+
+    <!-- import common properties -->
+    <import file="${basedir}/make/properties.xml" />
+
+    <!-- set global properties for this build. -->
+
+    <property name="tests.output" location="build/test_report" />
+    <property name="hy.hdk" location="deploy" />
+    <property name="hy.jdk" location="${hy.hdk}/jdk" />
+
+    <property name="tests.build.output" location="build/tests" />
+    <property name="tests.support.output" location="build/test_support" />
+    <property name="support.dir" location="support"/>
+    <property name="tests.depends.jars" location="deploy/jdk/jre/lib/boot" />
+    <property file="make/depends.properties" />
+
+    <!-- this list of components to test will grow to eventually be all modules -->
+    <target name="test-all"
+        depends="clean, test-modules, gen-report, check-test-result">
+    </target>
+
+    <target name="clean">
+    <delete dir="${tests.output}" />
+    <delete dir="${tests.build.output}" />
+    <delete dir="${tests.support.output}" />
+        <delete file="${hy.hdk}/build/test/support.jar" />
+    </target>
+
+    <target name="test-modules" depends="support.jar">
+        <call-modules target="test" />
+    </target>
+
+    <target name="gen-report">
+    <junitreport todir="${tests.output}">
+        <fileset dir="${tests.output}">
+        <include name="TEST*-*.xml"/>
+        </fileset>
+        <report format="frames" todir="${tests.output}/html"/>
+    </junitreport>
+
+    <!-- use this property just to get the slashes to display right in the echo -->
+    <property name="display-location" location="${tests.output}/html/index.html"/>
+    <echo message="The test report is in ${display-location}"/>
+    </target>
+
+    <target name="support.jar" depends="compile-support">
+        <mkdir dir="${hy.hdk}/build/test" />
+        <jar destfile="${hy.hdk}/build/test/support.jar"
+             manifest="support/META-INF/MANIFEST.MF">
+            <fileset dir="${tests.support.output}" />
+        </jar>
+    </target>
+
+    <target name="compile-support" depends="copy-test-resources, check-support-jars"
+            description="Compile the unit test source">
+        <mkdir dir="${tests.support.output}" />
+        <javac 
+               destdir="${tests.support.output}"
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
+
+            <src path="${support.dir}/src/test/java" />
+            <classpath location="${junit.jar}" />
+            <classpath location="${tests.support.output}" />
+            <bootclasspath>
+                <fileset dir="${tests.depends.jars}">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+        </javac>
+        
+    </target>
+    
+    <target name="check-test-result">
+        <available property="test.errors"
+                   file="${tests.output}/test.errors" />
+        <available property="test.failures"
+                   file="${tests.output}/test.failures" />
+        <fail if="test.errors" message="There were test errors." />
+        <fail if="test.failures" message="There were test failures." />
+    </target>
+
+    <!-- ================================= 
+          target: copy-test-resources              
+         ================================= -->
+    <target name="copy-test-resources"
+            description="Copy non-Java files from test support tree to the support output tree">
+
+        <mkdir dir="${tests.support.output}" />
+        <copy todir="${tests.support.output}" includeemptydirs="false">
+            <fileset dir="${support.dir}/src/test/java">
+                <exclude name="**/*.java" />
+            </fileset>
+            <fileset file="${support.dir}/src/test/resources/hyts_Foo.c"/>
+        </copy>
+    </target>
+
+    <target name="check-support-jars"
+            description="Check for jars required to compile and run unit tests">
+
+      <ant antfile="make/depends.xml" inheritall="false" target="check"/>
+
+    </target>
+
+    <target name="run-tests" description="Run JUnit tests">
+        <!-- The location of the Harmony launcher can be overridden by 
+             the "harmony.vm.exe" property. Default value of property
+             is set assuming it is under the deploy tree -->
+        <property name="harmony.vm.exe" location="${hy.jdk}/jre/bin/java"/>
+        
+        <!-- Delete "junitCompleted" - an empty file that can be used to
+             check that the junit test VM does not exit prematurely -->
+        <delete file="${user.home}/junitCompleted" failonerror="false" />
+
+        <path id="classpath.id" location="${tests.build.output}" />
+        
+        <java classname="tests.main.AllTests"
+              fork="true"
+              jvm="${harmony.vm.exe}">
+            
+
+            <!-- Required by various tests that set security manager etc -->
+            <jvmarg value="-Djava.security.policy=${support.dir}/src/test/resources/config/testing.policy" />
+
+            <!-- Required for running the java.net unit tests -->
+            <jvmarg value="-Dtest.ini.file=${support.dir}/src/test/resources/config/localhosttest.ini" />
+
+            <!-- Required if using the test excluder decorator -->
+            <jvmarg value="-Dexcludes.file.uri=file:///${support.dir}/src/test/resources/config/jcltest-excludes.xml" />
+            
+            <classpath>
+                <path refid="classpath.id" />
+                <pathelement location="${junit.jar}" />
+            </classpath>
+    </java>
+    </target>
+
+    
+    <!-- ================================= 
+          target: run-tests-with-junit-task
+         ================================= -->
+    <target name="run-tests-with-junit-task" description="Run JUnit tests">
+        <!-- The location of the Harmony launcher can be overridden by 
+             the "harmony.vm.exe" property. Default value of property
+             is set assuming it is under the deploy tree -->
+        <property name="harmony.vm.exe" location="${hy.jdk}/jre/bin/java"/>
+
+        <!-- Delete "junitCompleted" - an empty file that can be used to
+             check that the junit test VM does not exit prematurely -->
+        <delete file="${user.home}/junitCompleted" failonerror="false" />
+
+        <path id="classpath.id" location="${tests.build.output}" />
+        
+        <junit fork="true"
+               forkmode="once"
+               jvm="${harmony.vm.exe}"
+               errorproperty="tests.failed"
+               failureproperty="tests.failed">
+            <env key="JAVA_HOME" value="${hy.jdk}/jre" />
+            <env key="LD_LIBRARY_PATH" value="" />
+            <!-- required to be unset on Linux -->
+
+            <!-- Required by various tests that set security manager etc -->
+            <jvmarg value="-Djava.security.policy=${support.dir}/src/test/resources/config/testing.policy" />
+
+            <!-- Required for running the java.net unit tests -->
+            <jvmarg value="-Dtest.ini.file=${support.dir}/src/test/resources/config/localhosttest.ini" />
+
+            <!-- Required if using the test excluder decorator -->
+            <jvmarg value="-Dexcludes.file.uri=file:///${support.dir}/src/test/resources/config/jcltest-excludes.xml" />
+            
+            <classpath>
+                <path refid="classpath.id" />
+                <pathelement location="${junit.jar}" />
+            </classpath>
+            
+            <formatter type="plain" usefile="false" />
+            <formatter type="xml" />
+            
+            <test todir="${tests.results.dir}" name="tests.main.AllTests" />
+        </junit>
+
+        <fail if="tests.failed" message="Some Tests Failed !" />
+
+        <!-- if the junit test process completed as expected, this file
+             should now exist -->
+        <fail message="JUnit task ended prematurely - Hint: This may have been caused by the test VM terminating unexpectedly during the test run">
+            <condition>
+                <not>
+                    <available file="${user.home}/junitCompleted" />
+                </not>
+            </condition>
+        </fail>
+        <!-- Clean up after ourselves -->
+        <delete file="${user.home}/junitCompleted" />
+    </target>
+
+</project>

Propchange: incubator/harmony/enhanced/classlib/trunk/make/build-test.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/depends.properties?view=diff&rev=443545&r1=443544&r2=443545
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/depends.properties Thu Sep 14 18:43:34 2006
@@ -1,76 +1,76 @@
-# 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.
-
-depends.dir=depends
-depends.jars=${depends.dir}/jars
-ibiblio.base=http://www.ibiblio.org
-
-xalan.dir=${depends.jars}/xalan-j_2.7.0
-xalan.jar=${xalan.dir}/xalan.jar
-xalan.url=${ibiblio.base}/maven/xalan/jars/xalan-2.7.0.jar
-xalan.md5=a018d032c21a873225e702b36b171a10
-
-xerces.dir=${depends.jars}/xerces_2.8.0
-resolver.jar=${xerces.dir}/resolver.jar
-resolver.url=${ibiblio.base}/maven/xml-resolver/jars/xml-resolver-1.1.jar
-resolver.md5=39546d6a7f9cf0fd971874d43214dbe4
-
-xerces.impl.jar=${xerces.dir}/xercesImpl.jar
-xerces.impl.url=${ibiblio.base}/maven/xerces/jars/xercesImpl-2.8.0.jar
-xerces.impl.md5=00b9a88a935985d17b7621c74a498bb4
-
-xml.apis.jar=${xerces.dir}/xml-apis.jar
-xml.apis.url=${ibiblio.base}/maven/xml-apis/jars/xml-apis-1.3.03.jar
-xml.apis.md5=6dee9238dd2900171197104951940778
-
-junit.dir=${depends.jars}/junit_3.8.2
-junit.jar=${junit.dir}/junit.jar
-junit.url=${ibiblio.base}/maven2/junit/junit/3.8.2/junit-3.8.2.jar
-junit.md5=28e7eb9eeefe31a657c68755bfccc541
-
-bcprov.dir=${depends.jars}/bcprov-jdk14-133
-bcprov.jar=${bcprov.dir}/bcprov.jar
-signed.bcprov.jar=${bcprov.dir}/signed.bcprov.jar
-signed.bcprov.md5=1a0105f80aed32819da869c85dc4508c
-bcprov.url=http://www.bouncycastle.org/download/bcprov-jdk14-133.jar
-
-msvcr71.dir=${depends.dir}/libs/windows.x86
-msvcr71.dll=${msvcr71.dir}/msvcr71.dll
-msvcr71.url=http://www.dlldump.com/dllfiles/M/MSVCR71.dll
-msvcr71.md5=86f1895ae8c5e8b17d99ece768a70732
-
-icu4j.dir=${depends.jars}/icu4j_3.4.4
-icu4j.jar=${icu4j.dir}/icu4j_3_4_4.jar
-icu4j.url=http://www.ibiblio.org/maven2/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar
-icu4j.md5=92422a9465ccc608bc7a8ae9cf594509
-
-ecj.dir=${depends.jars}/ecj_3.2
-ecj.jar=${ecj.dir}/ecj_3.2.jar
-ecj.url=http://download.eclipse.org/eclipse/downloads/drops/R-3.2-200606291905/ecj.jar
-ecj.md5=633e14a4dc14ca578b5548c3c088172f
-
-mx4j.dir=${depends.jars}/mx4j_3.0.1
-mx4j.jar=${mx4j.dir}/mx4j.jar
-mx4j.url=${ibiblio.base}/maven/mx4j/jars/mx4j-3.0.1.jar
-mx4j.md5=7a8675e26ee20f997ad4f54091e9b7a5
-
-mx4j.remote.jar=${mx4j.dir}/mx4j-remote.jar
-mx4j.remote.url=${ibiblio.base}/maven/mx4j/jars/mx4j-remote-3.0.1.jar
-mx4j.remote.md5=bacb72e0fcad4259825c7cac1a0efe43
-
-
-yoko.dir=${depends.jars}/yoko
-yoko.jar=${yoko.dir}/yoko.jar
-yoko.url=http://issues.apache.org/jira/secure/attachment/12338056/yoko.jar
-yoko.md5=e37eebf580336cefe8f4d16863e30adb
+# 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.
+
+depends.dir=depends
+depends.jars=${depends.dir}/jars
+ibiblio.base=http://www.ibiblio.org
+
+xalan.dir=${depends.jars}/xalan-j_2.7.0
+xalan.jar=${xalan.dir}/xalan.jar
+xalan.url=${ibiblio.base}/maven/xalan/jars/xalan-2.7.0.jar
+xalan.md5=a018d032c21a873225e702b36b171a10
+
+xerces.dir=${depends.jars}/xerces_2.8.0
+resolver.jar=${xerces.dir}/resolver.jar
+resolver.url=${ibiblio.base}/maven/xml-resolver/jars/xml-resolver-1.1.jar
+resolver.md5=39546d6a7f9cf0fd971874d43214dbe4
+
+xerces.impl.jar=${xerces.dir}/xercesImpl.jar
+xerces.impl.url=${ibiblio.base}/maven/xerces/jars/xercesImpl-2.8.0.jar
+xerces.impl.md5=00b9a88a935985d17b7621c74a498bb4
+
+xml.apis.jar=${xerces.dir}/xml-apis.jar
+xml.apis.url=${ibiblio.base}/maven/xml-apis/jars/xml-apis-1.3.03.jar
+xml.apis.md5=6dee9238dd2900171197104951940778
+
+junit.dir=${depends.jars}/junit_3.8.2
+junit.jar=${junit.dir}/junit.jar
+junit.url=${ibiblio.base}/maven2/junit/junit/3.8.2/junit-3.8.2.jar
+junit.md5=28e7eb9eeefe31a657c68755bfccc541
+
+bcprov.dir=${depends.jars}/bcprov-jdk14-133
+bcprov.jar=${bcprov.dir}/bcprov.jar
+signed.bcprov.jar=${bcprov.dir}/signed.bcprov.jar
+signed.bcprov.md5=1a0105f80aed32819da869c85dc4508c
+bcprov.url=http://www.bouncycastle.org/download/bcprov-jdk14-133.jar
+
+msvcr71.dir=${depends.dir}/libs/windows.x86
+msvcr71.dll=${msvcr71.dir}/msvcr71.dll
+msvcr71.url=http://www.dlldump.com/dllfiles/M/MSVCR71.dll
+msvcr71.md5=86f1895ae8c5e8b17d99ece768a70732
+
+icu4j.dir=${depends.jars}/icu4j_3.4.4
+icu4j.jar=${icu4j.dir}/icu4j_3_4_4.jar
+icu4j.url=http://www.ibiblio.org/maven2/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar
+icu4j.md5=92422a9465ccc608bc7a8ae9cf594509
+
+ecj.dir=${depends.jars}/ecj_3.2
+ecj.jar=${ecj.dir}/ecj_3.2.jar
+ecj.url=http://download.eclipse.org/eclipse/downloads/drops/R-3.2-200606291905/ecj.jar
+ecj.md5=633e14a4dc14ca578b5548c3c088172f
+
+mx4j.dir=${depends.jars}/mx4j_3.0.1
+mx4j.jar=${mx4j.dir}/mx4j.jar
+mx4j.url=${ibiblio.base}/maven/mx4j/jars/mx4j-3.0.1.jar
+mx4j.md5=7a8675e26ee20f997ad4f54091e9b7a5
+
+mx4j.remote.jar=${mx4j.dir}/mx4j-remote.jar
+mx4j.remote.url=${ibiblio.base}/maven/mx4j/jars/mx4j-remote-3.0.1.jar
+mx4j.remote.md5=bacb72e0fcad4259825c7cac1a0efe43
+
+
+yoko.dir=${depends.jars}/yoko
+yoko.jar=${yoko.dir}/yoko.jar
+yoko.url=http://issues.apache.org/jira/secure/attachment/12338056/yoko.jar
+yoko.md5=e37eebf580336cefe8f4d16863e30adb

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

Modified: incubator/harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/depends.xml?view=diff&rev=443545&r1=443544&r2=443545
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/depends.xml Thu Sep 14 18:43:34 2006
@@ -1,199 +1,199 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- 
-
-  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="dependencies" default="check" basedir="..">
-    <description>
-    Confirm that dependencies are present and fetch missing dependencies
-    where possible.
-    </description>
-
-    <property file="make/depends.properties" />
-    <import file="${basedir}/make/properties.xml" />
-
-    <target name="check">
-
-	<check-one-file src="${yoko.url}" dest="${yoko.jar}" />
-
-	<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}" />
-
-	<check-one-file src="${icu4j.url}" dest="${icu4j.jar}" />
-
-	<check-one-file src="${mx4j.url}" dest="${mx4j.jar}" />
-
-	<check-one-file src="${mx4j.remote.url}" dest="${mx4j.remote.jar}" />
-
-	<check-one-file src="${ecj.url}" dest="${ecj.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="${yoko.dir}" />
-	<download-one-file src="${yoko.url}" dest="${yoko.jar}"
-                           md5="${yoko.md5}" />
-
-	<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}" />
-
-	<mkdir dir="${icu4j.dir}" />
-	<download-one-file src="${icu4j.url}" dest="${icu4j.jar}"
-                           md5="${icu4j.md5}" />
-
-	<mkdir dir="${mx4j.dir}" />
-	<download-one-file src="${mx4j.url}" dest="${mx4j.jar}"
-                           md5="${mx4j.md5}" />
-
-	<download-one-file src="${mx4j.remote.url}" dest="${mx4j.remote.jar}"
-                           md5="${mx4j.remote.md5}" />
-
-	<mkdir dir="${ecj.dir}" />
-	<download-one-file src="${ecj.url}" dest="${ecj.jar}"
-                           md5="${ecj.md5}" />
-
-        <antcall target="download-win" />
-
-    </target>
-
-    <target name="download-win" if="is.windows">
-        
-	<mkdir dir="${msvcr71.dir}" />
-	<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}
-found:
-  ${new.md5}
-
-            </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}
-
-should be downloaded to:
-
-  @{dest}
-
-Run "ant fetch-depends" to automatically fetch dependencies.
-Note: Some of Harmony's dependencies are licensed under terms other
-than the Apache License v2.
-            </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>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- 
+
+  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="dependencies" default="check" basedir="..">
+    <description>
+    Confirm that dependencies are present and fetch missing dependencies
+    where possible.
+    </description>
+
+    <property file="make/depends.properties" />
+    <import file="${basedir}/make/properties.xml" />
+
+    <target name="check">
+
+	<check-one-file src="${yoko.url}" dest="${yoko.jar}" />
+
+	<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}" />
+
+	<check-one-file src="${icu4j.url}" dest="${icu4j.jar}" />
+
+	<check-one-file src="${mx4j.url}" dest="${mx4j.jar}" />
+
+	<check-one-file src="${mx4j.remote.url}" dest="${mx4j.remote.jar}" />
+
+	<check-one-file src="${ecj.url}" dest="${ecj.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="${yoko.dir}" />
+	<download-one-file src="${yoko.url}" dest="${yoko.jar}"
+                           md5="${yoko.md5}" />
+
+	<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}" />
+
+	<mkdir dir="${icu4j.dir}" />
+	<download-one-file src="${icu4j.url}" dest="${icu4j.jar}"
+                           md5="${icu4j.md5}" />
+
+	<mkdir dir="${mx4j.dir}" />
+	<download-one-file src="${mx4j.url}" dest="${mx4j.jar}"
+                           md5="${mx4j.md5}" />
+
+	<download-one-file src="${mx4j.remote.url}" dest="${mx4j.remote.jar}"
+                           md5="${mx4j.remote.md5}" />
+
+	<mkdir dir="${ecj.dir}" />
+	<download-one-file src="${ecj.url}" dest="${ecj.jar}"
+                           md5="${ecj.md5}" />
+
+        <antcall target="download-win" />
+
+    </target>
+
+    <target name="download-win" if="is.windows">
+        
+	<mkdir dir="${msvcr71.dir}" />
+	<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}
+found:
+  ${new.md5}
+
+            </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}
+
+should be downloaded to:
+
+  @{dest}
+
+Run "ant fetch-depends" to automatically fetch dependencies.
+Note: Some of Harmony's dependencies are licensed under terms other
+than the Apache License v2.
+            </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>

Propchange: incubator/harmony/enhanced/classlib/trunk/make/depends.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message