Return-Path: 
 <ant-dev-return-32592-qmlist-jakarta-archive-ant-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-ant-dev-archive@apache.org
Received: (qmail 12992 invoked from network); 22 May 2002 08:37:29 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 22 May 2002 08:37:29 -0000
Received: (qmail 23786 invoked by uid 97); 22 May 2002 08:37:39 -0000
Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org
Received: (qmail 23740 invoked by uid 97); 22 May 2002 08:37:38 -0000
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:ant-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:ant-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:ant-dev-help@jakarta.apache.org>
List-Post: <mailto:ant-dev@jakarta.apache.org>
List-Id: "Ant Developers List" <ant-dev.jakarta.apache.org>
Reply-To: "Ant Developers List" <ant-dev@jakarta.apache.org>
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 23724 invoked by uid 97); 22 May 2002 08:37:38 -0000
X-Antivirus: nagoya (v4198 created Apr 24 2002)
Date: 22 May 2002 08:37:22 -0000
Message-ID: <20020522083722.36669.qmail@icarus.apache.org>
From: bodewig@apache.org
To: jakarta-ant-cvs@apache.org
Subject: cvs commit: jakarta-ant build.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

bodewig     02/05/22 01:37:22

  Modified:    .        Tag: ANT_15_BRANCH build.xml
  Log:
  Change swing.present test to short-circuit for JDK 1.2+.  Enables
  headless bootstrap on MacOS X.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.304.2.7 +7 -3      jakarta-ant/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.xml,v
  retrieving revision 1.304.2.6
  retrieving revision 1.304.2.7
  diff -u -r1.304.2.6 -r1.304.2.7
  --- build.xml	20 May 2002 13:51:03 -0000	1.304.2.6
  +++ build.xml	22 May 2002 08:37:21 -0000	1.304.2.7
  @@ -465,9 +465,13 @@
         </and>
       </condition>
   
  -    <available property="swing.present"
  -               classname="javax.swing.ImageIcon"
  -               classpathref="classpath"/>
  +    <condition property="swing.present">
  +      <or>
  +        <isset property="jdk1.2+" />
  +        <available classname="javax.swing.ImageIcon"
  +                   classpathref="classpath"/>
  +      </or>
  +    </condition>
   
      <condition property="wsdl.found">
         <or>
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>