Attachment #18789 for issue #36413

View | Details | Raw Unified | Return to issue 36413
Collapse All | Expand All

Lines 311-316 Link Here

(-)solenv/bin/guw.pl (+1 lines)
311	'STAR_SOLARENVPATH',	311	'STAR_SOLARENVPATH',
312	'STAR_INITROOT',	312	'STAR_INITROOT',
313	'STAR_STANDLST',	313	'STAR_STANDLST',
		314	'CLASSPATH',
314	'JAVA_HOME'	315	'JAVA_HOME'
315	);	316	);
316	foreach my $one_var ( @affected_vars )	317	foreach my $one_var ( @affected_vars )

Lines 210-216 Link Here

(-)solenv/bin/modules/installer/archivefiles.pm (-1 / +1 lines)
210		210
211	$zipname =~ s/^\s*\.\///;	211	$zipname =~ s/^\s*\.\///;
212		212
213	if ($installer::globals::iswin) { $zipname =~ s/\//\\/g; }	213	# if ($installer::globals::iswin) { $zipname =~ s/\//\\/g; }
214		214
215	# if ( $zipsize == 0 ) # also files can have a size of 0	215	# if ( $zipsize == 0 ) # also files can have a size of 0
216	if ( $zipname =~ /\Q$installer::globals::separator\E\s*$/ ) # slash or backslash at the end characterizes a directory	216	if ( $zipname =~ /\Q$installer::globals::separator\E\s*$/ ) # slash or backslash at the end characterizes a directory

Lines 123-133 Link Here

(-)solenv/bin/modules/installer/converter.pm (-2 / +2 lines)
123	{	123	{
124	$first = $1;	124	$first = $1;
125	$last = $2;	125	$last = $2;
126	if ( $installer::globals::iswin ) { $first =~ s/\//\\/g; }	126	if ( $ENV{'USE_SHELL'} eq "4nt" ) { $first =~ s/\//\\/g; }
127	push(@newarray, "$first\n");	127	push(@newarray, "$first\n");
128	}	128	}
129		129
130	if ( $installer::globals::iswin ) { $last =~ s/\//\\/g; }	130	if ( $ENV{'USE_SHELL'} eq "4nt" ) { $last =~ s/\//\\/g; }
131	push(@newarray, "$last\n");	131	push(@newarray, "$last\n");
132		132
133	return \@newarray;	133	return \@newarray;




		$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

Lines 241-254 Link Here

(-)solenv/bin/modules/installer/parameter.pm (-5 / +27 lines)
241		241
242	if ( $installer::globals::iswin )	242	if ( $installer::globals::iswin )
243	{	243	{
244	if (!($$pathref =~ /^\s*\w\:/)) # this is a relative windows path	244	if (( $^O =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} eq "tcsh" ))
245	{	245	{
246	$$pathref = cwd() . $installer::globals::separator . $$pathref;	246	if (!($$pathref =~ /^\s*\//)) # this is a relative POSIX path
247	$$pathref =~ s/\//\\/g;	247	{
		248	$$pathref = cwd() . $installer::globals::separator . $$pathref;
		249	}
		250	my $p = $$pathref;
		251	chomp( $p );
		252	#$p =~ s/\r//g;
		253	my $q = '';
		254	if ($p =~ /(\A.)(\$\(.\Z)/) {
		255	$p = $1;
		256	$q = $2;
		257	}
		258	chomp( $p = qx{cygpath -w "$p"} );
		259	$$pathref = $p.$q;
		260
		261	$$pathref =~ s/\\/\//g;
248	}	262	}
249	}	263	else
		264	{
		265	if (!($$pathref =~ /^\s*\w\:/)) # this is a relative windows path (no dos drive)
		266	{
		267	$$pathref = cwd() . $installer::globals::separator . $$pathref;
250		268
251	$$pathref =~ s/\Q$installer::globals::separator\E\s*$//; # removing ending slashes	269	$$pathref =~ s/\//\\/g;
		270	}
		271	}
		272	}
		273	$$pathref =~ s/[\/\\]\s*$//; # removing ending slashes
252	}	274	}
253		275
254	##################################################	276	##################################################




				
				my @regcompoutput = ();

				$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, $_); }


					my @regcompoutput = ();

					$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, $_); }

		if ( $ENV{'CLASSPATH'} ) { $oldclasspathstring = $ENV{'CLASSPATH'}; }
		else { $oldclasspathstring = "\."; }
		my $classpathstring = $$jarfileref . $installer::globals::pathseparator . $oldclasspathstring;
        $classpathstring =~ s/\//\\/g; # Quiten guw.pl

		$ENV{'CLASSPATH'} = $classpathstring;



		chdir($to);

		my $systemcall = "guw.pl -env $regcompfile -register -s -r $regcomprdb -c $libfilename";

		my $returnvalue = system($systemcall);


Return to issue 36413

Lines 216-221 Link Here

(-)solenv/bin/modules/installer/globals.pm (+12 lines)
216	$isunix = 0;	216	$isunix = 0;
217	$iswin = 1;	217	$iswin = 1;
218	}	218	}
		219	elsif (( $plat =~ /cygwin/i ) && ( $ENV{'USE_SHELL'} eq "tcsh" ))
		220	{
		221	$unzippath = "unzip"; # Has to be in the path: /usr/bin/unzip
		222	$zippath = "zip"; # Has to be in the path: /usr/bin/zip
		223	$checksumfile = "so_checksum";
		224	$separator = "/";
		225	$pathseparator = "\:"; # ????
		226	$libextension = "\.dll";
		227	$quote = "\'";
		228	$isunix = 0;
		229	$iswin = 1;
		230	}
219	else	231	else
220	{	232	{
221	$unzippath = "unzip"; # Has to be in the path: /usr/bin/unzip	233	$unzippath = "unzip"; # Has to be in the path: /usr/bin/unzip

Lines 250-256 Link Here

(-)solenv/bin/modules/installer/servicesfile.pm (-3 / +4 lines)
250		250
251	my @regcompoutput = ();	251	my @regcompoutput = ();
252		252
253	$systemcall = "$$regcompfileref -register -r $servicesfile -c " . $installer::globals::quote . $filestring . $installer::globals::quote . " 2\>\&1 \|";	253	$systemcall = "guw.pl -env $$regcompfileref -register -r $servicesfile -c " . $installer::globals::quote . $filestring . $installer::globals::quote . " 2\>\&1 \|";
254		254
255	open (REG, "$systemcall");	255	open (REG, "$systemcall");
256	while (<REG>) {push(@regcompoutput, $_); }	256	while (<REG>) {push(@regcompoutput, $_); }
Lines 341-347 Link Here
341		341
342	my @regcompoutput = ();	342	my @regcompoutput = ();
343		343
344	$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 \|";	344	$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 \|";
345		345
346	open (REG, "$systemcall");	346	open (REG, "$systemcall");
347	while (<REG>) {push(@regcompoutput, $_); }	347	while (<REG>) {push(@regcompoutput, $_); }
Lines 472-477 Link Here
472	if ( $ENV{'CLASSPATH'} ) { $oldclasspathstring = $ENV{'CLASSPATH'}; }	472	if ( $ENV{'CLASSPATH'} ) { $oldclasspathstring = $ENV{'CLASSPATH'}; }
473	else { $oldclasspathstring = "\."; }	473	else { $oldclasspathstring = "\."; }
474	my $classpathstring = $$jarfileref . $installer::globals::pathseparator . $oldclasspathstring;	474	my $classpathstring = $$jarfileref . $installer::globals::pathseparator . $oldclasspathstring;
		475	$classpathstring =~ s/\//\\/g; # Quiten guw.pl
475		476
476	$ENV{'CLASSPATH'} = $classpathstring;	477	$ENV{'CLASSPATH'} = $classpathstring;
477		478
Lines 644-650 Link Here
644		645
645	chdir($to);	646	chdir($to);
646		647
647	my $systemcall = "$regcompfile -register -s -r $regcomprdb -c $libfilename";	648	my $systemcall = "guw.pl -env $regcompfile -register -s -r $regcomprdb -c $libfilename";
648		649
649	my $returnvalue = system($systemcall);	650	my $returnvalue = system($systemcall);
650		651