You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2006/03/28 23:03:30 UTC
svn commit: r389603 - in /incubator/harmony/enhanced/classlib/trunk: make/
make/patternsets/ modules/awt/ modules/awt/META-INF/ modules/awt/make/
modules/awt/make/common/ modules/awt/src/ modules/awt/src/main/
modules/awt/src/main/java/ modules/awt/src...
Author: tellison
Date: Tue Mar 28 13:03:27 2006
New Revision: 389603
URL: http://svn.apache.org/viewcvs?rev=389603&view=rev
Log:
Moved awt stubs out from beans module.
Added:
incubator/harmony/enhanced/classlib/trunk/make/patternsets/awt.txt
incubator/harmony/enhanced/classlib/trunk/modules/awt/
incubator/harmony/enhanced/classlib/trunk/modules/awt/META-INF/
incubator/harmony/enhanced/classlib/trunk/modules/awt/META-INF/MANIFEST.MF
incubator/harmony/enhanced/classlib/trunk/modules/awt/make/
incubator/harmony/enhanced/classlib/trunk/modules/awt/make/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/
incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/hyproperties.xml
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/java/
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/java/awt/
- copied from r389598, incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/awt/
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/java/
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/java/org/
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/java/org/apache/
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/java/org/apache/harmony/
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/java/org/apache/harmony/tests/
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/java/org/apache/harmony/tests/awt/
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/java/org/apache/harmony/tests/awt/AllTests.java
Removed:
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/awt/
Modified:
incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
Modified: incubator/harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=389603&r1=389602&r2=389603&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-java.xml Tue Mar 28 13:03:27 2006
@@ -102,6 +102,14 @@
excludesfile="${components.patternsets}/kernel.txt" />
</jar>
+ <!-- Create awt jar -->
+ <jar destfile="${components.output}/awt.jar"
+ manifest="modules/awt/META-INF/MANIFEST.MF">
+ <fileset dir="${build.output}"
+ includesfile="${components.patternsets}/awt.txt"
+ excludesfile="${components.patternsets}/kernel.txt" />
+ </jar>
+
<!-- Create beans jar -->
<jar destfile="${components.output}/beans.jar"
manifest="modules/beans/META-INF/MANIFEST.MF">
@@ -232,6 +240,7 @@
<javac destdir="${build.output}" source="1.4" target="1.4" debug="on">
<src path="modules/applet/src/main/java" />
+ <src path="modules/awt/src/main/java" />
<src path="modules/beans/src/main/java" />
<src path="modules/kernel/src/main/java" />
<src path="modules/regex/src/main/java" />
@@ -280,6 +289,12 @@
<copy todir="${build.output}" includeemptydirs="false">
<fileset dir="modules/archive/src/main/java">
+ <exclude name="**/*.java" />
+ </fileset>
+ <fileset dir="modules/applet/src/main/java">
+ <exclude name="**/*.java" />
+ </fileset>
+ <fileset dir="modules/awt/src/main/java">
<exclude name="**/*.java" />
</fileset>
<fileset dir="modules/beans/src/main/java">
Added: incubator/harmony/enhanced/classlib/trunk/make/patternsets/awt.txt
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/make/patternsets/awt.txt?rev=389603&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/patternsets/awt.txt (added)
+++ incubator/harmony/enhanced/classlib/trunk/make/patternsets/awt.txt Tue Mar 28 13:03:27 2006
@@ -0,0 +1,16 @@
+# 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.
+
+java/awt/*
+java/awt/event/*
Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/awt/META-INF/MANIFEST.MF?rev=389603&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/META-INF/MANIFEST.MF (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/META-INF/MANIFEST.MF Tue Mar 28 13:03:27 2006
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Harmony AWT
+Bundle-SymbolicName: org.apache.harmony.awt
+Bundle-Version: 1.0.0
+Bundle-ClassPath: .
+Eclipse-JREBundle: true
+Import-Package: java.lang
+Export-Package: java.awt,
+ java.awt.event
+
Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/make/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/awt/make/build.xml?rev=389603&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/make/build.xml (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/make/build.xml Tue Mar 28 13:03:27 2006
@@ -0,0 +1,115 @@
+<?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="AWT Build" default="build" basedir="..">
+ <description>Build for AWT component</description>
+
+ <!-- set global properties for this build. -->
+ <xmlproperty file="make/common/hyproperties.xml" semanticAttributes="true"/>
+ <property environment="env"/>
+
+ <!-- Determine the (normalized) operating system family -->
+ <condition property="if.win">
+ <os family="Windows" />
+ </condition>
+ <condition property="hy.os_family" value="windows">
+ <isset property="if.win"/>
+ </condition>
+
+ <condition property="if.linux">
+ <and>
+ <os name="linux" />
+ <os family="unix" />
+ </and>
+ </condition>
+ <condition property="hy.os_family" value="linux">
+ <isset property="if.linux"/>
+ </condition>
+
+
+ <!-- Determine the (normalized) processor family -->
+ <condition property="if.x86_64">
+ <contains string="${os.arch}" substring="x86_64"/>
+ </condition>
+ <condition property="hy.cpu_family" value="x86_64">
+ <isset property="if.x86_64"/>
+ </condition>
+
+ <condition property="if.x86">
+ <and>
+ <contains string="${os.arch}" substring="86"/>
+ <not>
+ <isset property="if.x86_64"/>
+ </not>
+ </and>
+ </condition>
+ <condition property="hy.cpu_family" value="x86">
+ <isset property="if.x86"/>
+ </condition>
+
+ <condition property="if.ipf">
+ <contains string="${os.arch}" substring="ia64"/>
+ </condition>
+ <condition property="hy.cpu_family" value="ipf">
+ <isset property="if.ipf"/>
+ </condition>
+
+ <!-- Define the platform property dependant upon the OS and platform -->
+ <property name="hy.platform" value="${hy.os_family}.${hy.cpu_family}"/>
+
+ <!-- Set the java compiler to be the Eclipse Java compiler -->
+ <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter" />
+
+
+ <target name="init">
+ <tstamp>
+ <format property="build-date" pattern="yyyyMMdd" locale="en" />
+ </tstamp>
+ <tstamp>
+ <format property="build-time" pattern="yyyyMMdd_HHmm" />
+ </tstamp>
+ <echo message="build-date=${build-date}" />
+ <echo message="build-time=${build-time}" />
+ <echo message="on platform=${os.name} version=${os.version} arch=${os.arch}" />
+
+ <property name="java.debug.option" value="on" />
+ <property name="native.debug.option" value="on" />
+
+ <property name="source.ver" value="1.4" />
+ </target>
+
+ <!-- AWT TARGETS -->
+
+ <target name="build" depends="init">
+ <ant dir="make/common" target="compile.java" />
+ <ant dir="make/common" target="build.jar" />
+ <!-- <ant dir="make/platform/${hy.platform}" target="compile.native" /> -->
+ <ant dir="make/common" target="copy.resources" />
+ </target>
+
+
+ <target name="test" depends="build">
+ <ant dir="make/common" target="compile.tests" />
+ <ant dir="make/common" target="run.tests" />
+ </target>
+
+ <target name="clean">
+ <delete dir="${hy.awt.bin.main}"/>
+ <delete dir="${hy.awt.bin.test}"/>
+ </target>
+
+</project>
Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml?rev=389603&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/build.xml Tue Mar 28 13:03:27 2006
@@ -0,0 +1,101 @@
+<?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="Common_AWT_Build">
+
+ <target name="compile.java" description="Compile AWT java code">
+ <echo message="Compiling AWT classes from ${hy.awt.src.main.java}" />
+
+ <mkdir dir="${hy.awt.bin.main}" />
+
+ <javac sourcepath=""
+ srcdir="${hy.awt.src.main.java}"
+ destdir="${hy.awt.bin.main}"
+ source="${source.ver}"
+ debug="${java.debug.option}">
+
+ <bootclasspath>
+ <fileset dir="${hy.target}/jre/lib/boot">
+ <include name="*.jar" />
+ </fileset>
+ </bootclasspath>
+ </javac>
+ </target>
+
+ <target name="build.jar">
+ <jar destfile="${hy.target}/jre/lib/boot/awt.jar"
+ manifest="${hy.awt}/META-INF/MANIFEST.MF">
+ <fileset dir="${hy.awt.bin.main}" />
+ </jar>
+ </target>
+
+
+ <target name="compile.tests">
+ <echo message="Compiling AWT tests from ${hy.awt.src.test.java}" />
+
+ <mkdir dir="${hy.awt.bin.test}" />
+
+ <javac srcdir="${hy.awt.src.test.java}"
+ destdir="${hy.awt.bin.test}"
+ sourcepath=""
+ source="${source.ver}"
+ debug="${java.debug.option}">
+
+ <bootclasspath>
+ <fileset dir="${hy.target}/jre/lib/boot">
+ <include name="*.jar" />
+ </fileset>
+ </bootclasspath>
+ <classpath location="../../../../build/tests" />
+ </javac>
+ </target>
+
+
+ <target name="run.tests">
+
+ <mkdir dir="${hy.tests.reports}" />
+
+ <junit fork="yes"
+ forkmode="once"
+ printsummary="withOutAndErr"
+ errorproperty="test.error"
+ showoutput="on"
+ dir="${hy.awt.bin.test}"
+ jvm="${hy.target}/jre/bin/java">
+
+ <jvmarg value="-showversion"/>
+
+ <env key="JAVA_HOME" value="${hy.target}/jre"/>
+
+ <classpath>
+ <pathelement path="${hy.awt.bin.test}"/>
+ </classpath>
+
+ <formatter type="xml" />
+
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no">
+ <fileset dir="${hy.awt.src.test.java}"/>
+ </batchtest>
+ </junit>
+ </target>
+
+
+ <target name="copy.resources">
+ <!-- Nothing for AWT -->
+ </target>
+</project>
+
Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/hyproperties.xml
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/hyproperties.xml?rev=389603&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/hyproperties.xml (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/make/common/hyproperties.xml Tue Mar 28 13:03:27 2006
@@ -0,0 +1,44 @@
+<?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.
+-->
+
+<hy>
+ <awt location=".">
+ <src>
+ <main>
+ <java location="src/main/java" />
+ <resources location="src/main/resources" />
+ </main>
+ <test>
+ <java location="src/test/java" />
+ <resources location="src/main/resources" />
+ </test>
+ <natives location="src/natives" />
+ </src>
+ <bin>
+ <main location="bin/main" />
+ <test location="bin/test" />
+ </bin>
+ <packaging>
+ </packaging>
+ </awt>
+
+ <target location="../../deploy" />
+
+ <tests>
+ <reports location="../../build/test_report" />
+ </tests>
+</hy>
Added: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/java/org/apache/harmony/tests/awt/AllTests.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/java/org/apache/harmony/tests/awt/AllTests.java?rev=389603&view=auto
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/java/org/apache/harmony/tests/awt/AllTests.java (added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/test/java/org/apache/harmony/tests/awt/AllTests.java Tue Mar 28 13:03:27 2006
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+package org.apache.harmony.tests.awt;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTests {
+
+ public static void main(String[] args) {
+ junit.textui.TestRunner.run(AllTests.suite());
+ }
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite(
+ "Test for org.apache.harmony.tests.awt");
+ //$JUnit-BEGIN$
+ //$JUnit-END$
+ return suite;
+ }
+
+}