Commit 2ef2ce85 authored by Bill Lynch's avatar Bill Lynch Committed by bill

Minor


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@508 b35dd754-fafc-0310-a699-88a17e54d16e
parent c2df92e4
...@@ -533,7 +533,7 @@ ...@@ -533,7 +533,7 @@
<fileset dir="${docs.dir}/docs/licenses" /> <fileset dir="${docs.dir}/docs/licenses" />
</copy> </copy>
<copy todir="${release.src.out.dir}/documentation"> <copy todir="${release.src.out.dir}/documentation">
<fileset dir="${docs.dir}/licenses" /> <fileset dir="${docs.dir}/docs/licenses" />
</copy> </copy>
<!-- Copy Javadocs --> <!-- Copy Javadocs -->
...@@ -616,12 +616,16 @@ ...@@ -616,12 +616,16 @@
<!-- plugins =============================================================================== --> <!-- plugins =============================================================================== -->
<target name="plugins"> <target name="plugins">
<!-- Call jar task, can't do this is as a 'depends' call of this target because
of the way class loading works for jspc calls.
-->
<ant antfile="${basedir}/build/build.xml" dir="${basedir}" <ant antfile="${basedir}/build/build.xml" dir="${basedir}"
target="jar" inheritAll="false" inheritRefs="false" target="jar" inheritAll="false" inheritRefs="false"
> >
<property name="no.jspc" value="true" /> <property name="no.jspc" value="true" />
</ant> </ant>
<!-- Get a list of subdirs of the main plugins dir. This tells us which plugins to make. -->
<subdirinfo dir="${plugin.src.dir}" property="dirlist" ifexists="plugin.xml" except="admin" /> <subdirinfo dir="${plugin.src.dir}" property="dirlist" ifexists="plugin.xml" except="admin" />
<antcall target="-plugins-impl" /> <antcall target="-plugins-impl" />
...@@ -629,6 +633,7 @@ ...@@ -629,6 +633,7 @@
</target><target name="-plugins-impl" unless="${dirlist}"> </target><target name="-plugins-impl" unless="${dirlist}">
<!-- For each plugin in the main src dir, call the 'buildplugin' macro -->
<for list="${dirlist}" param="plugin" trim="true"> <for list="${dirlist}" param="plugin" trim="true">
<sequential> <sequential>
<buildplugin plugin="@{plugin}" pluginsrc="${plugin.src.dir}" /> <buildplugin plugin="@{plugin}" pluginsrc="${plugin.src.dir}" />
...@@ -637,12 +642,14 @@ ...@@ -637,12 +642,14 @@
</target><target name="-plugins-impl-dev" unless="${plugin.dev.dir}"> </target><target name="-plugins-impl-dev" unless="${plugin.dev.dir}">
<!-- Get a list of plugins in the optional dev dir -->
<subdirinfo dir="${plugin.dev.dir}" property="dirlist2" ifexists="plugin.xml" /> <subdirinfo dir="${plugin.dev.dir}" property="dirlist2" ifexists="plugin.xml" />
<antcall target="-plugin-impl-dev-build" /> <antcall target="-plugin-impl-dev-build" />
</target><target name="-plugin-impl-dev-build" if="dirlist2"> </target><target name="-plugin-impl-dev-build" if="dirlist2">
<!-- For each list of plugins in the dev dir call the 'buildplugin' macro -->
<for list="${dirlist2}" param="plugin" trim="true"> <for list="${dirlist2}" param="plugin" trim="true">
<sequential> <sequential>
<buildplugin plugin="@{plugin}" pluginsrc="${plugin.dev.dir}" /> <buildplugin plugin="@{plugin}" pluginsrc="${plugin.dev.dir}" />
......
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