Return-Path: 
 <commits-return-35325-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 84772 invoked from network); 18 May 2007 20:16:29 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 18 May 2007 20:16:29 -0000
Received: (qmail 62918 invoked by uid 500); 18 May 2007 20:16:34 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 62897 invoked by uid 500); 18 May 2007 20:16:34 -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 62888 invoked by uid 99); 18 May 2007 20:16:34 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 May 2007 13:16:34 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 May 2007 13:16:28 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 01C701A981D; Fri, 18 May 2007 13:16:08 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r539589 - in /harmony/enhanced/drlvm/trunk/build/make:
 setup.xml
 targets/ehwa.test.xml
Date: Fri, 18 May 2007 20:16:07 -0000
To: commits@harmony.apache.org
From: hindessm@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070518201608.01C701A981D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: hindessm
Date: Fri May 18 13:16:07 2007
New Revision: 539589

URL: http://svn.apache.org/viewvc?view=rev&rev=539589
Log:
Fixing linux to unix and adding macosx.

Modified:
    harmony/enhanced/drlvm/trunk/build/make/setup.xml
    harmony/enhanced/drlvm/trunk/build/make/targets/ehwa.test.xml

Modified: harmony/enhanced/drlvm/trunk/build/make/setup.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/setup.xml?view=diff&rev=539589&r1=539588&r2=539589
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/setup.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/setup.xml Fri May 18 13:16:07 2007
@@ -185,10 +185,18 @@
         <property name="common.resources" value="LOG4CXX,CPPTASKS,XALAN,VM,ANTLR,PATCHES,JASMIN,VMMAGIC" />
         <property name="build.resources" value="CPPTASKS" />
         <if>
-            <isset property="if.lnx" />
+            <isset property="if.unix" />
             <then>
-                <property name="build.os.short" value="lnx" />
                 <property name="os.resources" value="APR,APRUTIL,APRICONV" />
+                <if>
+                    <isset property="if.lnx" />
+                    <then>
+                        <property name="build.os.short" value="lnx" />
+                    </then>
+                    <else>
+                        <property name="build.os.short" value="macosx" />
+                    </else>
+                </if>
             </then>
             <else>
                 <property name="build.os.short" value="win" />

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/ehwa.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/ehwa.test.xml?view=diff&rev=539589&r1=539588&r2=539589
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/ehwa.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/ehwa.test.xml Fri May 18 13:16:07 2007
@@ -27,6 +27,9 @@
     <condition property="os" value="linux">
         <os name="linux" />
     </condition>
+    <condition property="os" value="macosx">
+        <os name="mac os x" />
+    </condition>
     <condition property="arch" value="x86_64">
         <or>
             <equals arg1="x86_64" arg2="${os.arch}"/>
@@ -41,6 +44,12 @@
     </condition>
     <condition property="arch" value="ia64">
         <equals arg1="ia64" arg2="${os.arch}"/>
+    </condition>
+    <condition property="arch" value="ppc32">
+        <or>
+            <equals arg1="${os.arch}" arg2="ppc32" />
+            <equals arg1="${os.arch}" arg2="ppc" />
+        </or>
     </condition>
 
     <propertycopy name="eclipse.url" from="eclipse.${os}.${arch}.url"/>