harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r417387 - /incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml
Date Tue, 27 Jun 2006 09:35:47 GMT
Author: tellison
Date: Tue Jun 27 02:35:47 2006
New Revision: 417387

URL: http://svn.apache.org/viewvc?rev=417387&view=rev
Log:
Reformatting and
Excluding SocketChannelTest that is regularly failing (on windows) -- the test case needs
attention


Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml?rev=417387&r1=417386&r2=417387&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml Tue Jun 27 02:35:47 2006
@@ -17,170 +17,168 @@
 -->
 
 <project name="NIO Build" default="build" basedir=".">
-    <description>Build for NIO component</description>
+	<description>Build for NIO component</description>
 
-    <!-- import common properties -->
-    <import file="${basedir}/../../make/properties.xml" />
+	<!-- import common properties -->
+	<import file="${basedir}/../../make/properties.xml" />
 
-    <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
+	<!-- set global properties for this build. -->
+	<xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
-    <fileset id="classes" dir="${hy.build}">
-        <includesfile name="${hy.nio}/make/patternset.txt" />
-        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
-        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
-    </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+	<fileset id="classes" dir="${hy.build}">
+		<includesfile name="${hy.nio}/make/patternset.txt" />
+		<excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+		<excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+	</fileset>
+
+	<!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
 	     use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
+	<property name="build.compiler" value="modern" />
+
+	<target name="build" depends="compile.java, build.jar" />
 
-    <target name="build" depends="compile.java, build.jar" />
+	<target name="test" depends="build, compile.tests, run.tests" />
 
-    <target name="test" depends="build, compile.tests, run.tests" />
+	<!-- Build natives.-->
+	<target name="build.native">
+		<exec failonerror="true"
+			executable="${make.command}"
+			dir="${hy.nio.src.main.native}/nio/${hy.os}">
+
+			<env key="HY_HDK" value="${hy.hdk}" />
+		</exec>
+
+		<!-- Copy the built shared libs over to the jre/bin dir -->
+		<copy todir="${hy.jdk}/jre/bin" overwrite="yes">
+			<fileset dir="${hy.nio.src.main.native}/nio">
+				<patternset includes="*${shlib.suffix}*" />
+			</fileset>
+		</copy>
+	</target>
+
+	<target name="clean">
+		<delete includeemptydirs="true" failonerror="false">
+			<fileset refid="classes" />
+			<fileset dir="${hy.nio.bin.test}" />
+		</delete>
+	</target>
+
+	<!-- Clean natives. -->
+	<target name="clean.native">
+		<exec failonerror="true"
+			executable="${make.command}"
+			dir="${hy.nio.src.main.native}/nio/${hy.os}">
+
+			<env key="HY_HDK" value="${hy.hdk}" />
+			<arg line="clean" />
+		</exec>
+	</target>
+
+
+	<target name="compile.java">
+		<echo message="Compiling NIO classes" />
+
+		<mkdir dir="${hy.build}" />
+
+		<javac sourcepath=""
+			srcdir="${hy.nio.src.main.java}"
+			destdir="${hy.build}"
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
+			debug="${hy.javac.debug}">
+
+			<bootclasspath>
+				<fileset dir="${hy.jdk}/jre/lib/boot">
+					<include name="**/*.jar" />
+				</fileset>
+			</bootclasspath>
+		</javac>
+	</target>
+
+	<target name="build.jar">
+		<jar destfile="${hy.jdk}/jre/lib/boot/nio.jar"
+			manifest="${hy.nio}/META-INF/MANIFEST.MF">
+
+			<fileset refid="classes" />
+		</jar>
+	</target>
+
+	<target name="compile.tests" depends="copy.test.resources">
+		<echo message="Compiling NIO tests" />
+
+		<mkdir dir="${hy.nio.bin.test}" />
+
+		<javac srcdir="${hy.nio.src.test.java}"
+			destdir="${hy.nio.bin.test}"
+			sourcepath=""
+			source="${hy.javac.source}"
+			target="${hy.javac.target}"
+			debug="${hy.javac.debug}">
+
+			<bootclasspath>
+				<fileset dir="${hy.jdk}/jre/lib/boot">
+					<include name="**/*.jar" />
+				</fileset>
+			</bootclasspath>
+			<classpath location="${hy.hdk}/build/test/support.jar" />
+		</javac>
+	</target>
+
+	<target name="run.tests">
+		<mkdir dir="${hy.tests.reports}" />
+
+		<property name="test.jre.home" value="${hy.jdk}/jre" />
+
+		<junit fork="yes"
+			forkmode="once"
+			printsummary="withOutAndErr"
+			errorproperty="test.errors"
+			failureproperty="test.failures"
+			showoutput="on"
+			dir="${hy.nio.bin.test}"
+			jvm="${test.jre.home}/bin/java">
+
+			<jvmarg value="-showversion" />
+
+			<env key="JAVA_HOME" value="${test.jre.home}" />
+
+			<classpath>
+				<pathelement path="${hy.nio.bin.test}" />
+				<pathelement path="${hy.hdk}/build/test/support.jar" />
+			</classpath>
+
+			<formatter type="xml" />
+
+			<test name="${test.case}" todir="${hy.tests.reports}" if="test.case" />
+
+			<batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
+				<fileset dir="${hy.nio.src.test.java}">
+					<include name="**/*Test.java" />
+					<exclude name="**/SocketChannelTest.java" />
+				</fileset>
+			</batchtest>
+		</junit>
+		<antcall target="touch-failures-file" />
+		<antcall target="touch-errors-file" />
+	</target>
 
-     <!-- Build natives.-->
-     <target name="build.native">
- 	<exec failonerror="true" 
-               executable="${make.command}" 
-               dir="${hy.nio.src.main.native}/nio/${hy.os}">
-             <env key="HY_HDK" value="${hy.hdk}" />
-         </exec>
- 
- 	<!-- Copy the built shared libs over to the jre/bin dir -->
- 	<copy todir="${hy.jdk}/jre/bin" overwrite="yes">
-             <fileset dir="${hy.nio.src.main.native}/nio">
-                 <patternset includes="*${shlib.suffix}*" />
-             </fileset>
-         </copy>
-     </target>
-
-    <target name="clean">
-        <delete includeemptydirs="true" failonerror="false">
-            <fileset refid="classes" />
-            <fileset dir="${hy.nio.bin.test}" />
-        </delete>
-    </target>
-
-     <!-- Clean natives. -->
-     <target name="clean.native">
- 	<exec failonerror="true" 
-               executable="${make.command}" 
-               dir="${hy.nio.src.main.native}/nio/${hy.os}">
-             <env key="HY_HDK" value="${hy.hdk}" />
- 	    <arg line="clean" />
-         </exec>
-     </target>
-
-
-    <target name="compile.java">
-        <echo message="Compiling NIO classes" />
-
-        <mkdir dir="${hy.build}" />
-
-        <javac sourcepath=""
-               srcdir="${hy.nio.src.main.java}"
-               destdir="${hy.build}"
-               source="${hy.javac.source}"
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </javac>
-    </target>
-
-    <target name="build.jar">
-        <jar destfile="${hy.jdk}/jre/lib/boot/nio.jar"
-             manifest="${hy.nio}/META-INF/MANIFEST.MF">
-            <fileset refid="classes" />
-        </jar>
-    </target>
-
-    <target name="compile.tests" depends="copy.test.resources" >
-        <echo message="Compiling NIO tests" />
-
-        <mkdir dir="${hy.nio.bin.test}" />
-
-        <javac srcdir="${hy.nio.src.test.java}"
-               destdir="${hy.nio.bin.test}"
-               sourcepath=""
-               source="${hy.javac.source}"
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-            <classpath location="${hy.hdk}/build/test/support.jar" />
-        </javac>
-    </target>
-
-    <target name="run.tests">
-
-        <mkdir dir="${hy.tests.reports}" />
-
-        <property name="test.jre.home" value="${hy.jdk}/jre" />
-
-        <junit fork="yes"
-               forkmode="once"
-               printsummary="withOutAndErr"
-               errorproperty="test.errors"
-               failureproperty="test.failures"
-               showoutput="on"
-               dir="${hy.nio.bin.test}"
-               jvm="${test.jre.home}/bin/java">
-
-            <jvmarg value="-showversion"/>
-
-            <env key="JAVA_HOME" value="${test.jre.home}"/>
-
-            <classpath>
-                <pathelement path="${hy.nio.bin.test}"/>
-                <pathelement path="${hy.hdk}/build/test/support.jar" />
-            </classpath>
-
-            <formatter type="xml" />
-
-            <test name="${test.case}" todir="${hy.tests.reports}"
-                 if="test.case" />
-
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
-                unless="test.case">
-
-                <fileset dir="${hy.nio.src.test.java}">
-                    <include name="**/*Test.java"/>
-                </fileset>
-            </batchtest>
-        </junit>
-        <antcall target="touch-failures-file" />
-        <antcall target="touch-errors-file" />
-    </target>
-
-    <target name="touch-failures-file" if="test.failures">
-        <echo file="${hy.tests.reports}/test.failures"
-            append="true" >nio
+	<target name="touch-failures-file" if="test.failures">
+		<echo file="${hy.tests.reports}/test.failures" append="true">nio
 </echo>
-    </target>
+	</target>
 
-    <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
-            append="true" >nio
+	<target name="touch-errors-file" if="test.errors">
+		<echo file="${hy.tests.reports}/test.errors" append="true">nio
 </echo>
-    </target>
+	</target>
 
-    <target name="copy.test.resources">
-        <mkdir dir="${hy.nio.bin.test}" />
-        <copy todir="${hy.nio.bin.test}" includeemptydirs="false">
-            <fileset dir="${hy.nio.src.test.resources}">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
+	<target name="copy.test.resources">
+		<mkdir dir="${hy.nio.bin.test}" />
+		<copy todir="${hy.nio.bin.test}" includeemptydirs="false">
+			<fileset dir="${hy.nio.src.test.resources}">
+				<exclude name="**/*.java" />
+			</fileset>
+		</copy>
+	</target>
 
 </project>



Mime
View raw message