Return-Path: 
 <dev-return-69251-apmail-ant-dev-archive=ant.apache.org@ant.apache.org>
Delivered-To: apmail-ant-dev-archive@www.apache.org
Received: (qmail 13047 invoked from network); 5 Oct 2005 18:07:55 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 5 Oct 2005 18:07:55 -0000
Received: (qmail 42356 invoked by uid 500); 5 Oct 2005 18:07:54 -0000
Delivered-To: apmail-ant-dev-archive@ant.apache.org
Received: (qmail 42177 invoked by uid 500); 5 Oct 2005 18:07:53 -0000
Mailing-List: contact dev-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:dev-unsubscribe@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 42166 invoked by uid 500); 5 Oct 2005 18:07:53 -0000
Received: (qmail 42159 invoked by uid 99); 5 Oct 2005 18:07:53 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Wed, 05 Oct 2005 11:07:53 -0700
Received: (qmail 12872 invoked by uid 65534); 5 Oct 2005 18:07:33 -0000
Message-ID: <20051005180733.12871.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r295060 - /ant/core/trunk/build.xml
Date: Wed, 05 Oct 2005 18:07:32 -0000
To: ant-cvs@apache.org
From: jhm@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: jhm
Date: Wed Oct  5 11:07:20 2005
New Revision: 295060

URL: http://svn.apache.org/viewcvs?rev=295060&view=rev
Log:
Prepare for Gump integration (Gumpy needs ALL optional jars). Next step: configure Gump for overwriting the property "optional.jars.whenmanifestonly".

Modified:
    ant/core/trunk/build.xml

Modified: ant/core/trunk/build.xml
URL: http://svn.apache.org/viewcvs/ant/core/trunk/build.xml?rev=295060&r1=295059&r2=295060&view=diff
==============================================================================
--- ant/core/trunk/build.xml (original)
+++ ant/core/trunk/build.xml Wed Oct  5 11:07:20 2005
@@ -41,6 +41,7 @@
   <property name="regexp.package" value="${util.package}/regexp"/>
 
   <property name="optional.jars.prefix" value="ant"/>
+  <property name="optional.jars.whenmanifestonly" value="skip"/>
 
   <!--
        ===================================================================
@@ -166,7 +167,7 @@
       <filename name="${taskdefs.package}/AptTest*"/>
     </or>
   </selector>
-  
+
   <!-- Kaffe has some JDK 1.5 features including java.lang.Readable,
        but not all of them -->
   <selector id="not.in.kaffe">
@@ -899,8 +900,8 @@
       <sequential>
         <jar destfile="${build.lib}/${optional.jars.prefix}-@{dep}.jar"
           basedir="${build.classes}"
-	  manifest="${manifest.tmp}"
-	  whenmanifestonly="skip">
+          manifest="${manifest.tmp}"
+          whenmanifestonly="${optional.jars.whenmanifestonly}">
           <selector refid="needs.@{dep}"/>
         </jar>
       </sequential>
@@ -1262,7 +1263,7 @@
     <checksum fileext=".sha1" algorithm="SHA">
       <fileset dir="${java-repository.dir}" includes="*${version}.jar"/>
     </checksum>
-    
+
     <delete dir="${dist.name}"/>
     <checksum fileext=".md5">
       <fileset dir="${dist.base.binaries}/">
@@ -1608,7 +1609,7 @@
         value="${tests-classpath.value}"/>
       <sysproperty key="root" file="${basedir}"/>
       <sysproperty key="build.compiler" value="${build.compiler}"/>
-      <sysproperty key="tests.and.ant.share.classloader" 
+      <sysproperty key="tests.and.ant.share.classloader"
                    value="${tests.and.ant.share.classloader}"/>
       <formatter type="brief" usefile="false"/>
 
@@ -1807,4 +1808,4 @@
     description="--> creates a minimum distribution in ./dist"
     depends="dist-lite"/>
 
-</project>
+</project>
\ No newline at end of file



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