Commit 69003226 authored by Bill Lynch's avatar Bill Lynch Committed by bill

JM-106 -- fixed bug causing plugin to not build if it has no web dir.


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@801 b35dd754-fafc-0310-a699-88a17e54d16e
parent 7691e6fe
...@@ -717,13 +717,22 @@ ...@@ -717,13 +717,22 @@
<fileset dir="${plugin.dev.dest.dir}/@{plugin}/target/classes" /> <fileset dir="${plugin.dev.dest.dir}/@{plugin}/target/classes" />
</jar> </jar>
<!-- JSPC any JSP pages --> <!-- JSPC any JSP pages. Do this conditionally as there might not be a web dir. -->
<available property="plugin.@{plugin}.webdocs.available"
type="dir" file="@{pluginsrc}/@{plugin}/src/web" />
<if>
<equals arg1="${plugin.@{plugin}.webdocs.available}" arg2="true" />
<then>
<!-- Continue with JSPC tasks... -->
<!-- Create output dir --> <!-- Create output dir -->
<mkdir dir="${plugin.dev.dest.dir}/@{plugin}/target/jspc/java" /> <mkdir dir="${plugin.dev.dest.dir}/@{plugin}/target/jspc/java" />
<mkdir dir="${plugin.dev.dest.dir}/@{plugin}/target/jspc/classes" /> <mkdir dir="${plugin.dev.dest.dir}/@{plugin}/target/jspc/classes" />
<!-- Copy jsp's from plugin and web.xml from messenger to a temp dir --> <!-- Copy jsp's from plugin and web.xml from messenger to a temp dir. We'll
not fail on an error since the web dir might not exist.
-->
<copy todir="${plugin.dev.dest.dir}/@{plugin}/target/web"> <copy todir="${plugin.dev.dest.dir}/@{plugin}/target/web">
<fileset dir="@{pluginsrc}/@{plugin}/src/web" /> <fileset dir="@{pluginsrc}/@{plugin}/src/web" />
<fileset dir="${web.dir}"> <fileset dir="${web.dir}">
...@@ -780,6 +789,9 @@ ...@@ -780,6 +789,9 @@
<fileset dir="${plugin.dev.dest.dir}/@{plugin}/target/jspc/classes" includes="**/*.class" /> <fileset dir="${plugin.dev.dest.dir}/@{plugin}/target/jspc/classes" includes="**/*.class" />
</jar> </jar>
</then>
</if>
<!-- Copy everything to Messenger's plugin dir --> <!-- Copy everything to Messenger's plugin dir -->
<copy todir="${plugin.dest.dir}/@{plugin}"> <copy todir="${plugin.dest.dir}/@{plugin}">
<fileset dir="${plugin.dev.dest.dir}/@{plugin}/target"> <fileset dir="${plugin.dev.dest.dir}/@{plugin}/target">
...@@ -796,7 +808,7 @@ ...@@ -796,7 +808,7 @@
<exclude name="java/**/*.java" /> <exclude name="java/**/*.java" />
</fileset> </fileset>
</copy> </copy>
<copy todir="${plugin.dest.dir}/@{plugin}/web"> <copy todir="${plugin.dest.dir}/@{plugin}/web" failonerror="false">
<fileset dir="${plugin.dev.dest.dir}/@{plugin}/target/jspc"> <fileset dir="${plugin.dev.dest.dir}/@{plugin}/target/jspc">
<include name="web.xml" /> <include name="web.xml" />
</fileset> </fileset>
......
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