You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by sm...@apache.org on 2007/09/06 05:33:33 UTC
svn commit: r573142 - in /harmony/enhanced/buildtest/branches/2.0:
adaptors/ehwa/adaptor.xml adaptors/snapshot/adaptor.xml
scripts/exec-adaptor.xml
Author: smishura
Date: Wed Sep 5 20:33:33 2007
New Revision: 573142
URL: http://svn.apache.org/viewvc?rev=573142&view=rev
Log:
Use standart platform properties provided by the framework (from 'properties.xml')
Modified:
harmony/enhanced/buildtest/branches/2.0/adaptors/ehwa/adaptor.xml
harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml
harmony/enhanced/buildtest/branches/2.0/scripts/exec-adaptor.xml
Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/ehwa/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/ehwa/adaptor.xml?rev=573142&r1=573141&r2=573142&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/ehwa/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/ehwa/adaptor.xml Wed Sep 5 20:33:33 2007
@@ -26,49 +26,31 @@
<!--
Define properties describing platform type
-->
- <condition property="is.windows">
- <os family="windows"/>
- </condition>
-
- <condition property="is.linux">
- <and>
- <os family="unix"/>
- <os name="linux"/>
- </and>
- </condition>
-
- <condition property="is.64bit">
- <or>
- <contains string="${os.arch}" substring="86_64"/>
- <contains string="${os.arch}" substring="amd64"/>
- </or>
- </condition>
-
<condition property="is.windows.x86">
<and>
<isset property="is.windows"/>
- <not><isset property="is.64bit"/></not>
+ <isset property="is.x86" />
</and>
</condition>
<condition property="is.windows.x86_64">
<and>
<isset property="is.windows"/>
- <isset property="is.64bit"/>
+ <isset property="is.x86_64" />
</and>
</condition>
<condition property="is.linux.x86">
<and>
<isset property="is.linux"/>
- <not><isset property="is.64bit"/></not>
+ <isset property="is.x86" />
</and>
</condition>
<condition property="is.linux.x86_64">
<and>
<isset property="is.linux"/>
- <isset property="is.64bit"/>
+ <isset property="is.x86_64" />
</and>
</condition>
Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml?rev=573142&r1=573141&r2=573142&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/snapshot/adaptor.xml Wed Sep 5 20:33:33 2007
@@ -20,16 +20,6 @@
====================================================================== -->
<project name="snapshot" default="run" basedir=".">
- <condition property="is.windows">
- <os family="Windows" />
- </condition>
- <condition property="is.x86_64">
- <or>
- <equals arg1="x86_64" arg2="${os.arch}" />
- <equals arg1="amd64" arg2="${os.arch}" />
- </or>
- </condition>
-
<condition property="exe" value=".exe" else="">
<isset property="is.windows" />
</condition>
Modified: harmony/enhanced/buildtest/branches/2.0/scripts/exec-adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/scripts/exec-adaptor.xml?rev=573142&r1=573141&r2=573142&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/exec-adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/exec-adaptor.xml Wed Sep 5 20:33:33 2007
@@ -20,6 +20,8 @@
====================================================================== -->
<project name="exec-adaptor" default="call" basedir=".">
+ <import file="properties.xml"/>
+
<import file="${framework.implementation.file}"/>
<import file="${adaptors.dir}/${suite.name}/adaptor.xml"/>