You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2006/06/20 17:13:07 UTC

svn commit: r415698 - in /incubator/harmony/enhanced/classlib/trunk/modules/x-net: build.xml make/build.xml make/common/ make/hyproperties.xml

Author: hindessm
Date: Tue Jun 20 08:13:07 2006
New Revision: 415698

URL: http://svn.apache.org/viewvc?rev=415698&view=rev
Log:
Move x-net build.xml up one level.

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml   (with props)
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/hyproperties.xml
      - copied unchanged from r415565, incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/hyproperties.xml
Removed:
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/x-net/make/common/

Added: incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml?rev=415698&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml Tue Jun 20 08:13:07 2006
@@ -0,0 +1,168 @@
+<?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="X-NET Build" default="build" basedir=".">
+    <description>Build for X-NET component</description>
+
+    <!-- import common properties -->
+    <import file="${basedir}/../../make/properties.xml" />
+
+    <!-- set global properties for this build. -->
+    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
+
+    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+	     use the Eclipse Java compiler. -->
+    <property name="build.compiler" value="modern" />
+
+    <property file="../../make/depends.properties" />
+
+    <target name="build" depends="compile.java, build.jar" />
+
+    <target name="test" depends="build, compile.tests, run.tests" />
+
+    <target name="clean">
+        <delete failonerror="false">
+            <fileset dir="${hy.build}"
+                     includesfile="${hy.x-net}/make/patternset.txt" />
+            <fileset dir="${hy.x-net.bin.test}" />
+        </delete>
+    </target>
+
+    <target name="compile.java">
+        <echo message="Compiling X-NET classes" />
+
+        <mkdir dir="${hy.build}" />
+
+        <javac sourcepath=""
+            srcdir="${hy.x-net.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/${hy.x-net.packaging.jarname}.jar"
+            manifest="${hy.x-net}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.build}"
+                     includesfile="${hy.x-net}/make/patternset.txt" />
+        </jar>
+    </target>
+
+    <target name="compile.tests">
+        <echo message="Compiling X-NET tests" />
+
+        <mkdir dir="${hy.x-net.bin.test}" />
+
+        <javac 	destdir="${hy.x-net.bin.test}"
+            source="${hy.javac.source}"
+            target="${hy.javac.target}"
+            debug="${hy.javac.debug}">
+
+            <!-- FIXME: X-NET tests should not reach into security module code -->
+            <src>
+                <pathelement location="${hy.x-net.src.test.java}"/>
+                <pathelement location="${hy.x-net}/../security/src/test/support/common/java"/>
+            </src>
+
+            <include name="javax/net/**/*Test*.java" />
+            <include name="org/apache/harmony/security/test/**/*" />
+
+            <bootclasspath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+        </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.x-net.bin.test}"
+            jvm="${test.jre.home}/bin/java">
+
+            <jvmarg value="-showversion"/>
+
+            <!-- Required for running the serialization unit tests -->
+            <!-- Note: will be deleted after improving             -->
+            <!-- SerializationTest support class: all resource     -->
+            <!-- files will be placed on the classpath             -->
+            <jvmarg value="-DRESOURCE_DIR=${hy.x-net.src.test.java}"/>
+
+            <!--  run tests via bootclasspath  --> 
+            <jvmarg value="-Xbootclasspath/a:${hy.x-net.bin.test}${path.separator}../../../../${junit.jar}${path.separator}../../../../build/tests" /> 
+
+    		<env key="JAVA_HOME" value="${test.jre.home}"/>
+
+            <!--classpath-->
+                <!--pathelement path="${hy.x-net.bin.test}"/-->
+            <!--/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.x-net.src.test.java}">
+                    <include name="**/*Test.java"/>
+
+                    <!-- Harmony exclude list -->
+                    <!-- FIXME: The following tests require JSSE provider -->
+                    <exclude name="javax/net/ssl/serialization/HandshakeCompletedEventTest.java"/>
+                    <exclude name="javax/net/ssl/serialization/SSLSessionBindingEventTest.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" >x-net
+</echo>
+    </target>
+
+    <target name="touch-errors-file" if="test.errors">
+        <echo file="${hy.tests.reports}/test.errors"
+            append="true" >x-net
+</echo>
+    </target>
+
+</project>

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