NIHVIVO-2811 Improve DirDifferenceFileSet to take <include> elements. This simplifies the build script.

This commit is contained in:
j2blake 2011-09-11 15:05:13 +00:00
parent 38a5269521
commit 0ef4a791c8
3 changed files with 39 additions and 48 deletions

View file

@ -54,9 +54,9 @@
<copy todir="${appbase.dir}/web" includeemptydirs="true">
<dirDifference dir="${inner.basedir}/web">
<path>
<blockingPath>
<pathelement location="${product.modifications.dir}" />
</path>
</blockingPath>
</dirDifference>
</copy>
<copy todir="${appbase.dir}/web" includeemptydirs="true">
@ -67,37 +67,23 @@
<fileset dir="${inner.basedir}/config" />
</copy>
<copy todir="${appbase.dir}/src" includeemptydirs="true">
<dirDifference dir="${inner.basedir}/src">
<path>
<pathelement location="./src" />
</path>
<!-- -->
<copy todir="${appbase.dir}" includeemptydirs="true">
<dirDifference dir="${inner.basedir}">
<include name="src/**/*" />
<include name="lib/**/*" />
<include name="test/**/*" />
<blockingPath>
<pathelement location="." />
</blockingPath>
</dirDifference>
</copy>
<copy todir="${appbase.dir}/src" includeemptydirs="true">
<fileset dir="./src" erroronmissingdir="false" />
</copy>
<copy todir="${appbase.dir}/lib" includeemptydirs="true">
<dirDifference dir="${inner.basedir}/lib">
<path>
<pathelement location="./lib" />
</path>
</dirDifference>
</copy>
<copy todir="${appbase.dir}/lib" includeemptydirs="true">
<fileset dir="./lib" erroronmissingdir="false" />
</copy>
<copy todir="${appbase.dir}/test" includeemptydirs="true">
<dirDifference dir="${inner.basedir}/test">
<path>
<pathelement location="./test" />
</path>
</dirDifference>
</copy>
<copy todir="${appbase.dir}/test" includeemptydirs="true">
<fileset dir="./test" />
<copy todir="${appbase.dir}" includeemptydirs="true">
<fileset dir="." erroronmissingdir="false">
<include name="src/**/*" />
<include name="lib/**/*" />
<include name="test/**/*" />
</fileset>
</copy>
<copy todir="${appbase.dir}/themes" includeemptydirs="true">