litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-3597 Use a <FileSet> with a <present> selector instead of the home-brewed DirDifferenceFileSet

Browse source
This commit is contained in:
j2blake 2012-03-02 21:22:25 +00:00
parent 2bd515d356
commit ebfefce352
1 changed files with 16 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
build.xml
View file

@ -34,8 +34,7 @@
</condition> </condition>
</fail> </fail>
<property file="${deploy.properties.file}" /> <property file="${deploy.properties.file}" />
<fail unless="vitro.core.dir" <fail unless="vitro.core.dir" message="${deploy.properties.file} must contain a value for vitro.core.dir" />
message="${deploy.properties.file} must contain a value for vitro.core.dir" />
<!-- <!--
Base it all on the core build file. Base it all on the core build file.
@ -57,11 +56,11 @@
<mkdir dir="${appbase.dir}/web" /> <mkdir dir="${appbase.dir}/web" />
<copy todir="${appbase.dir}/web" includeemptydirs="true"> <copy todir="${appbase.dir}/web" includeemptydirs="true">
<dirDifference dir="${corebase.dir}/web"> <fileset dir="${corebase.dir}/web">
<blockingPath> <not>
<pathelement location="./productMods" /> <present targetdir="./productMods" />
</blockingPath> </not>
</dirDifference> </fileset>
<fileset dir="./productMods" /> <fileset dir="./productMods" />
</copy> </copy>
@ -78,13 +77,13 @@
</patternset> </patternset>
<copy todir="${appbase.dir}" includeemptydirs="true"> <copy todir="${appbase.dir}" includeemptydirs="true">
<dirDifference dir="${corebase.dir}"> <fileset dir="${corebase.dir}/">
<patternset refid="appbase.patterns" /> <patternset refid="appbase.patterns" />
<exclude name="themes/**/*" if="skip.core.themes" /> <exclude name="themes/**/*" if="skip.core.themes" />
<blockingPath> <not>
<pathelement location="." /> <present targetdir="." />
</blockingPath> </not>
</dirDifference> </fileset>
<fileset dir="."> <fileset dir=".">
<patternset refid="appbase.patterns" /> <patternset refid="appbase.patterns" />
</fileset> </fileset>
@ -98,9 +97,7 @@
Override the core version, to get the 2-level effect. Override the core version, to get the 2-level effect.
================================= --> ================================= -->
<target name="revisionInfo" <target name="revisionInfo" depends="vitroCore.revisionInfo" description="--> Store revision info in build">
depends="vitroCore.revisionInfo"
description="--> Store revision info in build">
<addRevisionInfoLine productName="${ant.project.name}" productCheckoutDir="${basedir}" /> <addRevisionInfoLine productName="${ant.project.name}" productCheckoutDir="${basedir}" />
</target> </target>
@ -114,14 +111,10 @@
Override the core version, to get the 2-level effect. Override the core version, to get the 2-level effect.
================================= --> ================================= -->
<target name="licenser" description="--> Check source files for licensing tags"> <target name="licenser" description="--> Check source files for licensing tags">
<property name="licenser.product.properties.file" <property name="licenser.product.properties.file" location="./config/licenser/licenser.properties" />
location="./config/licenser/licenser.properties" /> <property name="licenser.core.properties.file" location="${corebase.dir}/config/licenser/licenser.properties" />
<property name="licenser.core.properties.file" <runLicenserScript productname="${ant.project.name}" propertiesfile="${licenser.product.properties.file}" />
location="${corebase.dir}/config/licenser/licenser.properties" /> <runLicenserScript productname="Vitro core" propertiesfile="${licenser.core.properties.file}" />
<runLicenserScript productname="${ant.project.name}"
propertiesfile="${licenser.product.properties.file}" />
<runLicenserScript productname="Vitro core"
propertiesfile="${licenser.core.properties.file}" />
</target> </target>
<!-- ================================= <!-- =================================