From: megacz Date: Fri, 30 Jan 2004 06:45:46 +0000 (+0000) Subject: 2002/04/27 21:41:24 X-Git-Tag: RC3~1829 X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=80c104c764dcb0bc4a4eb1a3e7fac22e65623db3 2002/04/27 21:41:24 darcs-hash:20040130064546-2ba56-5d3b780cdbb883ec3ad230ef7f770680e7a62d40.gz --- diff --git a/CHANGES b/CHANGES index 794d44e..5a21677 100644 --- a/CHANGES +++ b/CHANGES @@ -49,6 +49,10 @@ 26-Apr megacz src/org/xwt/tasks/BashTask.java: added ssh support +26-Apr megacz README: added file locking patch + + + diff --git a/README b/README index 10b4465..bbe83b7 100644 --- a/README +++ b/README @@ -149,8 +149,10 @@ Building without it, however, since it puts additional strain on the gcc cvs server. - There's also a patch at the end of this file which can be applied to - the branch in order to make Throwable.printStackTrace() work. + There are also two patches at the end of this file which can be + applied to the branch -- the first disables Win32 file locking (so + you can view XWT's log files while it is running), and the second + makes Throwable.printStackTrace() work. # create an install area export CLASSPATH= @@ -199,6 +201,29 @@ Building + +______________________________________________________________________________ +File Locking Patch + +Index: java/io/natFileDescriptorWin32.cc +=================================================================== +RCS file: /cvs/gcc/gcc/libjava/java/io/natFileDescriptorWin32.cc,v +retrieving revision 1.5.2.2 +diff -u -r1.5.2.2 natFileDescriptorWin32.cc +--- java/io/natFileDescriptorWin32.cc 10 Mar 2002 03:34:59 -0000 1.5.2.2 ++++ java/io/natFileDescriptorWin32.cc 27 Apr 2002 08:40:40 -0000 +@@ -112,7 +112,7 @@ + create = CREATE_ALWAYS; + } + +- handle = CreateFile(buf, access, share, NULL, create, 0, NULL); ++ handle = CreateFile(buf, access, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, create, 0, NULL); + + if (handle == INVALID_HANDLE_VALUE) + { + + + ______________________________________________________________________________ Throwable.printStackTrace() patch @@ -419,3 +444,8 @@ diff -u -r1.11 natThrowable.cc + return (jlong)stack[i]; +} + + + + + +