Return-Path: 
 <dev-return-48283-apmail-ant-dev-archive=ant.apache.org@ant.apache.org>
Delivered-To: apmail-ant-dev-archive@ant.apache.org
Received: (qmail 24550 invoked by uid 500); 18 Jul 2003 16:39:07 -0000
Mailing-List: contact dev-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:dev-unsubscribe@ant.apache.org>
List-Subscribe: <mailto:dev-subscribe@ant.apache.org>
List-Help: <mailto:dev-help@ant.apache.org>
List-Post: <mailto:dev@ant.apache.org>
List-Id: "Ant Developers List" <dev.ant.apache.org>
Reply-To: "Ant Developers List" <dev@ant.apache.org>
Delivered-To: mailing list dev@ant.apache.org
Received: (qmail 24524 invoked from network); 18 Jul 2003 16:39:06 -0000
Received: from mail.paranor.ch (HELO nts?par1.paranor.ch) (195.65.4.180)
  by daedalus.apache.org with SMTP; 18 Jul 2003 16:39:06 -0000
Received: by nts_par1.paranor.ch with Internet Mail Service (5.5.2448.0)
	id <3SL6B9KW>; Fri, 18 Jul 2003 18:39:04 +0200
Message-ID: <36E996B162DAD111B6AF0000F879AD1A76C2F6@nts_par1.paranor.ch>
From: "Wannheden, Knut" <knut.wannheden@paranor.ch>
To: 'Ant Developers List' <dev@ant.apache.org>
Subject: RE: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/condit
	ion Os.java
Date: Fri, 18 Jul 2003 18:38:59 +0200
MIME-Version: 1.0
X-Mailer: Internet Mail Service (5.5.2448.0)
Content-Type: multipart/alternative;
	boundary="----_=_NextPart_001_01C34D4B.18E249B8"
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

------_=_NextPart_001_01C34D4B.18E249B8
Content-Type: text/plain;
	charset="iso-8859-1"

Stefan,

On OpenVMS System.getProperty("path.separator") returns ":".  This causes
the Os condition to classify OpenVMS as Unix.  So the check for OpenVMS
needs to take place before the one for Unix.  And you have to guard the
check for Unix against OpenVMS in the same manner as you do against Mac.

Even adding two lines can result in bugs :-)

--
knut

> -----Original Message-----
> From: bodewig@apache.org [mailto:bodewig@apache.org]
> Sent: Donnerstag, 10. Juli 2003 13:53
> To: ant-cvs@apache.org
> Subject: cvs commit:
> ant/src/main/org/apache/tools/ant/taskdefs/condition Os.java
> 
> 
> bodewig     2003/07/10 04:52:50
> 
>   Modified:    .        WHATSNEW
>                docs/manual/CoreTasks conditions.html
>                
> src/main/org/apache/tools/ant/taskdefs/condition Os.java
>   Log:
>   Detect OpenVMS as <os family>
>   
>   Revision  Changes    Path
>   1.454     +2 -0      ant/WHATSNEW
>   
>   Index: WHATSNEW
>   ===================================================================
>   RCS file: /home/cvs/ant/WHATSNEW,v
>   retrieving revision 1.453
>   retrieving revision 1.454
>   diff -u -r1.453 -r1.454
>   --- WHATSNEW	7 Jul 2003 13:05:02 -0000	1.453
>   +++ WHATSNEW	10 Jul 2003 11:52:50 -0000	1.454
>   @@ -470,6 +470,8 @@
>    * <patch> has a new attribute destfile that can be used to 
> create a new
>      file instead of patching files in place.
>    
>   +* OpenVMS is detected as a valid OS family.
>   +
>    Changes from Ant 1.5.2 to Ant 1.5.3
>    ===================================
>    
>   
>   
>   
>   1.19      +1 -0      ant/docs/manual/CoreTasks/conditions.html
>   
>   Index: conditions.html
>   ===================================================================
>   RCS file: /home/cvs/ant/docs/manual/CoreTasks/conditions.html,v
>   retrieving revision 1.18
>   retrieving revision 1.19
>   diff -u -r1.18 -r1.19
>   --- conditions.html	23 May 2003 13:40:36 -0000	1.18
>   +++ conditions.html	10 Jul 2003 11:52:50 -0000	1.19
>   @@ -96,6 +96,7 @@
>      <li>win9x for Microsoft Windows 95 and 98</li>
>      <li>z/os for z/OS and OS/390</li>
>      <li>os/400 for OS/400</li>
>   +  <li>openvms for OpenVMS</li>
>    </ul>
>    
>    <h4>equals</h4>
>   
>   
>   
>   1.26      +3 -1      
> ant/src/main/org/apache/tools/ant/taskdefs/condition/Os.java
>   
>   Index: Os.java
>   ===================================================================
>   RCS file: 
> /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/condition
> /Os.java,v
>   retrieving revision 1.25
>   retrieving revision 1.26
>   diff -u -r1.25 -r1.26
>   --- Os.java	30 May 2003 09:31:45 -0000	1.25
>   +++ Os.java	10 Jul 2003 11:52:50 -0000	1.26
>   @@ -231,6 +231,8 @@
>                            || osName.indexOf("os/390") > -1;
>                    } else if (family.equals("os/400")) {
>                        isFamily = osName.indexOf("os/400") > -1;
>   +                } else if (family.equals("openvms")) {
>   +                    isFamily = osName.indexOf("openvms") > -1;
>                    } else {
>                        throw new BuildException(
>                            "Don\'t know how to detect os family \""
>   
>   
>   
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
> For additional commands, e-mail: dev-help@ant.apache.org
> 

------_=_NextPart_001_01C34D4B.18E249B8--