From: Eric P. <th...@us...> - 2010-09-07 16:56:16
|
Update of /cvsroot/sandev/sand/platform/sandbuild/build In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv7391 Modified Files: build.xml Log Message: Compile and doc now links to ant.home/lib explicitely rather than relying on CLASSPATH being set in the env. cleanup uses failonerror=false. Result sandbuild.jar is copied to ant.home/lib so it gets loaded at startup sothe singleton reference works. Index: build.xml =================================================================== RCS file: /cvsroot/sandev/sand/platform/sandbuild/build/build.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** build.xml 13 Jun 2007 18:06:39 -0000 1.2 --- build.xml 7 Sep 2010 16:56:08 -0000 1.3 *************** *** 16,19 **** --- 16,22 ---- <!-- <compilerarg value="-Xlint:unchecked"/> --> <classpath> + <fileset dir="${ant.home}/lib"> + <include name="**/*.jar"/> + </fileset> <pathelement location="${runenv.JAVA_HOME}/lib/tools.jar"/> <pathelement location="${runenv.ANT_HOME}/lib/ant.jar"/> *************** *** 25,28 **** --- 28,32 ---- <mkdir dir="../env"/> <jar jarfile="../env/sandbuild.jar" basedir="classes"/> + <copy todir="${ant.home}/lib" file="../env/sandbuild.jar"/> </target> *************** *** 32,35 **** --- 36,42 ---- packagenames="org.sandev.*" failonerror="true"> <classpath> + <fileset dir="${ant.home}/lib"> + <include name="**/*.jar"/> + </fileset> <pathelement location="${runenv.JAVA_HOME}/lib/tools.jar"/> <pathelement location="${runenv.ANT_HOME}/lib/ant.jar"/> *************** *** 39,46 **** <target name="clean"> ! <delete dir="classes"/> ! <delete dir="../docs/javadoc"/> ! <delete file="../env/sandbuild.jar"/> </target> </project> --- 46,55 ---- <target name="clean"> ! <delete dir="classes" failonerror="false"/> ! <delete dir="../docs/javadoc" failonerror="false"/> ! <delete file="../env/sandbuild.jar" failonerror="false"/> ! <delete file="${ant.home}/lib/sandbuild.jar" failonerror="false"/> </target> + <target name="scrub" depends="clean"/> </project> |