crafterm 2002/08/27 13:16:45 Modified: fortress build.xml Log: Fixed Fortress build, location of Merlin jars had changed Revision Changes Path 1.47 +6 -4 jakarta-avalon-excalibur/fortress/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/build.xml,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- build.xml 14 Aug 2002 14:58:23 -0000 1.46 +++ build.xml 27 Aug 2002 20:16:45 -0000 1.47 @@ -78,11 +78,12 @@ <copy file="${excalibur-concurrent.jar}" todir="${build.dir}/tempjars"/> <copy file="${excalibur-threadcontext.jar}" todir="${build.dir}/tempjars"/> <copy file="${build.lib}/${jar.name}" todir="${build.dir}/tempjars"/> - <copy todir="${build.dir}/tempjars"> - <fileset dir="../assembly/dist"> + <unzip dest="${build.dir}/tempjars" src="../assembly/distributions/merlin-2.0a.zip"> + <patternset> <include name="*.jar"/> - <exclude name="demo.jar"/> - </fileset> + </patternset> + </unzip> + <copy todir="${build.dir}/tempjars"> <fileset dir="../assembly/lib"> <include name="*.jar"/> <exclude name="avalon-framework.jar"/> @@ -102,6 +103,7 @@ </manifest> <zipgroupfileset dir="${build.dir}/tempjars"> <include name="*.jar"/> + <include name="merlin*/*.jar"/> </zipgroupfileset> </jar> </target>
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>