X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=jpl%2FJNI%2FJNI.pm;h=6ef65e275a7c69607124391daed4202a9fa2923a;hb=11264fdb092cd4874ac94ff361c9d4e20753485f;hp=455a130d9fc7a1a65e15b893467880199b7a74ea;hpb=98a6f11e5caa62333286d697f0f5df32e778e17a;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/jpl/JNI/JNI.pm b/jpl/JNI/JNI.pm
index 455a130..6ef65e2 100644
--- a/jpl/JNI/JNI.pm
+++ b/jpl/JNI/JNI.pm
@@ -2,7 +2,6 @@ package JNI;
 
 use strict;
 use Carp;
-use Errno;
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $AUTOLOAD $JVM @JVM_ARGS $JAVALIB);
 
 require Exporter;
@@ -188,7 +187,7 @@ require AutoLoader;
 	GetJavaVM
 );
 
-$VERSION = '0.01';
+$VERSION = '0.1';
 
 sub AUTOLOAD {
     # This AUTOLOAD is used to 'autoload' constants from the constant()
@@ -199,7 +198,7 @@ sub AUTOLOAD {
     ($constname = $AUTOLOAD) =~ s/.*:://;
     my $val = constant($constname, @_ ? $_[0] : 0);
     if ($! != 0) {
-	if ($!{EINVAL} || $! =~ /Invalid/) {
+	if ($! =~ /Invalid/) {
 	    $AutoLoader::AUTOLOAD = $AUTOLOAD;
 	    goto &AutoLoader::AUTOLOAD;
 	}
@@ -214,24 +213,96 @@ sub AUTOLOAD {
 bootstrap JNI $VERSION;
 
 if (not $JPL::_env_) {
+    # Note that only Kaffe support only cares about what JNI::Config says
+    use JNI::Config qw($KAFFE $LD_LIBRARY_PATH $CLASS_HOME $LIB_HOME $JAVA_LIB);
+
+    # Win32 and Sun JDK pay attention to $ENV{JAVA_HOME}; Kaffe doesn't
     $ENV{JAVA_HOME} ||= "/usr/local/java";
 
-    chop(my $arch = `uname -p`);
-    chop($arch = `uname -m`) unless -d "$ENV{JAVA_HOME}/lib/$arch";
+    my ($arch, @CLASSPATH);
+    if ($^O eq 'MSWin32' and (! $JNI::Config::KAFFE) ) {
+
+        $arch = 'MSWin32' unless -d "$ENV{JAVA_HOME}/lib/$arch";
+        @CLASSPATH = split(/;/, $ENV{CLASSPATH});
+        @CLASSPATH = "." unless @CLASSPATH;
+        push @CLASSPATH,
+	    "$ENV{JAVA_HOME}\\classes",
+	    "$ENV{JAVA_HOME}\\lib\\classes.zip",
+	    # MSR - added for JDK 1.3
+	    "$ENV{JAVA_HOME}\\jre\\lib\\rt.jar",
+	    # MSR - added to find Closer.class
+	    '.';
+
+        $ENV{CLASSPATH} = join(';', @CLASSPATH);
+        $ENV{THREADS_TYPE} ||= "green_threads";
+
+        #$JAVALIB = "$ENV{JAVA_HOME}/lib/$arch/$ENV{THREADS_TYPE}";
+        # MSR  - changed above for JDK 1.3
+        $JAVALIB = "$ENV{JAVA_HOME}/lib/";
+
+        $ENV{LD_LIBRARY_PATH} .= ":$JAVALIB";
 
-    my @CLASSPATH = split(/:/, $ENV{CLASSPATH});
-    @CLASSPATH = "." unless @CLASSPATH;
-    push @CLASSPATH,
-	"$ENV{JAVA_HOME}/classes",
-	"$ENV{JAVA_HOME}/lib/classes.zip";
-    $ENV{CLASSPATH} = join(':', @CLASSPATH);
+        push @JVM_ARGS, "classpath", $ENV{CLASSPATH};
+        print "JVM_ARGS=@JVM_ARGS!\n" if $JPL::DEBUG;
+        $JVM = GetJavaVM("$JAVALIB/javai.dll",@JVM_ARGS);
+    } elsif ($^O eq 'MSWin32' and $JNI::Config::KAFFE) {
+        croak "Kaffe is not yet supported on MSWin32 platform!";
+    } elsif ($JNI::Config::KAFFE) {
+        # The following code has to build a classpath for us.  It would be
+        # better if we could have *both* a classpath and a classhome, and
+        # not have to "guess" at the classpath like this.  We should be able
+        # to send in, say, a classpath of ".", and classhome of
+        # ".../share/kaffe", and have it build the right classpath.  That
+        # doesn't work.  The function initClasspath() in findInJar.c in the
+        # Kaffe source says: "Oh, you have a classpath, well forget
+        # classhome!"  This seems brain-dead to me.  But, anyway, that's why
+        # I don't use the classhome option on GetJavaVM.  I have to build
+        # the classpath by hand.  *sigh*
+        #                                            --  bkuhn
 
-    $ENV{THREADS_TYPE} ||= "green_threads";
+        my $classpath = $ENV{CLASSPATH} || ".";
+        my %classCheck;
+        @classCheck{split(/\s*:\s*/, $classpath)} = 1;
+        foreach my $jarFile (qw(Klasses.jar comm.jar pjava.jar
+                                        tools.jar microsoft.jar rmi.jar)) {
+          $classpath .= ":$JNI::Config::CLASS_HOME/$jarFile"
+            unless defined $classCheck{"$JNI::Config::CLASS_HOME/$jarFile"};
+            # Assume that if someone else already put these here, they knew
+            # what they were doing and have the order right.
+        }
+        $classpath = ".:$classpath" unless defined $classCheck{"."};
 
-    $JAVALIB = "$ENV{JAVA_HOME}/lib/$arch/$ENV{THREADS_TYPE}";
-    $ENV{LD_LIBRARY_PATH} .= ":$JAVALIB";
+        $ENV{CLASSPATH} = $classpath;  # Not needed for GetJavaVM(), since
+                                       # we pass it in as a JVM option, but
+                                       # something else might expect it.
+                                       # (also see comment above)
+        print STDERR "bkuhn: JNI classpath=$classpath\n";
+        unshift(@JVM_ARGS, "classpath", $classpath,
+                "libraryhome", $JNI::Config::LIB_HOME);
 
-    $JVM = GetJavaVM("$JAVALIB/libjava.so",@JVM_ARGS);
+                #   The following line is useless; see comment above.
+                #  "classhome", $JNI::Config::CLASS_HOME);
+
+        $JVM = GetJavaVM($JNI::Config::JAVA_LIB, @JVM_ARGS);
+    } else {
+        chop($arch = `uname -p`);
+        chop($arch = `uname -m`) unless -d "$ENV{JAVA_HOME}/lib/$arch";
+
+        @CLASSPATH = split(/:/, $ENV{CLASSPATH});
+        @CLASSPATH = "." unless @CLASSPATH;
+        push @CLASSPATH,
+	    "$ENV{JAVA_HOME}/classes",
+	    "$ENV{JAVA_HOME}/lib/classes.zip";
+        $ENV{CLASSPATH} = join(':', @CLASSPATH);
+
+        $ENV{THREADS_TYPE} ||= "green_threads";
+
+        $JAVALIB = "$ENV{JAVA_HOME}/lib/$arch/$ENV{THREADS_TYPE}";
+        $ENV{LD_LIBRARY_PATH} .= ":$JAVALIB";
+        push @JVM_ARGS, "classpath", $ENV{CLASSPATH};
+        print "JVM_ARGS=@JVM_ARGS!\n" if $JPL::DEBUG;
+        $JVM = GetJavaVM("$JAVALIB/libjava.so",@JVM_ARGS);
+    }
 }
 
 1;