svn commit: r638625 - /ant/core/trunk/build.xml

[pe...@apache.org]

Author: peterreilly
Date: Tue Mar 18 15:49:50 2008
New Revision: 638625

URL: http://svn.apache.org/viewvc?rev=638625&view=rev
Log:
fix for bugzilla 44630 - error expansion of properties in docs dir

Modified:
    ant/core/trunk/build.xml

Modified: ant/core/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/build.xml?rev=638625&r1=638624&r2=638625&view=diff
==============================================================================
--- ant/core/trunk/build.xml (original)
+++ ant/core/trunk/build.xml Tue Mar 18 15:49:50 2008
@@ -108,7 +108,8 @@
   <property name="junit.summary" value="no"/>
   <property name="test.haltonfailure" value="false"/>
   <property name="junit.forkmode" value="once"/>
-  <property name="unfiltered.files" value="**/*.gif,**/*.jpg,**/*.ico,**/*.pdf,**/*.zip"/>
+  <property name="expandproperty.files"
+            value="**/version.txt,**/defaultManifest.mf"/>
   <property name="junit.collector.dir" value="${build.dir}/failingTests"/>
   <property name="junit.collector.class" value="FailedTests"/>
 
@@ -978,14 +979,14 @@
     </checksum>
 
     <copy todir="${dist.docs}">
-      <fileset dir="${docs.dir}" excludes="${unfiltered.files}">
+      <fileset dir="${docs.dir}" includes="${expandproperty.files}">
         <patternset refid="site.excludes"/>
       </fileset>
       <filterchain refid="ant.filters"/>
     </copy>
 
     <copy todir="${dist.docs}" filtering="false">
-      <fileset dir="${docs.dir}" includes="${unfiltered.files}">
+      <fileset dir="${docs.dir}" excludes="${expandproperty.files}">
         <patternset refid="site.excludes"/>
       </fileset>
     </copy>