Return-Path: 
 <commits-return-62540-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 29049 invoked from network); 3 Jun 2010 07:29:14 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 3 Jun 2010 07:29:14 -0000
Received: (qmail 91666 invoked by uid 500); 3 Jun 2010 07:29:14 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 91598 invoked by uid 500); 3 Jun 2010 07:29:12 -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 91583 invoked by uid 99); 3 Jun 2010 07:29:11 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jun 2010 07:29:11 +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 Jun 2010 07:29:09 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id C864123889BB; Thu,  3 Jun 2010 07:28:47 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r950898 - /harmony/enhanced/java/trunk/build.xml
Date: Thu, 03 Jun 2010 07:28:47 -0000
To: commits@harmony.apache.org
From: hindessm@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100603072847.C864123889BB@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: hindessm
Date: Thu Jun  3 07:28:47 2010
New Revision: 950898

URL: http://svn.apache.org/viewvc?rev=950898&view=rev
Log:
Add vm.dir to the artefact names if it isn't drlvm.

Modified:
    harmony/enhanced/java/trunk/build.xml

Modified: harmony/enhanced/java/trunk/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/build.xml?rev=950898&r1=950897&r2=950898&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/build.xml (original)
+++ harmony/enhanced/java/trunk/build.xml Thu Jun  3 07:28:47 2010
@@ -684,15 +684,20 @@ Usage:
         </condition>
         <property name="version.prefix" value="" />
 
+        <condition property="vm.prefix" value="">
+            <equals arg1="drlvm" arg2="${vm.dir}" />
+        </condition>
+        <property name="vm.prefix" value="${vm.dir}-" />
+
         <property name="harmony.deploy.suffix" value="-snapshot" />
 
         <property name="harmony.java.version" value="5.0" />
 
         <property name="deploy.file.prefix"
-            value="apache-harmony-${version.prefix}${harmony.java.version}-" />
+            value="apache-harmony-${version.prefix}${harmony.java.version}-${vm.prefix}" />
 
         <property name="archive.dir.prefix"
-            value="harmony-${version.prefix}${harmony.java.version}-" />
+            value="harmony-${version.prefix}${harmony.java.version}-${vm.prefix}" />
 
         <property name="deploy.hdk.file.prefix"
                  value="${deploy.file.prefix}hdk-r${harmony.version}" />
@@ -747,6 +752,8 @@ Usage:
             build mode       :  ${hy.cfg}
             output location  :  ${target.dir}
             SVN root         :  ${svn.root}
+            archive.dir      :  ${archive.dir.prefix}
+            archive.name     :  ${deploy.file.prefix}
         </echo>
     </target>