|
From: Mike C. <mc...@us...> - 2008-08-05 16:33:47
|
Update of /cvsroot/javax-usb/javax-usb-libusb In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv30994 Modified Files: build.xml Log Message: better clean target, new path elements to use ./lib location better Index: build.xml =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/build.xml,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** build.xml 9 Jan 2006 21:11:45 -0000 1.1.1.1 --- build.xml 5 Aug 2008 16:33:41 -0000 1.2 *************** *** 102,106 **** <!-- Compile classfiles and create the native library --> <target name="compile"> ! <available file="${Jsr80Env.JSR80_RI_BASE_DIR}/lib/jsr80_ri.jar" property="jsr80_ri.jar.available" value="true" /> <antcall target="jar-ri" /> <echo message="Compiling class files."/> <mkdir dir="${jsr80.windows.dest.dir}"/> <javac --- 102,111 ---- <!-- Compile classfiles and create the native library --> <target name="compile"> ! <available ! file="${Jsr80Env.JSR80_RI_BASE_DIR}/lib/jsr80_ri.jar" ! property="jsr80_ri.jar.available" ! value="true"/> ! <antcall target="jar-ri" /> ! <echo message="Compiling class files."/> <mkdir dir="${jsr80.windows.dest.dir}"/> <javac *************** *** 111,118 **** deprecation="${jsr80.windows.deprecation}" verbose="${jsr80.windows.verbose}" ! failonerror="yes"> <classpath> <pathelement location="${Jsr80Env.JSR80_RI_BASE_DIR}/lib/jsr80_ri.jar"/> <pathelement location="${Jsr80Env.JSR80_BASE_DIR}/lib/jsr80.jar"/> </classpath> </javac> <!-- <exec executable="build" dir="${jsr80.windows.jni.src.dir}" failonerror="yes"> ! </exec> --> </target> --- 116,130 ---- deprecation="${jsr80.windows.deprecation}" verbose="${jsr80.windows.verbose}" ! failonerror="yes"> ! <classpath> ! <pathelement location="./lib/commons-logging.jar"/> ! <pathelement location="./lib/log4j.jar"/> ! <pathelement location="${Jsr80Env.JSR80_RI_BASE_DIR}/lib/jsr80_ri.jar"/> ! <pathelement location="${Jsr80Env.JSR80_BASE_DIR}/lib/jsr80.jar"/> ! </classpath> ! </javac> <!-- <exec executable="build" dir="${jsr80.windows.jni.src.dir}" failonerror="yes"> ! </exec> --> </target> *************** *** 199,204 **** <target name="clean"> <echo message="Cleaning everything."/> ! <delete verbose="${jsr80.windows.verbose}" quiet="${jsr80.windows.quiet}" failonerror="false"> ! <fileset dir="${jsr80.windows.dest.dir}" includes="com/ibm/jusb/**/*.class"/> <fileset dir="${jsr80.windows.jarfile.dir}" includes="${jsr80.windows.jarfile}"/> <fileset dir="${jsr80.windows.jni.dest.dir}" includes="${jsr80.windows.jni.library}"/> --- 211,218 ---- <target name="clean"> <echo message="Cleaning everything."/> ! <!-- <defaultexcludes echo="true"/> --> ! <delete verbose="${jsr80.windows.verbose}" quiet="${jsr80.windows.quiet}" failonerror="true"> ! <fileset dir="." defaultexcludes="false" includes="**/*~"/> ! <fileset dir="${jsr80.windows.dest.dir}" includes="**/*.class"/> <fileset dir="${jsr80.windows.jarfile.dir}" includes="${jsr80.windows.jarfile}"/> <fileset dir="${jsr80.windows.jni.dest.dir}" includes="${jsr80.windows.jni.library}"/> |