Fix for build.xml to stop false build failings from TeamCity

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@8127 b35dd754-fafc-0310-a699-88a17e54d16e

Fix for build.xml to stop false build failings from TeamCity
git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@8127 b35dd754-fafc-0310-a699-88a17e54d16e
2b6c8e12 · Quality Assurance · qa · e7becf77 · 2b6c8e12
Commit 2b6c8e12 authored Apr 30, 2007 by Quality Assurance Committed by qa Apr 30, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 9 deletions

build.xml build/build.xml +19 -9

No files found.
--- a/build/build.xml
+++ b/build/build.xml
@@ -1272,17 +1272,27 @@
            </if>
            <!-- Copy anything in the plugin's lib dir to the target lib dir -->
-            <copy todir="${plugin.dev.dest.dir}/@{plugin}/target/lib" failonerror="false"
+            <if>
-                  overwrite="${overwrite}">
+                <available file="@{pluginsrc}/@{plugin}/lib" />
-                <fileset dir="@{pluginsrc}/@{plugin}/lib" includes="**/*.*"/>
+                <then>
-            </copy>
+                    <copy todir="${plugin.dev.dest.dir}/@{plugin}/target/lib" failonerror="false"
+                          overwrite="${overwrite}">
+                        <fileset dir="@{pluginsrc}/@{plugin}/lib" includes="**/*.*"/>
+                    </copy>
+                </then>
+            </if>
            <!-- Copy web.xml to web-custom.xml -->
-            <copy todir="${plugin.dev.dest.dir}/@{plugin}/target/web/WEB-INF" failonerror="false"
+            <if>
-                  overwrite="${overwrite}">
+                <available file="@{pluginsrc}/@{plugin}/src/web/WEB-INF" />
-                <fileset dir="@{pluginsrc}/@{plugin}/src/web/WEB-INF" includes="web.xml"/>
+                <then>
-                <mapper type="glob" from="web.xml" to="web-custom.xml"/>
+                    <copy todir="${plugin.dev.dest.dir}/@{plugin}/target/web/WEB-INF" failonerror="false"
-            </copy>
+                          overwrite="${overwrite}">
+                        <fileset dir="@{pluginsrc}/@{plugin}/src/web/WEB-INF" includes="web.xml"/>
+                        <mapper type="glob" from="web.xml" to="web-custom.xml"/>
+                    </copy>
+                </then>
+            </if>
            <!-- Copy the plugin.xml and documentation to the target dir, code below assumes it's there -->
            <mkdir dir="${plugin.dev.dest.dir}/@{plugin}/jar"/>