Index: solenv/bin/guw.pl
===================================================================
RCS file: /cvs/tools/solenv/bin/guw.pl,v
retrieving revision 1.19.32.2
diff -u -r1.19.32.2 guw.pl
--- solenv/bin/guw.pl	29 Oct 2004 01:49:17 -0000	1.19.32.2
+++ solenv/bin/guw.pl	1 Nov 2004 04:16:56 -0000
@@ -311,6 +311,7 @@
         'STAR_SOLARENVPATH',
         'STAR_INITROOT',
         'STAR_STANDLST',
+        'CLASSPATH',
         'JAVA_HOME'
     );
     foreach my $one_var ( @affected_vars )
Index: solenv/bin/modules/installer/archivefiles.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/archivefiles.pm,v
retrieving revision 1.6
diff -u -r1.6 archivefiles.pm
--- solenv/bin/modules/installer/archivefiles.pm	9 Jul 2004 13:55:15 -0000	1.6
+++ solenv/bin/modules/installer/archivefiles.pm	1 Nov 2004 04:17:00 -0000
@@ -210,7 +210,7 @@
 						
 						$zipname =~ s/^\s*\.\///;
 						
-						if ($installer::globals::iswin) { $zipname =~ s/\//\\/g; }
+#						if ($installer::globals::iswin) { $zipname =~ s/\//\\/g; }
 
 						# if ( $zipsize == 0 )	# also files can have a size of 0
 						if ( $zipname =~ /\Q$installer::globals::separator\E\s*$/ )	# slash or backslash at the end characterizes a directory
Index: solenv/bin/modules/installer/converter.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/converter.pm,v
retrieving revision 1.3
diff -u -r1.3 converter.pm
--- solenv/bin/modules/installer/converter.pm	11 Jun 2004 18:15:02 -0000	1.3
+++ solenv/bin/modules/installer/converter.pm	1 Nov 2004 04:17:00 -0000
@@ -123,11 +123,11 @@
 	{
 		$first = $1;
 		$last = $2;	
-		if ( $installer::globals::iswin ) { $first =~ s/\//\\/g; }
+		if ( $ENV{'USE_SHELL'} eq "4nt" ) { $first =~ s/\//\\/g; }
 		push(@newarray, "$first\n");
 	}	
 
-	if ( $installer::globals::iswin ) { $last =~ s/\//\\/g; }
+	if ( $ENV{'USE_SHELL'} eq "4nt" ) { $last =~ s/\//\\/g; }
 	push(@newarray, "$last\n");	
 	
 	return \@newarray;
Index: solenv/bin/modules/installer/globals.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/globals.pm,v
retrieving revision 1.18
diff -u -r1.18 globals.pm
--- solenv/bin/modules/installer/globals.pm	18 Oct 2004 13:52:14 -0000	1.18
+++ solenv/bin/modules/installer/globals.pm	1 Nov 2004 04:17:00 -0000
@@ -216,6 +216,18 @@
 		$isunix = 0;
 		$iswin = 1;
 	}
+	elsif (( $plat =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} eq "tcsh" ))
+	{
+		$unzippath = "unzip";				# Has to be in the path: /usr/bin/unzip
+		$zippath = "zip";					# Has to be in the path: /usr/bin/zip
+		$checksumfile = "so_checksum";
+		$separator = "/";
+		$pathseparator = "\:"; # ????
+		$libextension = "\.dll";
+		$quote = "\'";
+		$isunix = 0;
+		$iswin = 1;
+	}
 	else
 	{ 
 		$unzippath = "unzip";				# Has to be in the path: /usr/bin/unzip
Index: solenv/bin/modules/installer/parameter.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/parameter.pm,v
retrieving revision 1.10
diff -u -r1.10 parameter.pm
--- solenv/bin/modules/installer/parameter.pm	18 Oct 2004 13:53:07 -0000	1.10
+++ solenv/bin/modules/installer/parameter.pm	1 Nov 2004 04:17:00 -0000
@@ -241,14 +241,36 @@
 
 	if ( $installer::globals::iswin )
 	{
-		if (!($$pathref =~ /^\s*\w\:/))	# this is a relative windows path
+		if (( $^O =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} eq "tcsh" ))
 		{
-			$$pathref = cwd() . $installer::globals::separator . $$pathref;
-			$$pathref =~ s/\//\\/g;
+			if (!($$pathref =~ /^\s*\//))	# this is a relative POSIX path
+			{
+				$$pathref = cwd() . $installer::globals::separator . $$pathref;
+			}	
+			my $p = $$pathref;
+			chomp( $p );
+#$p =~ s/\r//g;
+			my $q = '';
+			if ($p =~ /(\A.*)(\$\(.*\Z)/) {
+				$p = $1;
+				$q = $2;
+			}
+			chomp( $p = qx{cygpath -w "$p"} );
+			$$pathref = $p.$q;
+			
+			$$pathref =~ s/\\/\//g;
 		}
-	}
+		else
+		{
+			if (!($$pathref =~ /^\s*\w\:/))	# this is a relative windows path (no dos drive)
+			{
+				$$pathref = cwd() . $installer::globals::separator . $$pathref;
 
-	$$pathref =~ s/\Q$installer::globals::separator\E\s*$//;	# removing ending slashes	
+				$$pathref =~ s/\//\\/g;
+			}
+		}
+	}
+	$$pathref =~ s/[\/\\]\s*$//;	# removing ending slashes	
 }
 
 ##################################################
Index: solenv/bin/modules/installer/servicesfile.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/servicesfile.pm,v
retrieving revision 1.13
diff -u -r1.13 servicesfile.pm
--- solenv/bin/modules/installer/servicesfile.pm	18 Oct 2004 13:53:34 -0000	1.13
+++ solenv/bin/modules/installer/servicesfile.pm	1 Nov 2004 04:17:00 -0000
@@ -250,7 +250,7 @@
 				
 				my @regcompoutput = ();
 
-				$systemcall = "$$regcompfileref -register -r $servicesfile -c "  . $installer::globals::quote . $filestring . $installer::globals::quote . " 2\>\&1 |";
+				$systemcall = "guw.pl -env $$regcompfileref -register -r $servicesfile -c "  . $installer::globals::quote . $filestring . $installer::globals::quote . " 2\>\&1 |";
 
 				open (REG, "$systemcall");
 				while (<REG>) {push(@regcompoutput, $_); }
@@ -341,7 +341,7 @@
 
 					my @regcompoutput = ();
 
-					$systemcall = "$$regcompfileref -register -br $regcomprdb -r $servicesfile -c " . $installer::globals::quote . $filestring . $installer::globals::quote . " -l com.sun.star.loader.Java2 -env:UNO_JAVA_COMPONENT_PATH=" . $installer::globals::quote . $fileurl . $installer::globals::quote . " 2\>\&1 |";
+					$systemcall = "guw.pl -env $$regcompfileref -register -br $regcomprdb -r $servicesfile -c " . $installer::globals::quote . $filestring . $installer::globals::quote . " -l com.sun.star.loader.Java2 -env:UNO_JAVA_COMPONENT_PATH=" . $installer::globals::quote . $fileurl . $installer::globals::quote . " 2\>\&1 |";
 
 					open (REG, "$systemcall");
 					while (<REG>) {push(@regcompoutput, $_); }
@@ -472,6 +472,7 @@
 		if ( $ENV{'CLASSPATH'} ) { $oldclasspathstring = $ENV{'CLASSPATH'}; }
 		else { $oldclasspathstring = "\."; }
 		my $classpathstring = $$jarfileref . $installer::globals::pathseparator . $oldclasspathstring;
+        $classpathstring =~ s/\//\\/g; # Quiten guw.pl
 
 		$ENV{'CLASSPATH'} = $classpathstring;
 
@@ -644,7 +645,7 @@
 
 		chdir($to);
 
-		my $systemcall = "$regcompfile -register -s -r $regcomprdb -c $libfilename";
+		my $systemcall = "guw.pl -env $regcompfile -register -s -r $regcomprdb -c $libfilename";
 
 		my $returnvalue = system($systemcall);