You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by qi...@apache.org on 2009/07/01 10:46:24 UTC

svn commit: r790072 - in /harmony/enhanced/classlib/trunk: build.xml modules/luni/build.xml

Author: qiuxx
Date: Wed Jul  1 08:46:24 2009
New Revision: 790072

URL: http://svn.apache.org/viewvc?rev=790072&view=rev
Log:
Revert r790030 since it caused a build failure

Modified:
    harmony/enhanced/classlib/trunk/build.xml
    harmony/enhanced/classlib/trunk/modules/luni/build.xml

Modified: harmony/enhanced/classlib/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/build.xml?rev=790072&r1=790071&r2=790072&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/build.xml (original)
+++ harmony/enhanced/classlib/trunk/build.xml Wed Jul  1 08:46:24 2009
@@ -86,7 +86,7 @@
     <target name="rebuild" depends="clean,build"
         description="Performs a full build - that is 'clean' then 'build'" />
 	
-    <target name="build" depends="build-java,build-native,build-test"
+    <target name="build" depends="build-java,build-native"
         description="Compiles the java and native code to produce a jdk">
         <ant antfile="make/build-test.xml" inheritall="false"
              target="support-jar"/>
@@ -174,11 +174,11 @@
         <ant antfile="make/build-test.xml" inheritall="false" target="test-all"/>
     </target>
 
-    <target name="build-test" depends="-init-hdk"
-            description="Compile and archive all tests">
+    <target name="test-jar" depends="-init-hdk"
+            description="Jar all tests">
         <echo>
 ========================================
-Compiling and archiving test classes ...
+Archive testing classes ...
 ========================================
 </echo>
         <ant antfile="make/build-test.xml" inheritall="false" target="test-jar-modules"/>

Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=790072&r1=790071&r2=790072&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Wed Jul  1 08:46:24 2009
@@ -220,7 +220,7 @@
     </target>
 
     <!-- internal target for local and global test run sequence -->
-    <target name="-test-module" depends="build, test-jar, run-tests" />
+    <target name="-test-module" depends="build, compile-tests, prepare-exclude, test-jar, run-tests" />
 
     <target name="clean" depends="clean-native-includes" >
         <delete file="${hy.jdk}/jre/lib/boot/luni.jar" />