rik/jlibusb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- separated jar files for usb/usbpdi

Browse Source 
git-svn-id: https://svn.code.sf.net/p/libusbjava/code/trunk@140 94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c
This commit is contained in:
schlaepfer
2006-04-28 06:30:34 +00:00
parent ac1a015833
commit 2feb71998d
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
blackbox/Usb/Mod/BDI.otd
View File

@@ -23,10 +23,11 @@ MODULE UsbBDI;
MAX_UART_DATA_LENGTH* = BDI.MAX_UART_DATA_LENGTH; MAX_UART_DATA_LENGTH* = BDI.MAX_UART_DATA_LENGTH;
CONST CONST
PATH_SEPERATOR = "\"; PATH_SEPARATOR = "\";
JAR_FILE = "usbpdi.jar"; ARG_SEPARATOR = ";";
JAR_LOCATION = "Usb" + PATH_SEPERATOR + "Rsrc"; JAR_FILE_USB = "usb.jar";
CLASSPATH = JAR_LOCATION + PATH_SEPERATOR + JAR_FILE; JAR_FILE_BDI = "usbpdi.jar";
JAR_LOCATION = "Usb" + PATH_SEPARATOR + "Rsrc";
TYPE TYPE
StdReaderWriter = POINTER TO ABSTRACT RECORD (Services.Action) StdReaderWriter = POINTER TO ABSTRACT RECORD (Services.Action)
@@ -377,9 +378,9 @@ MODULE UsbBDI;
args := WinApi.CommandLineToArgvW(cmdLinePtr, nofArgs); args := WinApi.CommandLineToArgvW(cmdLinePtr, nofArgs);
n := LEN(args[0]$); n := LEN(args[0]$);
REPEAT DEC(n) UNTIL (args[0][n] = PATH_SEPERATOR) OR (n <= 0); args[0][n] := nul; REPEAT DEC(n) UNTIL (args[0][n] = PATH_SEPARATOR) OR (n <= 0); args[0][n] := nul;
sysStartUpLocator := HostFiles.NewLocator(args[0]$); args[0][n] := PATH_SEPERATOR; sysStartUpLocator := HostFiles.NewLocator(args[0]$); args[0][n] := PATH_SEPARATOR;
sysStartUpHostLoc := sysStartUpLocator(HostFiles.Locator); sysStartUpHostLoc := sysStartUpLocator(HostFiles.Locator);
FOR i := 0 TO LEN(sysStartUpHostLoc.path$) DO FOR i := 0 TO LEN(sysStartUpHostLoc.path$) DO
startupPath[i] := SYS.VAL(SHORTCHAR, sysStartUpHostLoc.path[i]); startupPath[i] := SYS.VAL(SHORTCHAR, sysStartUpHostLoc.path[i]);
@@ -408,16 +409,22 @@ MODULE UsbBDI;
IF ~jvmCreated THEN IF ~jvmCreated THEN
(* Check for existence of jar-file (whether in user of system directory) *) (* Check for existence of jar-file (whether in user of system directory) *)
GetUserStartUpPath(startupPath); GetUserStartUpPath(startupPath);
IF ~CheckIfFileExists(startupPath + PATH_SEPERATOR + JAR_LOCATION, JAR_FILE) THEN IF ~CheckIfFileExists(startupPath + PATH_SEPARATOR + JAR_LOCATION, JAR_FILE_USB) OR
~CheckIfFileExists(startupPath + PATH_SEPARATOR + JAR_LOCATION, JAR_FILE_BDI) THEN
GetSystemStartUpPath(startupPath); GetSystemStartUpPath(startupPath);
IF ~CheckIfFileExists(startupPath + PATH_SEPERATOR + JAR_LOCATION, JAR_FILE) THEN IF ~CheckIfFileExists(startupPath + PATH_SEPARATOR + JAR_LOCATION, JAR_FILE_USB) OR
Log.String(JAR_FILE + " not found in user or system path; expected in " + JAR_LOCATION); Log.Ln; ~CheckIfFileExists(startupPath + PATH_SEPARATOR + JAR_LOCATION, JAR_FILE_BDI) THEN
Log.String(JAR_FILE_USB + " or " + JAR_FILE_BDI +
" not found in user or system path; expected in " + JAR_LOCATION); Log.Ln;
HALT(76);
END END
END; END;
Log.String("Startup Path: " + startupPath); Log.Ln; Log.String("Startup Path: " + startupPath); Log.Ln;
CreateJVM(startupPath + PATH_SEPERATOR + CLASSPATH); CreateJVM(startupPath + PATH_SEPARATOR + JAR_LOCATION + PATH_SEPARATOR + JAR_FILE_USB +
ARG_SEPARATOR + startupPath + PATH_SEPARATOR + JAR_LOCATION + PATH_SEPARATOR +
JAR_FILE_BDI);
(* (*
CreateJVM("D:\work\USB\eclipse\mcdp\bin\"); CreateJVM("D:\work\USB\eclipse\mcdp\jars\usb.jar;D:\work\USB\eclipse\mcdp\jars\usbpdi.jar");
*) *)
IF ~Done THEN HALT(78) END; IF ~Done THEN HALT(78) END;
jvmCreated := TRUE; jvmCreated := TRUE;

BIN
blackbox/Usb/Rsrc/usb.jar Normal file
View File

Binary file not shown.

BIN
blackbox/Usb/Rsrc/usbpdi.jar
View File

Binary file not shown.