[kaffe] CVS kaffe (robilad): No comment

2005-09-13 Thread Kaffe CVS

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe


[kaffe] CVS kaffe (robilad): Fixed native library loading on Cygwin

2005-09-13 Thread Kaffe CVS
PatchSet 6896 
Date: 2005/09/14 04:38:08
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Fixed native library loading on Cygwin

Members: 
ChangeLog:1.4417->1.4418 
libraries/javalib/java/lang/Runtime.java:1.36->1.37 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4417 kaffe/ChangeLog:1.4418
--- kaffe/ChangeLog:1.4417  Tue Sep 13 21:37:43 2005
+++ kaffe/ChangeLog Wed Sep 14 04:38:08 2005
@@ -1,5 +1,15 @@
 2005-09-13  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * libraries/java/java/lang/Runtime.java
+   (loadLibrary) Try multiple different 
+   prefixes and suffixes if library can't be loaded
+   using the mapped name. This takes care of 
+   Cygwin DLLs, Libtool modules and hopefully
+   will work for dylibs, jnilibs and similar
+   DSO variants as well.
+
+2005-09-13  Dalibor Topic  <[EMAIL PROTECTED]>
+
* kaffe/scripts/javap.in,
kaffe/scripts/native2ascii.in,
kaffe/scripts/rmic.in,
Index: kaffe/libraries/javalib/java/lang/Runtime.java
diff -u kaffe/libraries/javalib/java/lang/Runtime.java:1.36 
kaffe/libraries/javalib/java/lang/Runtime.java:1.37
--- kaffe/libraries/javalib/java/lang/Runtime.java:1.36 Sun Aug 21 00:41:02 2005
+++ kaffe/libraries/javalib/java/lang/Runtime.java  Wed Sep 14 04:37:46 2005
@@ -760,6 +760,26 @@
for (int i = 0; i < libpath.length; i++)
  if (loadLib(libpath[i] + filename, loader) != 0)
return;
+
+   // OK. That did not work. Let's be creative and try different
+   // prefix-suffix combinations.
+   // NB: Yes, this is a wasteful implementation.
+
+   String [] prefixes = {"lib",
+ "cyg", 
+ "" };
+   String [] suffixes = {".so",
+ ".dll", 
+ ".la",
+ ".a",
+ ".dylib", 
+ ".jnilib",
+ ".dll.a"};
+   for (int j = 0; j < prefixes.length; j++)
+   for (int k = 0; k < suffixes.length; k++)
+   for (int i = 0; i < libpath.length; i++)
+   if (loadLib(libpath[i] + prefixes[j] + libname + 
suffixes[k], loader) != 0)
+   return;
   }
 throw new UnsatisfiedLinkError("Native library `" + libname
   + "' not found (as file `" + filename 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe


[kaffe] CVS kaffe (robilad): Fixed wrapper scripts for cp-tools

2005-09-13 Thread Kaffe CVS
PatchSet 6895 
Date: 2005/09/13 21:37:43
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Fixed wrapper scripts for cp-tools

2005-09-13  Dalibor Topic  <[EMAIL PROTECTED]>

* kaffe/scripts/javap.in,
kaffe/scripts/native2ascii.in,
kaffe/scripts/rmic.in,
kaffe/scripts/serialver.in:
Updated to reflect moved tools.jar location.

Members: 
ChangeLog:1.4416->1.4417 
kaffe/scripts/javap.in:INITIAL->1.9 
kaffe/scripts/native2ascii.in:1.7->1.8 
kaffe/scripts/rmic.in:1.9->1.10 
kaffe/scripts/serialver.in:1.7->1.8 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4416 kaffe/ChangeLog:1.4417
--- kaffe/ChangeLog:1.4416  Tue Sep 13 20:28:41 2005
+++ kaffe/ChangeLog Tue Sep 13 21:37:43 2005
@@ -1,5 +1,13 @@
 2005-09-13  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * kaffe/scripts/javap.in,
+   kaffe/scripts/native2ascii.in,
+   kaffe/scripts/rmic.in,
+   kaffe/scripts/serialver.in:
+   Updated to reflect moved tools.jar location.
+
+2005-09-13  Dalibor Topic  <[EMAIL PROTECTED]>
+
* FAQ/FAQ.classlibrary-compile:
Updated information for gcj, javac, kjc and added information for
gcjx.
===
Checking out kaffe/kaffe/scripts/javap.in
RCS:  /home/cvs/kaffe/kaffe/kaffe/scripts/javap.in,v
VERS: 1.9
***
--- /dev/null   Sun Aug  4 19:57:58 2002
+++ kaffe/kaffe/scripts/javap.inTue Sep 13 21:42:00 2005
@@ -0,0 +1,6 @@
+#! /bin/sh
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
+exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS -cp @toolslibdir@/tools.jar 
gnu.classpath.tools.javap.JavapMain ${1+"$@"}
+exit $?
+
Index: kaffe/kaffe/scripts/native2ascii.in
diff -u kaffe/kaffe/scripts/native2ascii.in:1.7 
kaffe/kaffe/scripts/native2ascii.in:1.8
--- kaffe/kaffe/scripts/native2ascii.in:1.7 Sun Jun 12 14:01:59 2005
+++ kaffe/kaffe/scripts/native2ascii.in Tue Sep 13 21:37:44 2005
@@ -1,6 +1,6 @@
 #! /bin/sh
 [EMAIL PROTECTED]@
 [EMAIL PROTECTED]@
-exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS  -cp @jrelibdir@/tools.jar 
gnu.classpath.tools.native2ascii.Native2ASCII ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS  -cp @toolslibdir@/tools.jar 
gnu.classpath.tools.native2ascii.Native2ASCII ${1+"$@"}
 exit $?
 
Index: kaffe/kaffe/scripts/rmic.in
diff -u kaffe/kaffe/scripts/rmic.in:1.9 kaffe/kaffe/scripts/rmic.in:1.10
--- kaffe/kaffe/scripts/rmic.in:1.9 Wed May 18 19:52:28 2005
+++ kaffe/kaffe/scripts/rmic.in Tue Sep 13 21:37:44 2005
@@ -5,6 +5,6 @@
 PATH=${PATH}:@bindir@
 export PATH
 
-exec @bindir@/@kaffe_TRANSF@ -cp @jrelibdir@/tools.jar 
-Dclasspath.compiler=jikes $JAVA_OPTS gnu.classpath.tools.rmi.rmic.RMIC 
${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ -cp @toolslibdir@/tools.jar 
-Dclasspath.compiler=jikes $JAVA_OPTS gnu.classpath.tools.rmi.rmic.RMIC 
${1+"$@"}
 exit $?
 
Index: kaffe/kaffe/scripts/serialver.in
diff -u kaffe/kaffe/scripts/serialver.in:1.7 
kaffe/kaffe/scripts/serialver.in:1.8
--- kaffe/kaffe/scripts/serialver.in:1.7Sun Jun 12 14:01:59 2005
+++ kaffe/kaffe/scripts/serialver.inTue Sep 13 21:37:44 2005
@@ -1,6 +1,6 @@
 #! /bin/sh
 [EMAIL PROTECTED]@
 [EMAIL PROTECTED]@
-exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS  -cp @jrelibdir@/tools.jar 
gnu.classpath.tools.serialver.SerialVer ${1+"$@"}
+exec @bindir@/@kaffe_TRANSF@ $JAVA_OPTS  -cp @toolslibdir@/tools.jar 
gnu.classpath.tools.serialver.SerialVer ${1+"$@"}
 exit $?
 

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe


[kaffe] CVS kaffe (robilad): Added information on how to compile kaffe's class library using gcjx

2005-09-13 Thread Kaffe CVS
PatchSet 6894 
Date: 2005/09/13 20:28:41
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Added information on how to compile kaffe's class library using gcjx

2005-09-13  Dalibor Topic  <[EMAIL PROTECTED]>

* FAQ/FAQ.classlibrary-compile:
Updated information for gcj, javac, kjc and added information for
gcjx.

Members: 
ChangeLog:1.4415->1.4416 
FAQ/FAQ.classlibrary-compile:1.20->1.21 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4415 kaffe/ChangeLog:1.4416
--- kaffe/ChangeLog:1.4415  Tue Sep 13 20:05:10 2005
+++ kaffe/ChangeLog Tue Sep 13 20:28:41 2005
@@ -1,5 +1,11 @@
 2005-09-13  Dalibor Topic  <[EMAIL PROTECTED]>
 
+   * FAQ/FAQ.classlibrary-compile:
+   Updated information for gcj, javac, kjc and added information for
+   gcjx.
+
+2005-09-13  Dalibor Topic  <[EMAIL PROTECTED]>
+
* libraries/javalib/org/tritonus/midi/device/alsa/AlsaMidiIn.java:
Fixed comment to spell out micro second for gcjx.
 
Index: kaffe/FAQ/FAQ.classlibrary-compile
diff -u kaffe/FAQ/FAQ.classlibrary-compile:1.20 
kaffe/FAQ/FAQ.classlibrary-compile:1.21
--- kaffe/FAQ/FAQ.classlibrary-compile:1.20 Thu Jul  7 00:40:20 2005
+++ kaffe/FAQ/FAQ.classlibrary-compile  Tue Sep 13 20:28:44 2005
@@ -72,17 +72,41 @@
 
 The recommended version of jikes is 1.22 or higher.
 
+* gcjx
+
+gcjx is the next generation of gcj. It is being developed in the 
+gcjx-branch of the gcc CVS. In order to check it out and build it
+see 
+   http://gcc.gnu.org/cvs.html
+
+As there are no releases of gcjx, you need to get it from CVS.
+You can check out the gcjx source code from the gcc CVS using:
+
+   cvs -d :ext:[EMAIL PROTECTED]:/cvsroot/gcc  \
+   -qz9 co -P -rgcjx-branch gcc 
+
+Then 
+   cd gcc/gcjx ; configure && make && make install
+
+In order to compile kaffe's class library, you need to set JAVAC_FLAGS
+to "-bootclasspath /full/path/to/builddir/libraries/javalib/lib/",
+with "/full/path/to/builddir" replaced by the full path to the directory
+where you are building the Kaffe source code.
+
+It works with gcjx from 2005-09-13, and should continue to work with 
+later versions.
+
 * kjc
 
-The included compiler, kjc, also works. kjc is part of the Kopi project:
+kjc works as well. kjc is part of the Kopi project:
 
   http://www.dms.at/kopi/kjc.html
 
 * javac 
 
-Sun's javac compiler from JDK 1.3 and JDK 1.4 works as well. You have
+Sun's javac compiler from JDK 1.3 - JDK 1.5 works as well. You have
 to add "-bootclasspath lib/" to your JAVAC_FLAGS to avoid build
-problems due to Sun's javac linking Sun's class libraries with kaffe's.
+problems due to Sun's javac confusing Sun's class libraries with kaffe's.
 
 No known older version of Sun's javac compiler (up through JDK 1.2)
 will compile Kaffe's classes, due to bugs that Sun has yet to fix.
@@ -90,7 +114,7 @@
 What compilers are known not to work?
 -
 
-FSF's gcj doesn't work up to version 3.3.
+FSF's gcj doesn't work up to version 4.0.1
 
 In order to compile the class library with gcj to bytecodes instead of
 native code, you need to pass it the "-C" flag. Unfortunately, gcj has

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe


[kaffe] CVS kaffe (robilad): Small fixlet for gcjx

2005-09-13 Thread Kaffe CVS
PatchSet 6893 
Date: 2005/09/13 20:05:10
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Small fixlet for gcjx

2005-09-13  Dalibor Topic  <[EMAIL PROTECTED]>

* libraries/javalib/org/tritonus/midi/device/alsa/AlsaMidiIn.java:
Fixed comment to spell out micro second for gcjx.

Members: 
ChangeLog:1.4414->1.4415 

libraries/javalib/org/tritonus/midi/device/alsa/AlsaMidiIn.java:1.2->1.3 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4414 kaffe/ChangeLog:1.4415
--- kaffe/ChangeLog:1.4414  Sun Sep 11 22:28:08 2005
+++ kaffe/ChangeLog Tue Sep 13 20:05:10 2005
@@ -1,3 +1,8 @@
+2005-09-13  Dalibor Topic  <[EMAIL PROTECTED]>
+
+   * libraries/javalib/org/tritonus/midi/device/alsa/AlsaMidiIn.java:
+   Fixed comment to spell out micro second for gcjx.
+
 2005-09-11  Dalibor Topic  <[EMAIL PROTECTED]>
 
Merged in in-progress JDWP implementation from GNU Classpath.
Index: kaffe/libraries/javalib/org/tritonus/midi/device/alsa/AlsaMidiIn.java
diff -u 
kaffe/libraries/javalib/org/tritonus/midi/device/alsa/AlsaMidiIn.java:1.2 
kaffe/libraries/javalib/org/tritonus/midi/device/alsa/AlsaMidiIn.java:1.3
--- kaffe/libraries/javalib/org/tritonus/midi/device/alsa/AlsaMidiIn.java:1.2   
Mon Mar 22 11:25:39 2004
+++ kaffe/libraries/javalib/org/tritonus/midi/device/alsa/AlsaMidiIn.java   
Tue Sep 13 20:05:13 2005
@@ -441,7 +441,7 @@
longlTimestamp = m_event.getTimestamp();
if ((m_event.getFlags() & 
AlsaSeq.SND_SEQ_TIME_STAMP_MASK) == AlsaSeq.SND_SEQ_TIME_STAMP_REAL)
{
-   // ns -> µs
+   // ns -> micros
lTimestamp /= 1000;
}
MidiEvent   event = new MidiEvent(message, 
lTimestamp);

___
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe