harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r926297 - /harmony/enhanced/trunk/build.xml
Date Mon, 22 Mar 2010 20:04:21 GMT
Author: hindessm
Date: Mon Mar 22 20:04:21 2010
New Revision: 926297

URL: http://svn.apache.org/viewvc?rev=926297&view=rev
Log:
Replace old java6 conditional properties with simple properties.

Modified:
    harmony/enhanced/trunk/build.xml

Modified: harmony/enhanced/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/build.xml?rev=926297&r1=926296&r2=926297&view=diff
==============================================================================
--- harmony/enhanced/trunk/build.xml (original)
+++ harmony/enhanced/trunk/build.xml Mon Mar 22 20:04:21 2010
@@ -786,9 +786,7 @@ Usage:
 
         <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="5.0" />
 
         <property name="deploy.file.prefix"
                   value="apache-harmony-${harmony.java.version}-" />
@@ -892,21 +890,17 @@ Usage:
         <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/trunk" />
 
-        <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/trunk" />
 
-        <property name="commonresources.svn.url" value="${svn.root}/harmony/enhanced/trunk/common_resources"
/>
+        <property name="commonresources.svn.url"
+                  value="${svn.root}/harmony/enhanced/trunk/common_resources" />
     </target>
 
     <target name="bundle-src-tgz" depends="init" if="is.unix">



Mime
View raw message