Update of /cvsroot/coefficient/coefficient
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13399
Modified Files:
modules-common.ent
Log Message:
Added conditional include of module's lib directory. This provides cleaner solution to this problem (se ugliness in discussion/build.xml for an example of the problem). NOTE: requires Ant 1.6.3 or newer
Index: modules-common.ent
===================================================================
RCS file: /cvsroot/coefficient/coefficient/modules-common.ent,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** modules-common.ent 7 Jul 2005 14:22:21 -0000 1.16
--- modules-common.ent 18 Jul 2005 11:51:00 -0000 1.17
***************
*** 5,8 ****
--- 5,11 ----
<property name="version" value="0.9.6"/>
<property name="lib.dir" value="${coefficient.path}/lib"/>
+ <condition property="module.lib.dir" value="lib" else="${lib.dir}">
+ <available file="lib/" type="dir" />
+ </condition>
<property name="dir.jalopy" value="${coefficient.path}/jalopyLib"/>
<property name="ear.file" value="${project.name}-${version}.ear"/>
***************
*** 36,39 ****
--- 39,45 ----
<include name="**/*.jar"/>
</fileset>
+ <fileset dir="${module.lib.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
<!-- this is so we can find the core libs -->
|
