harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r415668 - in /incubator/harmony/enhanced/classlib/trunk/modules/luni: build.xml make/build.xml make/common/ make/hyproperties.xml
Date Tue, 20 Jun 2006 14:45:46 GMT
Author: hindessm
Date: Tue Jun 20 07:45:45 2006
New Revision: 415668

URL: http://svn.apache.org/viewvc?rev=415668&view=rev
Log:
Move luni build.xml up one level.

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

Added: incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=415668&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml Tue Jun 20 07:45:45 2006
@@ -0,0 +1,263 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2005, 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="LUNI Build" default="build" basedir=".">
+    <description>Build for LUNI 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" />
+
+    <target name="build" depends="compile.java, build.jar, copy.resources" />
+
+    <target name="copy.native.includes">
+	<copy todir="${hy.hdk}/include" overwrite="yes">
+	    <fileset dir="${hy.luni.src.main.native}/include/shared">
+		<include name="harmony.h" />
+		<include name="vmi.h" />
+		<include name="hyvmls.h" />
+		<include name="hypool.h" />
+		<include name="hyport.h" />
+		<include name="hythread.h" />
+		<include name="hycomp.h" />
+		<include name="hysocket.h" />
+		<include name="hyporterror.h" />
+		<include name="gp.h" />
+	    </fileset>
+	</copy>
+	<copy todir="${hy.jdk}/include" overwrite="yes">
+	    <fileset dir="${hy.luni.src.main.native}/include/shared">
+		<include name="jni.h" />
+		<include name="jniport.h" />
+	    </fileset>
+	</copy>
+
+	<antcall target="copy.native.includes.windows" />
+	<antcall target="copy.native.includes.linux" />
+    </target>
+	
+    <target name="copy.native.includes.windows" if="is.windows">
+	<copy todir="${hy.hdk}/include" overwrite="yes">
+	    <fileset dir="${hy.luni.src.main.native}/include/windows">
+    		<include name="hymutex.h" />
+    		<include name="jclprots.h" />
+    	    </fileset>
+	</copy>
+    </target>
+	
+    <target name="copy.native.includes.linux" if="is.linux">
+	<copy todir="${hy.hdk}/include" overwrite="yes">
+	    <fileset dir="${hy.luni.src.main.native}/include/linux">
+    		<include name="hymutex.h" />
+    		<include name="jclprots.h" />
+    	    </fileset>
+	</copy>
+    </target>
+	
+    <target name="test" depends="build, compile.tests, run.tests" />
+
+    <target name="clean">
+        <delete failonerror="false">
+            <fileset dir="${hy.build}"
+                     includesfile="${hy.luni}/make/patternset.txt" />
+            <fileset dir="${hy.luni.bin.test}" />
+        </delete>
+    	<antcall target="clean.native.includes" />
+    </target>
+	
+    <target name="clean.native.includes">
+	<delete failonerror="false">
+	    <fileset dir="${hy.hdk}/include">
+		<include name="harmony.h" />
+		<include name="vmi.h" />
+		<include name="hyvmls.h" />
+		<include name="hypool.h" />
+		<include name="hyport.h" />
+		<include name="hythread.h" />
+		<include name="hymutex.h" />
+		<include name="jclprots.h" />
+		<include name="hycomp.h" />
+		<include name="hysocket.h" />
+		<include name="hyporterror.h" />
+		<include name="gp.h" />
+	    </fileset>
+	</delete>
+	<delete failonerror="false">
+	    <fileset dir="${hy.jdk}/include">
+		<include name="jni.h" />
+		<include name="jniport.h" />
+	    </fileset>
+	</delete>
+    </target>
+
+    <target name="compile.java" depends="copy.resources">
+        <echo message="Compiling LUNI classes" />
+
+        <mkdir dir="${hy.build}" />
+
+        <javac sourcepath=""
+               srcdir="${hy.luni.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/luni.jar"
+             manifest="${hy.luni}/META-INF/MANIFEST.MF">
+            <fileset dir="${hy.build}"
+                     includesfile="${hy.luni}/make/patternset.txt" />
+        </jar>
+    </target>
+
+    <target name="compile.tests" depends="copy.test.resources">
+        <echo message="Compiling LUNI tests" />
+
+        <mkdir dir="${hy.luni.bin.test}" />
+
+        <javac srcdir="${hy.luni.src.test.java}"
+               destdir="${hy.luni.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.tests.support.bin}" />
+        </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.luni.bin.test}"
+               jvm="${test.jre.home}/bin/java">
+
+            <jvmarg value="-showversion" />
+
+            <!-- Required by various tests that set security manager etc -->
+            <jvmarg value="-Djava.security.policy=../../../../support/src/test/resources/config/testing.policy"
/>
+
+            <!-- Required for running the java.net unit tests -->
+            <jvmarg value="-Dtest.ini.file=../../../../support/src/test/resources/config/localhosttest.ini"
/>
+
+            <env key="JAVA_HOME" value="${test.jre.home}" />
+
+            <classpath>
+                <pathelement path="${hy.luni.bin.test}" />
+                <pathelement path="${hy.tests.support.bin}" />
+            </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.luni.src.test.java}">
+                    <include name="**/*Test.java" />
+                    <exclude name="tests/api/java/lang/IllegalThreadStateExceptionTest.java"
/>
+                    <exclude name="tests/api/java/lang/ThreadTest.java" />
+                    <exclude name="tests/api/java/io/InputStreamReaderTest.java" />
+                    <exclude name="tests/api/java/io/ObjectInputStreamTest.java" />
+                    <exclude name="tests/api/java/io/ObjectOutputStreamTest.java" />
+                    <exclude name="tests/api/java/io/OutputStreamWriterTest.java" />
+                    <exclude name="tests/api/java/io/PipedInputStreamTest.java" />
+                    <exclude name="tests/api/java/lang/AssertionErrorTest.java" />
+                    <exclude name="tests/api/java/lang/ClassTest.java" />
+                    <exclude name="tests/api/java/lang/ProcessTest.java" />
+                    <exclude name="tests/api/java/lang/StringTest.java" />
+                    <exclude name="tests/api/java/net/DatagramSocketTest.java" />
+                    <exclude name="tests/api/java/net/HttpURLConnectionTest.java" />
+                    <exclude name="tests/api/java/net/InetAddressTest.java" />
+                    <exclude name="tests/api/java/net/JarURLConnectionTest.java" />
+                    <exclude name="tests/api/java/net/MulticastSocketTest.java" />
+                    <exclude name="tests/api/java/net/ServerSocketTest.java" />
+                    <exclude name="tests/api/java/net/SocketImplTest.java" />
+                    <exclude name="tests/api/java/net/SocketPermissionTest.java" />
+                    <exclude name="tests/api/java/net/SocketTest.java" />
+                    <exclude name="tests/api/java/net/URLClassLoaderTest.java" />
+                    <exclude name="tests/api/java/net/URLConnectionTest.java" />
+                    <exclude name="tests/api/java/net/URLTest.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" >luni
+</echo>
+    </target>
+
+    <target name="touch-errors-file" if="test.errors">
+        <echo file="${hy.tests.reports}/test.errors"
+            append="true" >luni
+</echo>
+    </target>
+
+    <target name="copy.resources">
+    	<mkdir dir="${hy.luni.bin.main}" />
+        <copy todir="${hy.luni.bin.main}" includeemptydirs="false">
+            <fileset dir="${hy.luni.src.main.java}">
+                <exclude name="**/*.java" />
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="copy.test.resources">
+        <mkdir dir="${hy.luni.bin.test}" />
+        <copy todir="${hy.luni.bin.test}" includeemptydirs="false">
+            <fileset dir="${hy.luni.src.test.resources}">
+                <exclude name="**/*.java" />
+            </fileset>
+        </copy>
+    </target>
+
+</project>

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



Mime
View raw message