Commit 534e3b05 authored by Quality Assurance's avatar Quality Assurance Committed by qa

More fixes for build.xml to stop false build failings from TeamCity

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@8128 b35dd754-fafc-0310-a699-88a17e54d16e
parent 2b6c8e12
...@@ -692,7 +692,10 @@ ...@@ -692,7 +692,10 @@
<!-- Copy compiled plugins if we need to --> <!-- Copy compiled plugins if we need to -->
<if> <if>
<equals arg1="${openfireHome.no.plugins}" arg2="false"/> <and>
<equals arg1="${openfireHome.no.plugins}" arg2="false"/>
<available file="${plugin.dest.dir}" />
</and>
<then> <then>
<copy todir="${target.openfireHome}/plugins" failonerror="false"> <copy todir="${target.openfireHome}/plugins" failonerror="false">
<fileset dir="${plugin.dest.dir}"/> <fileset dir="${plugin.dest.dir}"/>
...@@ -825,11 +828,16 @@ ...@@ -825,11 +828,16 @@
</filterset> </filterset>
</copy> </copy>
<copy todir="${release.src.out.dir}/src/plugins/enterprise/lib" failonerror="false"> <if>
<fileset dir="${work.dir}/plugins-dev/enterprise/target/lib"> <available file="${work.dir}/plugins-dev/enterprise/target/lib" />
<include name="*-lib.jar" /> <then>
</fileset> <copy todir="${release.src.out.dir}/src/plugins/enterprise/lib" failonerror="false">
</copy> <fileset dir="${work.dir}/plugins-dev/enterprise/target/lib">
<include name="*-lib.jar" />
</fileset>
</copy>
</then>
</if>
<!-- Copy the i18n files to the resources dir. This way they won't be in the jar only --> <!-- Copy the i18n files to the resources dir. This way they won't be in the jar only -->
<copy todir="${release.src.out.dir}/resources/i18n"> <copy todir="${release.src.out.dir}/resources/i18n">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment