You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by nd...@apache.org on 2009/04/29 01:18:08 UTC
svn commit: r769586 -
/harmony/enhanced/common_resources/trunk/make/properties.xml
Author: ndbeyer
Date: Tue Apr 28 23:18:07 2009
New Revision: 769586
URL: http://svn.apache.org/viewvc?rev=769586&view=rev
Log:
add additional check for FreeBSD before setting the '.7x' qualifier
Modified:
harmony/enhanced/common_resources/trunk/make/properties.xml
Modified: harmony/enhanced/common_resources/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/common_resources/trunk/make/properties.xml?rev=769586&r1=769585&r2=769586&view=diff
==============================================================================
--- harmony/enhanced/common_resources/trunk/make/properties.xml (original)
+++ harmony/enhanced/common_resources/trunk/make/properties.xml Tue Apr 28 23:18:07 2009
@@ -75,7 +75,10 @@
<condition property="hy.platform.suffix" value=".7x">
<!-- matches would be better but debian stable has ant 1.6.5
and matches was only added to 1.7.0 and above -->
- <contains substring="7." string="${os.version}"/>
+ <and>
+ <equals arg1="FreeBSD" arg2="${os.name}" casesensitive="false" />
+ <contains substring="7." string="${os.version}"/>
+ </and>
</condition>
<property name="hy.platform.suffix" value="" />
<property name="hy.platform.variant"
Re: svn commit: r769586 - /harmony/enhanced/common_resources/trunk/make/properties.xml
Posted by Mark Hindess <ma...@googlemail.com>.
In message <3b...@mail.gmail.com>,
Nathan Beyer writes:
>
> Can anyone that has access to FreeBSD test this out to make sure it
> still works as expected?
It does. Thanks for fixing this.
-Mark.
Re: svn commit: r769586 - /harmony/enhanced/common_resources/trunk/make/properties.xml
Posted by Nathan Beyer <nd...@apache.org>.
Can anyone that has access to FreeBSD test this out to make sure it
still works as expected? Also, may want to consider changing the the
two conditions into an 'os' element, which checks the 'os.XXX'
properties.
-Nathan
On Tue, Apr 28, 2009 at 6:18 PM, <nd...@apache.org> wrote:
> Author: ndbeyer
> Date: Tue Apr 28 23:18:07 2009
> New Revision: 769586
>
> URL: http://svn.apache.org/viewvc?rev=769586&view=rev
> Log:
> add additional check for FreeBSD before setting the '.7x' qualifier
>
> Modified:
> harmony/enhanced/common_resources/trunk/make/properties.xml
>
> Modified: harmony/enhanced/common_resources/trunk/make/properties.xml
> URL: http://svn.apache.org/viewvc/harmony/enhanced/common_resources/trunk/make/properties.xml?rev=769586&r1=769585&r2=769586&view=diff
> ==============================================================================
> --- harmony/enhanced/common_resources/trunk/make/properties.xml (original)
> +++ harmony/enhanced/common_resources/trunk/make/properties.xml Tue Apr 28 23:18:07 2009
> @@ -75,7 +75,10 @@
> <condition property="hy.platform.suffix" value=".7x">
> <!-- matches would be better but debian stable has ant 1.6.5
> and matches was only added to 1.7.0 and above -->
> - <contains substring="7." string="${os.version}"/>
> + <and>
> + <equals arg1="FreeBSD" arg2="${os.name}" casesensitive="false" />
> + <contains substring="7." string="${os.version}"/>
> + </and>
> </condition>
> <property name="hy.platform.suffix" value="" />
> <property name="hy.platform.variant"
>
>
>