harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r430827 [2/2] - in /incubator/harmony/enhanced/classlib/trunk: make/ modules/accessibility/ modules/annotation/ modules/applet/ modules/archive/ modules/auth/ modules/awt/ modules/beans/ modules/crypto/ modules/instrument/ modules/jndi/ mod...
Date Fri, 11 Aug 2006 17:00:17 GMT
Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/build.xml Fri Aug 11 10:00:15 2006
@@ -1,158 +1,161 @@
-<?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="SQL Build" default="build" basedir=".">
-    <description>Build for SQL component</description>
-
-    <!-- import common properties -->
-    <import file="${basedir}/../../make/properties.xml" />
-
-    <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
-
-    <fileset id="classes" dir="${hy.build}">
-        <includesfile name="${hy.sql}/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" />
-
-    <target name="build" depends="compile.java, build.jar" />
-
-    <target name="test" depends="build, compile.tests, run.tests" />
-
-    <target name="clean">
-        <delete failonerror="false">
-            <fileset refid="classes" />
-            <fileset dir="${hy.sql.bin.test}" />
-        </delete>
-    </target>
-
-    <target name="compile.java" depends="copy.resources">
-        <echo message="Compiling SQL classes" />
-
-        <javac sourcepath=""
-               srcdir="${hy.sql.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="copy.resources">
-    	<mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.sql.src.main.java}">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-	</target>
-
-    <target name="build.jar">
-        <jar destfile="${hy.jdk}/jre/lib/boot/sql.jar"
-             manifest="${hy.sql}/META-INF/MANIFEST.MF">
-            <fileset refid="classes" />
-        </jar>
-    </target>
-
-    <target name="compile.tests">
-        <echo message="Compiling SQL tests" />
-
-        <mkdir dir="${hy.sql.bin.test}" />
-
-        <javac srcdir="${hy.sql.src.test.java}"
-               destdir="${hy.sql.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="../../build/tests" />
-        </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.sql.bin.test}"
-               jvm="${test.jre.home}/bin/java">
-
-            <jvmarg value="-showversion"/>
-
-            <env key="JAVA_HOME" value="${test.jre.home}"/>
-
-            <classpath>
-                <pathelement path="${hy.sql.bin.test}"/>
-            </classpath>
-            <classpath location="../../build/tests" />
-
-            <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.sql.src.test.java}">
-                    <include name="**/*Test.java"/>
-
-                    <!-- This test is empty -->
-                    <exclude name="org/apache/harmony/sql/tests/java/sql/ArrayTest.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">sql${line.separator}</echo>
-    </target>
-
-    <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
-            append="true">sql${line.separator}</echo>
-    </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="SQL Build" default="build" basedir=".">
+    <description>Build for SQL component</description>
+
+    <!-- import common properties -->
+    <import file="${basedir}/../../make/properties.xml" />
+
+    <!-- set global properties for this build. -->
+    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
+
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.sql}/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" />
+
+    <target name="build" depends="compile.java, build.jar" />
+
+    <target name="test" depends="build, compile.tests, run.tests" />
+
+    <target name="clean">
+        <delete failonerror="false">
+            <fileset refid="classes" />
+            <fileset dir="${hy.sql.bin.test}" />
+        </delete>
+    </target>
+
+    <target name="compile.java" depends="copy.resources">
+        <echo message="Compiling SQL classes" />
+
+        <javac sourcepath=""
+               srcdir="${hy.sql.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="copy.resources">
+    	<mkdir dir="${hy.build}" />
+        <copy todir="${hy.build}" includeemptydirs="false">
+            <fileset dir="${hy.sql.src.main.java}">
+                <exclude name="**/*.java" />
+            </fileset>
+        </copy>
+	</target>
+
+    <target name="build.jar" depends="svn-info">
+        <jar destfile="${hy.jdk}/jre/lib/boot/sql.jar"
+             manifest="${hy.sql}/META-INF/MANIFEST.MF">
+            <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="compile.tests">
+        <echo message="Compiling SQL tests" />
+
+        <mkdir dir="${hy.sql.bin.test}" />
+
+        <javac srcdir="${hy.sql.src.test.java}"
+               destdir="${hy.sql.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="../../build/tests" />
+        </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.sql.bin.test}"
+               jvm="${test.jre.home}/bin/java">
+
+            <jvmarg value="-showversion"/>
+
+            <env key="JAVA_HOME" value="${test.jre.home}"/>
+
+            <classpath>
+                <pathelement path="${hy.sql.bin.test}"/>
+            </classpath>
+            <classpath location="../../build/tests" />
+
+            <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.sql.src.test.java}">
+                    <include name="**/*Test.java"/>
+
+                    <!-- This test is empty -->
+                    <exclude name="org/apache/harmony/sql/tests/java/sql/ArrayTest.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">sql${line.separator}</echo>
+    </target>
+
+    <target name="touch-errors-file" if="test.errors">
+        <echo file="${hy.tests.reports}/test.errors"
+            append="true">sql${line.separator}</echo>
+    </target>
+
+</project>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/suncompat/build.xml Fri Aug 11 10:00:15
2006
@@ -73,10 +73,13 @@
         </copy>
 	</target>
 
-    <target name="build.jar">
+    <target name="build.jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/suncompat.jar"
              manifest="${hy.suncompat}/META-INF/MANIFEST.MF">
             <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/swing/build.xml Fri Aug 11 10:00:15
2006
@@ -1,188 +1,191 @@
-<?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="SWING Build" default="build" basedir=".">
-    <description>Build for SWING component</description>
-
-    <!-- import common properties -->
-    <import file="${basedir}/../../make/properties.xml" />
-
-    <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
-
-    <fileset id="classes" dir="${hy.build}">
-        <includesfile name="${hy.swing}/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="hy.swing.src.main.java.platform"
-              value="${hy.swing.src.main.java}/../${hy.os}" />
-
-    <property name="hy.swing.src.test.java.platform"
-              value="${hy.swing.src.test.java}/../${hy.os}" />
-
-    <target name="build" depends="compile.java, build.jar" />
-
-    <target name="test" depends="build, run.tests" />
-
-    <target name="clean">
-        <delete failonerror="false">
-            <fileset refid="classes" />
-            <fileset dir="${hy.swing.bin.test}" />
-        </delete>
-    </target>
-
-    <target name="compile.java">
-        <echo message="Compiling SWING classes" />
-
-        <mkdir dir="${hy.build}" />
-
-        <javac sourcepath=""
-               destdir="${hy.build}"
-               source="${hy.javac.source}"
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-            <src>
-                <pathelement location="${hy.swing.src.main.java}"/>
-                <pathelement location="${hy.swing.src.main.java.platform}" />
-            </src>
-
-            <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.swing.packaging.jarname}.jar"
-             manifest="${hy.swing}/META-INF/MANIFEST.MF">
-            <fileset refid="classes" />
-        </jar>
-    </target>
-
-    <target name="compile.tests">
-        <echo message="Compiling SWING tests" />
-
-        <mkdir dir="${hy.swing.bin.test}" />
-
-        <javac srcdir="${hy.swing.src.test.api}/java/common"
-               destdir="${hy.swing.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="../../build/tests" />
-            <classpath location="${hy.hdk}/build/test/support.jar" /> 
-        </javac>
-    </target>
-
-    <target name="run.tests" depends="compile.tests,copy.test.resources"
-            if="with.awt.swing.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.swing.bin.test}"
-               jvm="${test.jre.home}/bin/java">
-
-            <env key="JAVA_HOME" value="${test.jre.home}"/>
-
-            <formatter type="xml" />
-
-            <test name="${test.case}" todir="${hy.tests.reports}"
-                  if="test.case" />
-            <jvmarg value="-Xbootclasspath/a:${hy.swing.bin.test}${path.separator}${basedir}/../../depends/jars/junit_3.8.2/junit.jar${path.separator}${hy.hdk}/build/test/support.jar"/>
-
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
-                unless="test.case">
-
-                <fileset dir="${hy.swing.src.test.api}/java/common">
-                    <include name="**/*Test*.java"/>
-                    <exclude name="javax/swing/RobotTestCase.java"/>
-                    <exclude name="javax/swing/SerializableTestCase.java"/>
-                    <exclude name="javax/swing/SwingWaitTestCase.java"/>
-                    <exclude name="javax/swing/SpringTest.java"/>
-                    <exclude name="javax/swing/table/BasicSwingTableTestCase.java"/>
-                    <exclude name="javax/swing/text/ViewTestHelpers.java"/>
-                    <exclude name="javax/swing/text/AbstractDocument_DefaultDocumentEventTest.java"/>
-                    <exclude name="javax/swing/text/AbstractDocument_ElementEditTest.java"/>
-                    <exclude name="javax/swing/text/AbstractDocument_UpdateTest.java"/>
-                    <exclude name="javax/swing/text/GapContent_InternalTest.java"/>
-                    <exclude name="javax/swing/text/GapContentTest.java"/>
-                    <exclude name="javax/swing/text/JTextComponentTest.java"/>
-                    <exclude name="javax/swing/text/ParagraphViewTest.java"/>
-                    <exclude name="javax/swing/text/PlainViewI18N_LayoutTest.java"/>
-                    <exclude name="javax/swing/text/PlainViewI18N_LineView_UpdateTest.java"/>
-                    <exclude name="javax/swing/text/PlainViewI18N_LineViewTest.java"/>
-                    <exclude name="javax/swing/text/PlainViewI18N_VisualPositionTest.java"/>
-                    <exclude name="javax/swing/text/StyleContextTest.java"/>
-                    <exclude name="javax/swing/text/StringContentTest.java"/>
-                    <exclude name="javax/swing/text/StringContentTest_CommonTests.java"/>
-                    <exclude name="javax/swing/TestBundle.java"/>
-                    <exclude name="javax/swing/event/SwingPropertyChangeSupportTest.java"/>
-                    <exclude name="javax/swing/text/DefaultCaret_MultithreadedTest.java"/>
-                    <exclude name="javax/swing/text/DefaultEditorKit_Actions_MultithreadedTest.java"/>
-                    <exclude name="javax/swing/JEditorPaneTest.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">swing${line.separator}</echo>
-    </target>
-
-    <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
-            append="true">swing${line.separator}</echo>
-    </target>
-
-    <target name="copy.test.resources">
-        <mkdir dir="${hy.swing.bin.test}" />
-        <copy todir="${hy.swing.bin.test}" includeemptydirs="false">
-            <fileset dir="${hy.swing.src.test.resources}">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-</project>
+<?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="SWING Build" default="build" basedir=".">
+    <description>Build for SWING component</description>
+
+    <!-- import common properties -->
+    <import file="${basedir}/../../make/properties.xml" />
+
+    <!-- set global properties for this build. -->
+    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
+
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.swing}/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="hy.swing.src.main.java.platform"
+              value="${hy.swing.src.main.java}/../${hy.os}" />
+
+    <property name="hy.swing.src.test.java.platform"
+              value="${hy.swing.src.test.java}/../${hy.os}" />
+
+    <target name="build" depends="compile.java, build.jar" />
+
+    <target name="test" depends="build, run.tests" />
+
+    <target name="clean">
+        <delete failonerror="false">
+            <fileset refid="classes" />
+            <fileset dir="${hy.swing.bin.test}" />
+        </delete>
+    </target>
+
+    <target name="compile.java">
+        <echo message="Compiling SWING classes" />
+
+        <mkdir dir="${hy.build}" />
+
+        <javac sourcepath=""
+               destdir="${hy.build}"
+               source="${hy.javac.source}"
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
+
+            <src>
+                <pathelement location="${hy.swing.src.main.java}"/>
+                <pathelement location="${hy.swing.src.main.java.platform}" />
+            </src>
+
+            <bootclasspath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+        </javac>
+    </target>
+
+    <target name="build.jar" depends="svn-info">
+        <jar destfile="${hy.jdk}/jre/lib/boot/${hy.swing.packaging.jarname}.jar"
+             manifest="${hy.swing}/META-INF/MANIFEST.MF">
+            <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="compile.tests">
+        <echo message="Compiling SWING tests" />
+
+        <mkdir dir="${hy.swing.bin.test}" />
+
+        <javac srcdir="${hy.swing.src.test.api}/java/common"
+               destdir="${hy.swing.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="../../build/tests" />
+            <classpath location="${hy.hdk}/build/test/support.jar" /> 
+        </javac>
+    </target>
+
+    <target name="run.tests" depends="compile.tests,copy.test.resources"
+            if="with.awt.swing.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.swing.bin.test}"
+               jvm="${test.jre.home}/bin/java">
+
+            <env key="JAVA_HOME" value="${test.jre.home}"/>
+
+            <formatter type="xml" />
+
+            <test name="${test.case}" todir="${hy.tests.reports}"
+                  if="test.case" />
+            <jvmarg value="-Xbootclasspath/a:${hy.swing.bin.test}${path.separator}${basedir}/../../depends/jars/junit_3.8.2/junit.jar${path.separator}${hy.hdk}/build/test/support.jar"/>
+
+            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+                unless="test.case">
+
+                <fileset dir="${hy.swing.src.test.api}/java/common">
+                    <include name="**/*Test*.java"/>
+                    <exclude name="javax/swing/RobotTestCase.java"/>
+                    <exclude name="javax/swing/SerializableTestCase.java"/>
+                    <exclude name="javax/swing/SwingWaitTestCase.java"/>
+                    <exclude name="javax/swing/SpringTest.java"/>
+                    <exclude name="javax/swing/table/BasicSwingTableTestCase.java"/>
+                    <exclude name="javax/swing/text/ViewTestHelpers.java"/>
+                    <exclude name="javax/swing/text/AbstractDocument_DefaultDocumentEventTest.java"/>
+                    <exclude name="javax/swing/text/AbstractDocument_ElementEditTest.java"/>
+                    <exclude name="javax/swing/text/AbstractDocument_UpdateTest.java"/>
+                    <exclude name="javax/swing/text/GapContent_InternalTest.java"/>
+                    <exclude name="javax/swing/text/GapContentTest.java"/>
+                    <exclude name="javax/swing/text/JTextComponentTest.java"/>
+                    <exclude name="javax/swing/text/ParagraphViewTest.java"/>
+                    <exclude name="javax/swing/text/PlainViewI18N_LayoutTest.java"/>
+                    <exclude name="javax/swing/text/PlainViewI18N_LineView_UpdateTest.java"/>
+                    <exclude name="javax/swing/text/PlainViewI18N_LineViewTest.java"/>
+                    <exclude name="javax/swing/text/PlainViewI18N_VisualPositionTest.java"/>
+                    <exclude name="javax/swing/text/StyleContextTest.java"/>
+                    <exclude name="javax/swing/text/StringContentTest.java"/>
+                    <exclude name="javax/swing/text/StringContentTest_CommonTests.java"/>
+                    <exclude name="javax/swing/TestBundle.java"/>
+                    <exclude name="javax/swing/event/SwingPropertyChangeSupportTest.java"/>
+                    <exclude name="javax/swing/text/DefaultCaret_MultithreadedTest.java"/>
+                    <exclude name="javax/swing/text/DefaultEditorKit_Actions_MultithreadedTest.java"/>
+                    <exclude name="javax/swing/JEditorPaneTest.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">swing${line.separator}</echo>
+    </target>
+
+    <target name="touch-errors-file" if="test.errors">
+        <echo file="${hy.tests.reports}/test.errors"
+            append="true">swing${line.separator}</echo>
+    </target>
+
+    <target name="copy.test.resources">
+        <mkdir dir="${hy.swing.bin.test}" />
+        <copy todir="${hy.swing.bin.test}" includeemptydirs="false">
+            <fileset dir="${hy.swing.src.test.resources}">
+                <exclude name="**/*.java" />
+            </fileset>
+        </copy>
+    </target>
+
+</project>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml Fri Aug 11 10:00:15 2006
@@ -95,10 +95,13 @@
         </javac>
     </target>
 
-    <target name="build.jar">
+    <target name="build.jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/text.jar"
              manifest="${hy.text}/META-INF/MANIFEST.MF">
             <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
         </jar>
     </target>
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml?rev=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/tools/build.xml Fri Aug 11 10:00:15
2006
@@ -70,12 +70,15 @@
 		</javac>
 	</target>
 
-	<target name="build.jar">
+	<target name="build.jar" depends="svn-info">
 		<mkdir dir="${hy.jdk}/lib" />
 
 		<jar destfile="${hy.jdk}/lib/tools.jar"
              manifest="${hy.tools}/META-INF/MANIFEST.MF">
             <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
 		</jar>
 	</target>
 

Modified: 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=430827&r1=430826&r2=430827&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/x-net/build.xml Fri Aug 11 10:00:15
2006
@@ -68,10 +68,13 @@
         </javac>
     </target>
 
-    <target name="build.jar">
+    <target name="build.jar" depends="svn-info">
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.x-net.packaging.jarname}.jar"
             manifest="${hy.x-net}/META-INF/MANIFEST.MF">
             <fileset refid="classes" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
         </jar>
     </target>
 



Mime
View raw message