|
From: Mike C. <mc...@us...> - 2008-08-05 20:07:44
|
Update of /cvsroot/javax-usb/javax-usb-libusb In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv2966 Modified Files: build.xml Log Message: changes that make it easier to switch from windows to linux implementations of libusb Index: build.xml =================================================================== RCS file: /cvsroot/javax-usb/javax-usb-libusb/build.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** build.xml 5 Aug 2008 16:33:41 -0000 1.2 --- build.xml 5 Aug 2008 20:07:39 -0000 1.3 *************** *** 2,5 **** --- 2,6 ---- <!-- JSR80 Windows Implementation --> <!-- + * Copyright (c) 2008 mcrowe GCDC LLC * Copyright (c) 2005 m-creations GmbH * Copyright (c) 2003 Dan Streetman (dds...@ie...) *************** *** 17,21 **** <!-- Note these depend on ANT not overwriting preset variables --> <property environment="Jsr80Env"/> ! <property name="Jsr80Env.JSR80_RI_BASE_DIR" value="../javax-usb-ri"/> <property name="Jsr80Env.JSR80_BASE_DIR" value="../javax-usb"/> <property name="Jsr80Env.JSR80_WINDOWS_JARFILE" value="jsr80_windows.jar"/> <property name="Jsr80Env.JSR80_WINDOWS_SRC_DIR" value="src"/> --- 18,25 ---- <!-- Note these depend on ANT not overwriting preset variables --> <property environment="Jsr80Env"/> ! ! <property name="Jsr80Env.JSR80_RI_BASE_DIR" value="./"/> ! <property name="Jsr80Env.JSR80_BASE_DIR" value="./"/> ! <property name="Jsr80Env.JSR80_WINDOWS_JARFILE" value="jsr80_windows.jar"/> <property name="Jsr80Env.JSR80_WINDOWS_SRC_DIR" value="src"/> *************** *** 80,83 **** --- 84,89 ---- <property name="jsr80.windows.jdoc.private" value="no"/> + <property name="jsr80_ri.jar.available" value="no"/> + <property name="jsr80.windows.jdoc.path" value="${Jsr80Env.JSR80_WINDOWS_JDOC_PATH}"/> *************** *** 99,103 **** <!-- clean, compile, jars, jdoc --> <target name="all" depends="clean,compile,jars,jdoc"/> ! <!-- build the jsr80.jar, if not available by calling its build.xml --> <target name="jar-ri" unless="jsr80_ri.jar.available"> <echo message="Building jsr80_ri.jar first."/> <ant antfile="${Jsr80Env.JSR80_RI_BASE_DIR}/build.xml" target="jars" /> </target> <!-- Compile classfiles and create the native library --> <target name="compile"> --- 105,113 ---- <!-- clean, compile, jars, jdoc --> <target name="all" depends="clean,compile,jars,jdoc"/> ! <!-- build the jsr80.jar, if not available by calling its build.xml --> ! <target name="jar-ri" unless="jsr80_ri.jar.available"> ! <echo message="Building jsr80_ri.jar first."/> ! <ant antfile="${Jsr80Env.JSR80_RI_BASE_DIR}/build.xml" target="jars" /> ! </target> <!-- Compile classfiles and create the native library --> <target name="compile"> |