Browse Source

fix for bugzilla 44630 - error expansion of properties in docs dir

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@638625 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Reilly 17 years ago
parent
commit
c36b3e7947
1 changed files with 4 additions and 3 deletions
  1. +4
    -3
      build.xml

+ 4
- 3
build.xml View File

@@ -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>


Loading…
Cancel
Save