harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r922582 - in /harmony/enhanced/branches/java6: ./ common_resources/ common_resources/make/
Date Sat, 13 Mar 2010 15:31:27 GMT
Author: hindessm
Date: Sat Mar 13 15:31:26 2010
New Revision: 922582

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

Added:
    harmony/enhanced/branches/java6/common_resources/   (props changed)
      - copied from r921808, harmony/enhanced/trunk/common_resources/
    harmony/enhanced/branches/java6/common_resources/build.xml
      - copied unchanged from r921808, harmony/enhanced/trunk/common_resources/build.xml
    harmony/enhanced/branches/java6/common_resources/make/
      - copied from r921808, harmony/enhanced/trunk/common_resources/make/
    harmony/enhanced/branches/java6/common_resources/make/depends.properties
      - copied unchanged from r921808, harmony/enhanced/trunk/common_resources/make/depends.properties
    harmony/enhanced/branches/java6/common_resources/make/depends.xml
      - copied unchanged from r921808, harmony/enhanced/trunk/common_resources/make/depends.xml
    harmony/enhanced/branches/java6/common_resources/make/platform.xml
      - copied unchanged from r921808, harmony/enhanced/trunk/common_resources/make/platform.xml
    harmony/enhanced/branches/java6/common_resources/make/properties.xml
      - copied unchanged from r921808, harmony/enhanced/trunk/common_resources/make/properties.xml
    harmony/enhanced/branches/java6/common_resources/make/svn.xml
      - copied unchanged from r921808, harmony/enhanced/trunk/common_resources/make/svn.xml
Modified:
    harmony/enhanced/branches/java6/   (props changed)
    harmony/enhanced/branches/java6/build.xml

Propchange: harmony/enhanced/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 15:31:26 2010
@@ -1 +1 @@
-/harmony/enhanced/trunk:810871-921782
+/harmony/enhanced/trunk:810871-921808

Modified: harmony/enhanced/branches/java6/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/branches/java6/build.xml?rev=922582&r1=922581&r2=922582&view=diff
==============================================================================
--- harmony/enhanced/branches/java6/build.xml (original)
+++ harmony/enhanced/branches/java6/build.xml Sat Mar 13 15:31:26 2010
@@ -718,10 +718,6 @@ Usage:
                 <os arch="i386"/>
             </or>
         </condition>
-        <condition property="harmony.bits" value="32">
-            <isset property="is.32bit" />
-        </condition>
-        <property name="harmony.bits" value="64" />
 
         <!-- Normalized architecture name -->
         <condition property="harmony.arch" value="x86">
@@ -749,23 +745,23 @@ Usage:
         <property name="deploy.hdk.file.prefix"
                  value="${deploy.file.prefix}hdk-r${harmony.version}" />
         <property name="deploy.hdk.tar"
-                 value="${deploy.hdk.file.prefix}-${harmony.os}-${harmony.arch}-${harmony.bits}${harmony.deploy.suffix}.tar.gz"
/>
+                 value="${deploy.hdk.file.prefix}-${harmony.os}-${harmony.arch}${harmony.deploy.suffix}.tar.gz"
/>
         <property name="deploy.hdk.zip"
-                 value="${deploy.hdk.file.prefix}-${harmony.os}-${harmony.arch}-${harmony.bits}${harmony.deploy.suffix}.zip"
/>
+                 value="${deploy.hdk.file.prefix}-${harmony.os}-${harmony.arch}${harmony.deploy.suffix}.zip"
/>
 
         <property name="deploy.jdk.file.prefix"
                  value="${deploy.file.prefix}jdk-r${harmony.version}" />
         <property name="deploy.jdk.tar"
-                 value="${deploy.jdk.file.prefix}-${harmony.os}-${harmony.arch}-${harmony.bits}${harmony.deploy.suffix}.tar.gz"
/>
+                 value="${deploy.jdk.file.prefix}-${harmony.os}-${harmony.arch}${harmony.deploy.suffix}.tar.gz"
/>
         <property name="deploy.jdk.zip"
-                 value="${deploy.jdk.file.prefix}-${harmony.os}-${harmony.arch}-${harmony.bits}${harmony.deploy.suffix}.zip"
/>
+                 value="${deploy.jdk.file.prefix}-${harmony.os}-${harmony.arch}${harmony.deploy.suffix}.zip"
/>
 
         <property name="deploy.jre.file.prefix"
                  value="${deploy.file.prefix}jre-r${harmony.version}" />
         <property name="deploy.jre.tar"
-                 value="${deploy.jre.file.prefix}-${harmony.os}-${harmony.arch}-${harmony.bits}${harmony.deploy.suffix}.tar.gz"
/>
+                 value="${deploy.jre.file.prefix}-${harmony.os}-${harmony.arch}${harmony.deploy.suffix}.tar.gz"
/>
         <property name="deploy.jre.zip"
-                 value="${deploy.jre.file.prefix}-${harmony.os}-${harmony.arch}-${harmony.bits}${harmony.deploy.suffix}.zip"
/>
+                 value="${deploy.jre.file.prefix}-${harmony.os}-${harmony.arch}${harmony.deploy.suffix}.zip"
/>
 
         <property name="deploy.src.file.prefix"
                  value="${deploy.file.prefix}src-r${harmony.version}" />
@@ -794,7 +790,6 @@ Usage:
             svn rev          :  ${harmony.version}
             operating system :  ${harmony.os}
             CPU architecture :  ${harmony.arch}
-            word length      :  ${harmony.bits}
             ant os name/arch :  ${os.name}/${os.arch}
             hosting Java     :  ${java.version} (${java.vendor})
             build mode       :  ${hy.cfg}
@@ -852,8 +847,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/common_resources/trunk" />
+        <property name="commonresources.svn.url" value="${svn.root}/harmony/enhanced/trunk/common_resources"
/>
     </target>
 
     <target name="bundle-src-tgz" depends="init" if="is.unix">

Propchange: harmony/enhanced/branches/java6/common_resources/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Mar 13 15:31:26 2010
@@ -0,0 +1,2 @@
+depends
+

Propchange: harmony/enhanced/branches/java6/common_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Mar 13 15:31:26 2010
@@ -0,0 +1,2 @@
+/harmony/enhanced/trunk/common_resources:476396-920147,921783-921808
+/incubator/harmony/enhanced/trunk/common_resources:423974-476394



Mime
View raw message