You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2007/05/18 22:16:07 UTC
svn commit: r539589 - in /harmony/enhanced/drlvm/trunk/build/make: setup.xml
targets/ehwa.test.xml
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"/>