From: <ti...@ww...> - 2003-08-22 17:34:38
|
Update of /usr/cvsroot/melati/build In directory ganesh.paneris.org:/tmp/cvs-serv2506 Modified Files: build.xml Log Message: Include templates and DSD in jar, add everything to jetty path Index: build.xml =================================================================== RCS file: /usr/cvsroot/melati/build/build.xml,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -r1.32 -r1.33 *** build.xml 2003/07/12 00:52:06 1.32 --- build.xml 2003/08/22 17:53:00 1.33 *************** *** 63,66 **** --- 63,77 ---- <pathelement path="${build.lib}/org.apache.jasper.jar"/> <pathelement path="${build.lib}/org.mortbay.jetty.jar"/> + <pathelement path="${build.lib}/javax.servlet.jar"/> + <pathelement path="${build.lib}/pg73jdbc3.jar"/> + <pathelement path="${build.lib}/webmacro-1.1.jar"/> + <pathelement path="${build.lib}/velocity-1.3-rc1.jar" /> + <pathelement path="${build.lib}/velocity-dep-1.3-rc1.jar" /> + <pathelement path="${build.lib}/odmg3.jar" /> + <pathelement path="${build.lib}/junit.jar" /> + <pathelement path="${build.lib}/hsqldb.jar"/> + <pathelement path="${build.lib}/mm.mysql-2.0.11-bin.jar" /> + <pathelement path="${build.lib}/tools.jar"/> + <pathelement path="${built.lib}/melati.jar"/> </path> <path id="classpath.drivers"> *************** *** 159,163 **** <patternset> <include name="**/*.properties.example"/> - <exclude name="**/dist/**"/> </patternset> </fileset> --- 170,173 ---- *************** *** 168,182 **** <!-- Creates .jar and the .zip files --> <!-- ================================================================= --> - <!-- don't include properties and wm files in jar --> <target name="jar"> ! <mkdir dir="${built.lib}"/> ! <!-- The **/*.dsd currently does nothing because of a resource --> ! <!-- loader bug such that Poem.dsd must be a real file on the --> ! <!-- classpath. --> ! <jar jarfile="${built.lib}/${project}.jar" ! basedir="${compiled.root}" ! includes="**/*.class, **/*.dsd" ! /> </target> <target name="zip" depends="jar"> --- 178,201 ---- <!-- Creates .jar and the .zip files --> <!-- ================================================================= --> <target name="jar"> ! <mkdir dir="${built.lib}"/> ! <!-- Do include the DSD and WM files in the jar --> ! <copy todir="${compiled.root}"> ! <fileset dir="${src}"> ! <patternset> ! <include name="**/*.wm"/> ! <include name="**/*.dsd"/> ! </patternset> ! </fileset> ! </copy> ! <!-- The **/*.dsd currently does nothing because of a resource --> ! <!-- loader bug such that Poem.dsd must be a real file on the --> ! <!-- classpath. --> ! <!-- Not sure the above is true anymore, as the DSD wasn't in the jar --> ! <jar jarfile="${built.lib}/${project}.jar" ! basedir="${compiled.root}" ! includes="**/*.class, **/*.dsd, **/*.wm" ! /> </target> <target name="zip" depends="jar"> |