[libinline-java-perl] 225/398: fixes for Cygwin

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to tag 0.55
in repository libinline-java-perl.

commit 69167ad11ff06ada8ec9dcf89e1c1ed4b53f1f74
Author: patrick_leb <>
Date:   Tue Apr 15 16:46:04 2003 +0000

    fixes for Cygwin
---
 Java.pm          | 6 +++---
 Java/Portable.pm | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Java.pm b/Java.pm
index 2089375..f13061a 100644
--- a/Java.pm
+++ b/Java.pm
@@ -400,7 +400,7 @@ sub load {
 	# If the JVM is not running, we need to start it here.
 	if (! $JVM){
 		my $cp = $ENV{CLASSPATH} || '' ;
-		$ENV{CLASSPATH} = get_server_jar() ;
+		$ENV{CLASSPATH} = portable("SUB_FIX_CLASSPATH", get_server_jar()) ;
 		Inline::Java::debug(2, "classpath: $ENV{CLASSPATH}") ;
 		$JVM = new Inline::Java::JVM($o) ;
 		$ENV{CLASSPATH}	= $cp ;
@@ -408,7 +408,7 @@ sub load {
 		# Add CLASSPATH entries + user jar + $install_dir to the JVM classpath
 		my @cp = make_classpath($o->get_java_config('CLASSPATH'), get_user_jar()) ;
 		my $pc = new Inline::Java::Protocol(undef, $o) ;
-		$pc->AddClassPath(@cp, $install_dir) ;
+		$pc->AddClassPath(@cp, portable("SUB_FIX_CLASSPATH", $install_dir)) ;
 
 		my $st = $pc->ServerType() ;
 		if ((($st eq "shared")&&(! $o->get_java_config('SHARED_JVM')))||
@@ -419,7 +419,7 @@ sub load {
 	else{
 		# Add $install_dir entry to the JVM classpath.
 		my $pc = new Inline::Java::Protocol(undef, $o) ;
-		$pc->AddClassPath($install_dir) ;
+		$pc->AddClassPath(portable("SUB_FIX_CLASSPATH", $install_dir)) ;
 	}
 
 	# Add our Inline object to the list.
diff --git a/Java/Portable.pm b/Java/Portable.pm
index 322090d..2823fcd 100644
--- a/Java/Portable.pm
+++ b/Java/Portable.pm
@@ -52,7 +52,6 @@ sub make_classpath {
 	foreach my $p (@cp){
 		$p =~ s/^\s+// ;
 		$p =~ s/\s+$// ;
-		$p = portable("SUB_FIX_CLASSPATH", $p) ;
 	}
 
 	# Remove duplicates, remove invalids but preserve order
@@ -60,7 +59,8 @@ sub make_classpath {
 	my %cp = map {$_ => 1} @cp ;
 	foreach my $p (@cp){
 		if (($p)&&($cp{$p})&&(-e $p)){
-			push @fcp, (-d $p ? Cwd::abs_path($p) : $p) ;
+			my $fp = (-d $p ? Cwd::abs_path($p) : $p) ;
+			push @fcp, portable("SUB_FIX_CLASSPATH", $fp) ;
 			delete $cp{$p} ;
 		}
 		else{
@@ -160,7 +160,7 @@ sub portable {
 			DETACH_OK			=>	0,
 			JVM_LIB				=>	'jvm.lib',
 			JVM_SO				=>	'jvm.dll',
-			GOT_NEXT_FREE_PORT	=>	($COMMAND_COM ? 0 : 1),
+			GOT_NEXT_FREE_PORT	=>	0,
 		},
 		cygwin => {
 			ENV_VAR_PATH_SEP_CP	=>	';',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libinline-java-perl.git