Commit d8e89260 authored by Shawn Debnath's avatar Shawn Debnath

Add the custom lib directory as compile time dependency.

parent 884072b6
...@@ -148,6 +148,10 @@ ...@@ -148,6 +148,10 @@
<fileset dir="${lib.web.dir}" includes="*.jar"/> <fileset dir="${lib.web.dir}" includes="*.jar"/>
</path> </path>
<path id="custom.dependencies">
<fileset dir="${overlay.lib.dir}" includes="*.jar"/>
</path>
<path id="test.dependencies"> <path id="test.dependencies">
<path refid="compile.dependencies"/> <path refid="compile.dependencies"/>
<fileset dir="${jar.dest.dir}" includes="openfire.jar"/> <fileset dir="${jar.dest.dir}" includes="openfire.jar"/>
...@@ -280,6 +284,18 @@ ...@@ -280,6 +284,18 @@
</classpath> </classpath>
</of.javac> </of.javac>
<available file="${overlay.lib.dir}" type="dir" property="overlay.lib.found"/>
<if>
<equals arg1="${overlay.lib.found}" arg2="true"/>
<then>
<mkdir dir="${jar.dest.dir}"/>
<copy todir="${jar.dest.dir}" overwrite="true">
<fileset dir="${overlay.lib.dir}" includes="*.*"/>
</copy>
</then>
<else><echo>No custom lib here </echo></else>
</if>
<available file="${overlay.src.dir}" type="dir" property="overlay.source.found"/> <available file="${overlay.src.dir}" type="dir" property="overlay.source.found"/>
<if> <if>
<equals arg1="${overlay.source.found}" arg2="true"/> <equals arg1="${overlay.source.found}" arg2="true"/>
...@@ -293,6 +309,7 @@ ...@@ -293,6 +309,7 @@
<src path="${overlay.src.dir}"/> <src path="${overlay.src.dir}"/>
<patternset refid="compile.sources"/> <patternset refid="compile.sources"/>
<classpath> <classpath>
<path refid="custom.dependencies"/>
<path refid="compile.dependencies"/> <path refid="compile.dependencies"/>
<path location="${compile.dir}"/> <path location="${compile.dir}"/>
</classpath> </classpath>
...@@ -301,18 +318,6 @@ ...@@ -301,18 +318,6 @@
</then> </then>
<else><echo>Nothing to compile from custom here </echo></else> <else><echo>Nothing to compile from custom here </echo></else>
</if> </if>
<available file="${overlay.lib.dir}" type="dir" property="overlay.lib.found"/>
<if>
<equals arg1="${overlay.lib.found}" arg2="true"/>
<then>
<mkdir dir="${jar.dest.dir}"/>
<copy todir="${jar.dest.dir}" overwrite="true">
<fileset dir="${overlay.lib.dir}" includes="*.*"/>
</copy>
</then>
<else><echo>No custom lib here </echo></else>
</if>
</target> </target>
<!-- i18n ================================================================================== --> <!-- 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