Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 24747 invoked from network); 13 Mar 2010 15:32:28 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 13 Mar 2010 15:32:28 -0000 Received: (qmail 532 invoked by uid 500); 13 Mar 2010 15:31:48 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 447 invoked by uid 500); 13 Mar 2010 15:31:48 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 440 invoked by uid 99); 13 Mar 2010 15:31:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 13 Mar 2010 15:31:48 +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; Sat, 13 Mar 2010 15:31:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4E90D23889DE; Sat, 13 Mar 2010 15:31:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r922582 - in /harmony/enhanced/branches/java6: ./ common_resources/ common_resources/make/ Date: Sat, 13 Mar 2010 15:31:27 -0000 To: commits@harmony.apache.org From: hindessm@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100313153127.4E90D23889DE@eris.apache.org> 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: - - - - @@ -749,23 +745,23 @@ Usage: + value="${deploy.hdk.file.prefix}-${harmony.os}-${harmony.arch}${harmony.deploy.suffix}.tar.gz" /> + value="${deploy.hdk.file.prefix}-${harmony.os}-${harmony.arch}${harmony.deploy.suffix}.zip" /> + value="${deploy.jdk.file.prefix}-${harmony.os}-${harmony.arch}${harmony.deploy.suffix}.tar.gz" /> + value="${deploy.jdk.file.prefix}-${harmony.os}-${harmony.arch}${harmony.deploy.suffix}.zip" /> + value="${deploy.jre.file.prefix}-${harmony.os}-${harmony.arch}${harmony.deploy.suffix}.tar.gz" /> + value="${deploy.jre.file.prefix}-${harmony.os}-${harmony.arch}${harmony.deploy.suffix}.zip" /> @@ -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: - + 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