Return-Path: 
 <commits-return-60065-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 49561 invoked from network); 3 Sep 2009 11:59:25 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 3 Sep 2009 11:59:25 -0000
Received: (qmail 42934 invoked by uid 500); 3 Sep 2009 11:59:24 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 42914 invoked by uid 500); 3 Sep 2009 11:59:24 -0000
Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@harmony.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@harmony.apache.org>
List-Post: <mailto:commits@harmony.apache.org>
List-Id: <commits.harmony.apache.org>
Reply-To: dev@harmony.apache.org
Delivered-To: mailing list commits@harmony.apache.org
Received: (qmail 42905 invoked by uid 99); 3 Sep 2009 11:59:24 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Sep 2009 11:59:24 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Sep 2009 11:59:15 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 5189A23888E5; Thu,  3 Sep 2009 11:58:54 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r810904 - /harmony/enhanced/branches/java6/build.xml
Date: Thu, 03 Sep 2009 11:58:54 -0000
To: commits@harmony.apache.org
From: hindessm@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090903115854.5189A23888E5@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: hindessm
Date: Thu Sep  3 11:58:53 2009
New Revision: 810904

URL: http://svn.apache.org/viewvc?rev=810904&view=rev
Log:
Always build java6 from this branch.

Modified:
    harmony/enhanced/branches/java6/build.xml

Modified: harmony/enhanced/branches/java6/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/build.xml?rev=810904&r1=810903&r2=810904&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/build.xml (original)
+++ harmony/enhanced/branches/java6/build.xml Thu Sep  3 11:58:53 2009
@@ -723,9 +723,7 @@
 
         <property name="harmony.deploy.suffix" value="-snapshot" />
 
-        <condition property="harmony.java.version" value="6.0" else="5.0">
-            <isset property="java6" />
-        </condition>
+        <property name="harmony.java.version" value="6.0" />
 
         <property name="deploy.file.prefix"
                   value="apache-harmony-${harmony.java.version}-" />
@@ -829,21 +827,17 @@
         <property name="harmony.long.version" value="${svn.info}" />
 
         <!-- default SVN URLs -->
-        <condition property="classlib.svn.url"
-                   value="${svn.root}/harmony/enhanced/classlib/branches/java6"
-                   else="${svn.root}/harmony/enhanced/classlib/trunk">
-            <isset property="java6" />
-        </condition>
+        <property name="classlib.svn.url"
+                  value="${svn.root}/harmony/enhanced/classlib/branches/java6"/>
 
-        <property name="vm.svn.url" value="${svn.root}/harmony/enhanced/drlvm/trunk" />
+        <property name="vm.svn.url"
+                  value="${svn.root}/harmony/enhanced/drlvm/trunk" />
 
-        <condition property="jdktools.svn.url"
-                   value="${svn.root}/harmony/enhanced/jdktools/branches/java6"
-                   else="${svn.root}/harmony/enhanced/jdktools/trunk">
-            <isset property="java6" />
-        </condition>
+        <property name="jdktools.svn.url"
+                  value="${svn.root}/harmony/enhanced/jdktools/branches/java6"/>
 
-        <property name="commonresources.svn.url" value="${svn.root}/harmony/enhanced/common_resources/trunk" />
+        <property name="commonresources.svn.url"
+                  value="${svn.root}/harmony/enhanced/common_resources/trunk" />
     </target>
 
     <target name="bundle-src-tgz" depends="init" if="is.unix">