harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r926348 - in /harmony/enhanced/branches/java6: ./ build.xml common_resources/ jdktools/
Date Mon, 22 Mar 2010 21:28:25 GMT
Author: hindessm
Date: Mon Mar 22 21:28:25 2010
New Revision: 926348

URL: http://svn.apache.org/viewvc?rev=926348&view=rev
Log:
Merge up to trunk@926308.

Removed:
    harmony/enhanced/branches/java6/jdktools/
Modified:
    harmony/enhanced/branches/java6/   (props changed)
    harmony/enhanced/branches/java6/build.xml
    harmony/enhanced/branches/java6/common_resources/   (props changed)

Propchange: harmony/enhanced/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 22 21:28:25 2010
@@ -1 +1 @@
-/harmony/enhanced/trunk:810871-922670
+/harmony/enhanced/trunk:810871-926308

Modified: harmony/enhanced/branches/java6/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/build.xml?rev=926348&r1=926347&r2=926348&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/build.xml (original)
+++ harmony/enhanced/branches/java6/build.xml Mon Mar 22 21:28:25 2010
@@ -20,6 +20,18 @@
 
 <project name="build-harmony" default="build" basedir=".">
 
+    <fail>
+        <condition>
+            <isset property="java6" />
+        </condition>
+The -Djava6=true federated build has been deprecated.  Please checkout
+the java6 federated build from:
+
+  https://svn.apache.org/repos/asf/harmony/enhanced/branches/java6
+
+Thanks.
+    </fail>
+
     <!-- temporary warning -->
     <fail>
         <condition>
@@ -887,6 +899,7 @@ Usage:
         <property name="jdktools.svn.url"
                   value="${svn.root}/harmony/enhanced/jdktools/branches/java6"/>
 
+
         <property name="commonresources.svn.url" value="${svn.root}/harmony/enhanced/branches/java6/common_resources"
/>
     </target>
 

Propchange: harmony/enhanced/branches/java6/common_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 22 21:28:25 2010
@@ -1,2 +1,2 @@
-/harmony/enhanced/trunk/common_resources:476396-920147,921783-922670
+/harmony/enhanced/trunk/common_resources:476396-920147,921783-926308
 /incubator/harmony/enhanced/trunk/common_resources:423974-476394



Mime
View raw message