Commit 1f5e0458 authored by Daryl Herzmann's avatar Daryl Herzmann Committed by akrherz

always rebuild subdirinfo task, refs OF-194


git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@13042 b35dd754-fafc-0310-a699-88a17e54d16e
parent a748b317
...@@ -32,11 +32,6 @@ ...@@ -32,11 +32,6 @@
<pathelement location="${basedir}/build/lib/ant-contrib.jar"/> <pathelement location="${basedir}/build/lib/ant-contrib.jar"/>
</classpath> </classpath>
</taskdef> </taskdef>
<taskdef name="subdirinfo" classname="org.jivesoftware.ant.SubDirInfoTask">
<classpath>
<pathelement location="${basedir}/build/lib/ant-subdirtask.jar"/>
</classpath>
</taskdef>
<taskdef name="xmltask" classname="com.oopsconsultancy.xmltask.ant.XmlTask"> <taskdef name="xmltask" classname="com.oopsconsultancy.xmltask.ant.XmlTask">
<classpath> <classpath>
<pathelement location="${basedir}/build/lib/xmltask.jar"/> <pathelement location="${basedir}/build/lib/xmltask.jar"/>
...@@ -338,7 +333,7 @@ ...@@ -338,7 +333,7 @@
</if> </if>
</target> </target>
<target name="plugins-dev"> <target name="plugins-dev" depends="anttasks">
<!-- Setup Openfire --> <!-- Setup Openfire -->
<ant antfile="${basedir}/build/build.xml" dir="${basedir}" target="openfire" <ant antfile="${basedir}/build/build.xml" dir="${basedir}" target="openfire"
inheritAll="false" inheritRefs="false"/> inheritAll="false" inheritRefs="false"/>
...@@ -1206,7 +1201,7 @@ ...@@ -1206,7 +1201,7 @@
</target> </target>
<!-- plugins =============================================================================== --> <!-- plugins =============================================================================== -->
<target name="plugins" description="Builds all plugins"> <target name="plugins" description="Builds all plugins" depends="anttasks">
<tstamp> <tstamp>
<format property="buildJavaDate" pattern="MMM dd, yyyy"/> <format property="buildJavaDate" pattern="MMM dd, yyyy"/>
</tstamp> </tstamp>
...@@ -1248,7 +1243,7 @@ ...@@ -1248,7 +1243,7 @@
</for> </for>
</target> </target>
<target name="-plugins-impl-dev" if="plugin.dev.dir"> <target name="-plugins-impl-dev" if="plugin.dev.dir" depends="anttasks">
<!-- Get a list of plugins in the optional 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"/>
...@@ -1638,6 +1633,12 @@ ...@@ -1638,6 +1633,12 @@
<jar jarfile="${anttools.target.dir}/ant-subdirtask.jar"> <jar jarfile="${anttools.target.dir}/ant-subdirtask.jar">
<fileset dir="${anttools.target.dir}/classes" includes="**/*.class"/> <fileset dir="${anttools.target.dir}/classes" includes="**/*.class"/>
</jar> </jar>
<taskdef name="subdirinfo" classname="org.jivesoftware.ant.SubDirInfoTask">
<classpath>
<pathelement location="${basedir}/build/lib/ant-subdirtask.jar"/>
</classpath>
</taskdef>
</target> </target>
<!-- clean ================================================================================= --> <!-- clean ================================================================================= -->
......
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