Attachment #41466 for issue #72646

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

Lines 105-110 Link Here

(-)globals.pm (+1 lines)
105	$msilanguage = ""; # hash reference for msi languages LCID	105	$msilanguage = ""; # hash reference for msi languages LCID
106	$sofficeiconadded = 0;	106	$sofficeiconadded = 0;
107	$temppath = "";	107	$temppath = "";
		108	$cyg_temppath = "";
108	$temppathdefined = 0;	109	$temppathdefined = 0;
109	$packageversion = 1;	110	$packageversion = 1;
110	$packagerevision = 1;	111	$packagerevision = 1;

Lines 405-410 Link Here

(-)parameter.pm (+6 lines)
405	push(@installer::globals::removedirs, $installer::globals::temppath);	405	push(@installer::globals::removedirs, $installer::globals::temppath);
406	$installer::globals::temppath = $installer::globals::temppath . $installer::globals::separator . $installer::globals::compiler . $installer::globals::productextension;	406	$installer::globals::temppath = $installer::globals::temppath . $installer::globals::separator . $installer::globals::compiler . $installer::globals::productextension;
407	installer::systemactions::create_directory($installer::globals::temppath);	407	installer::systemactions::create_directory($installer::globals::temppath);
		408	if ( $^O =~ /cygwin/i )
		409	{
		410	$installer::globals::cyg_temppath = $installer::globals::temppath;
		411	$installer::globals::cyg_temppath =~ s/\\/\\\\/g;
		412	chomp( $installer::globals::cyg_temppath = qx{cygpath -w "$installer::globals::cyg_temppath"} );
		413	}
408	$installer::globals::temppathdefined = 1;	414	$installer::globals::temppathdefined = 1;
409	}	415	}
410	else	416	else




package installer::windows::msiglobal;

use Cwd;
use File::Temp qw(tmpnam);
use installer::converter;
use installer::exiter;
use installer::files;


	if ( $^O =~ /cygwin/i )
	{
		$windowstemppath = $installer::globals::cyg_temppath;
		chomp( $windowstemppath = qx{cygpath -w "$windowstemppath"} ); 
	}
	
	$sourcepath =~ s/\Q$windowstemppath\E//;


	if (( $installer::globals::cab_file_per_component ) || ( $installer::globals::fix_number_of_cab_files ))
	{
		if ( $^O =~ /cygwin/i )
		{
			my ($tmpfilehandle, $tmpfilename) = tmpnam();
			my $onefile;
			open SOURCEPATHLIST, ">$tmpfilename" or die "oops...\n";
			for ( my $i = 0; $i <= $#{$filesref}; $i++ )
			{
				$onefile = ${$filesref}[$i];
				print SOURCEPATHLIST "$onefile->{'sourcepath'}\n";
#				print "writing ".$onefile->{'sourcepath'}." to file\n";
			}
			close SOURCEPATHLIST;
			my @cyg_sourcepathlist = qx{cygpath -w -f "$tmpfilename"};
			chomp @cyg_sourcepathlist;
			unlink "$tmpfilename" or die "oops\n";
			for ( my $i = 0; $i <= $#{$filesref}; $i++ )
			{
				my $onefile = ${$filesref}[$i];
				$onefile->{'cyg_sourcepath'} = $cyg_sourcepathlist[$i];
#				print "inserting $cyg_sourcepathlist[$i]\n";
			}
		}

		for ( my $i = 0; $i <= $#{$filesref}; $i++ )
		{	
			my $onefile = ${$filesref}[$i];
			my $cabinetfile = $onefile->{'cabinet'};
			my $sourcepath =  $onefile->{'sourcepath'};
			if ( $^O =~ /cygwin/i ) { $sourcepath = $onefile->{'cyg_sourcepath'}; }
#			if ( $^O =~ /cygwin/i ) { print "$sourcepath\n"; }
			my $uniquename =  $onefile->{'uniquename'};

			my $styles = "";

			if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; };
			if ( $styles =~ /\bDONT_PACK\b/ ) { $doinclude = 0; }
			
#			if ( $^O =~ /cygwin/i ) { chomp( $sourcepath = qx{cygpath -w "$sourcepath"} ); }

			# to avoid lines with more than 256 characters, it can be useful to use relative pathes
			if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); }

			while ( $nextcabinetfile eq $cabinetfile )
			{
				$sourcepath =  $nextfile->{'sourcepath'};
				if ( $^O =~ /cygwin/i ) { $sourcepath = $nextfile->{'cyg_sourcepath'}; }
				if ( $^O =~ /cygwin/i ) { print "$sourcepath\n"; }
#				if ( $^O =~ /cygwin/i ) { chomp( $sourcepath = qx{cygpath -w "$sourcepath"} ); }
				# to avoid lines with more than 256 characters, it can be useful to use relative pathes
				if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); }
				$uniquename =  $nextfile->{'uniquename'};

		
		my $cabinetfile = "";

		if ( $^O =~ /cygwin/i )
		{
			my ($tmpfilehandle, $tmpfilename) = tmpnam();
			my $onefile;
			open SOURCEPATHLIST, ">$tmpfilename" or die "oops...\n";
			for ( my $i = 0; $i <= $#{$filesref}; $i++ )
			{
				$onefile = ${$filesref}[$i];
				print SOURCEPATHLIST "$onefile->{'sourcepath'}\n";
#				print "writing ".$onefile->{'sourcepath'}." to file\n";
			}
			close SOURCEPATHLIST;
			my @cyg_sourcepathlist = qx{cygpath -w -f "$tmpfilename"};
			chomp @cyg_sourcepathlist;
			unlink "$tmpfilename" or die "oops\n";
			for ( my $i = 0; $i <= $#{$filesref}; $i++ )
			{
				my $onefile = ${$filesref}[$i];
				$onefile->{'cyg_sourcepath'} = $cyg_sourcepathlist[$i];
#				print "inserting $cyg_sourcepathlist[$i]\n";
			}
		}
		for ( my $i = 0; $i <= $#{$filesref}; $i++ )
		{
			print "second: - $i\n";	
			my $onefile = ${$filesref}[$i];
			$cabinetfile = $onefile->{'cabinet'};
			my $sourcepath =  $onefile->{'sourcepath'};
			if ( $^O =~ /cygwin/i ) { $sourcepath = $onefile->{'cyg_sourcepath'}; }
#			if ( $^O =~ /cygwin/i ) { chomp( $sourcepath = qx{cygpath -w "$sourcepath"} ); }
			my $uniquename =  $onefile->{'uniquename'};

			# to avoid lines with more than 256 characters, it can be useful to use relative pathes

Return to issue 72646

Lines 36-41 Link Here

(-)windows/msiglobal.pm (-6 / +57 lines)
36	package installer::windows::msiglobal;	36	package installer::windows::msiglobal;
37		37
38	use Cwd;	38	use Cwd;
		39	use File::Temp qw(tmpnam);
39	use installer::converter;	40	use installer::converter;
40	use installer::exiter;	41	use installer::exiter;
41	use installer::files;	42	use installer::files;
Lines 129-136 Link Here
129		130
130	if ( $^O =~ /cygwin/i )	131	if ( $^O =~ /cygwin/i )
131	{	132	{
132	$windowstemppath =~ s/\\/\\\\/g;	133	$windowstemppath = $installer::globals::cyg_temppath;
133	chomp( $windowstemppath = qx{cygpath -w "$windowstemppath"} );
134	}	134	}
135		135
136	$sourcepath =~ s/\Q$windowstemppath\E//;	136	$sourcepath =~ s/\Q$windowstemppath\E//;
Lines 157-167 Link Here
157		157
158	if (( $installer::globals::cab_file_per_component ) \|\| ( $installer::globals::fix_number_of_cab_files ))	158	if (( $installer::globals::cab_file_per_component ) \|\| ( $installer::globals::fix_number_of_cab_files ))
159	{	159	{
		160	if ( $^O =~ /cygwin/i )
		161	{
		162	my ($tmpfilehandle, $tmpfilename) = tmpnam();
		163	my $onefile;
		164	open SOURCEPATHLIST, ">$tmpfilename" or die "oops...\n";
		165	for ( my $i = 0; $i <= $#{$filesref}; $i++ )
		166	{
		167	$onefile = ${$filesref}[$i];
		168	print SOURCEPATHLIST "$onefile->{'sourcepath'}\n";
		169	# print "writing ".$onefile->{'sourcepath'}." to file\n";
		170	}
		171	close SOURCEPATHLIST;
		172	my @cyg_sourcepathlist = qx{cygpath -w -f "$tmpfilename"};
		173	chomp @cyg_sourcepathlist;
		174	unlink "$tmpfilename" or die "oops\n";
		175	for ( my $i = 0; $i <= $#{$filesref}; $i++ )
		176	{
		177	my $onefile = ${$filesref}[$i];
		178	$onefile->{'cyg_sourcepath'} = $cyg_sourcepathlist[$i];
		179	# print "inserting $cyg_sourcepathlist[$i]\n";
		180	}
		181	}
		182
160	for ( my $i = 0; $i <= $#{$filesref}; $i++ )	183	for ( my $i = 0; $i <= $#{$filesref}; $i++ )
161	{	184	{
162	my $onefile = ${$filesref}[$i];	185	my $onefile = ${$filesref}[$i];
163	my $cabinetfile = $onefile->{'cabinet'};	186	my $cabinetfile = $onefile->{'cabinet'};
164	my $sourcepath = $onefile->{'sourcepath'};	187	my $sourcepath = $onefile->{'sourcepath'};
		188	if ( $^O =~ /cygwin/i ) { $sourcepath = $onefile->{'cyg_sourcepath'}; }
		189	# if ( $^O =~ /cygwin/i ) { print "$sourcepath\n"; }
165	my $uniquename = $onefile->{'uniquename'};	190	my $uniquename = $onefile->{'uniquename'};
166		191
167	my $styles = "";	192	my $styles = "";
Lines 169-175 Link Here
169	if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; };	194	if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; };
170	if ( $styles =~ /\bDONT_PACK\b/ ) { $doinclude = 0; }	195	if ( $styles =~ /\bDONT_PACK\b/ ) { $doinclude = 0; }
171		196
172	if ( $^O =~ /cygwin/i ) { chomp( $sourcepath = qx{cygpath -w "$sourcepath"} ); }	197	# if ( $^O =~ /cygwin/i ) { chomp( $sourcepath = qx{cygpath -w "$sourcepath"} ); }
173		198
174	# to avoid lines with more than 256 characters, it can be useful to use relative pathes	199	# to avoid lines with more than 256 characters, it can be useful to use relative pathes
175	if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); }	200	if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); }
Lines 191-197 Link Here
191	while ( $nextcabinetfile eq $cabinetfile )	216	while ( $nextcabinetfile eq $cabinetfile )
192	{	217	{
193	$sourcepath = $nextfile->{'sourcepath'};	218	$sourcepath = $nextfile->{'sourcepath'};
194	if ( $^O =~ /cygwin/i ) { chomp( $sourcepath = qx{cygpath -w "$sourcepath"} ); }	219	if ( $^O =~ /cygwin/i ) { $sourcepath = $nextfile->{'cyg_sourcepath'}; }
		220	if ( $^O =~ /cygwin/i ) { print "$sourcepath\n"; }
		221	# if ( $^O =~ /cygwin/i ) { chomp( $sourcepath = qx{cygpath -w "$sourcepath"} ); }
195	# to avoid lines with more than 256 characters, it can be useful to use relative pathes	222	# to avoid lines with more than 256 characters, it can be useful to use relative pathes
196	if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); }	223	if ( $allvariables->{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = make_relative_ddf_path($sourcepath); }
197	$uniquename = $nextfile->{'uniquename'};	224	$uniquename = $nextfile->{'uniquename'};
Lines 237-248 Link Here
237		264
238	my $cabinetfile = "";	265	my $cabinetfile = "";
239		266
		267	if ( $^O =~ /cygwin/i )
		268	{
		269	my ($tmpfilehandle, $tmpfilename) = tmpnam();
		270	my $onefile;
		271	open SOURCEPATHLIST, ">$tmpfilename" or die "oops...\n";
		272	for ( my $i = 0; $i <= $#{$filesref}; $i++ )
		273	{
		274	$onefile = ${$filesref}[$i];
		275	print SOURCEPATHLIST "$onefile->{'sourcepath'}\n";
		276	# print "writing ".$onefile->{'sourcepath'}." to file\n";
		277	}
		278	close SOURCEPATHLIST;
		279	my @cyg_sourcepathlist = qx{cygpath -w -f "$tmpfilename"};
		280	chomp @cyg_sourcepathlist;
		281	unlink "$tmpfilename" or die "oops\n";
		282	for ( my $i = 0; $i <= $#{$filesref}; $i++ )
		283	{
		284	my $onefile = ${$filesref}[$i];
		285	$onefile->{'cyg_sourcepath'} = $cyg_sourcepathlist[$i];
		286	# print "inserting $cyg_sourcepathlist[$i]\n";
		287	}
		288	}
240	for ( my $i = 0; $i <= $#{$filesref}; $i++ )	289	for ( my $i = 0; $i <= $#{$filesref}; $i++ )
241	{	290	{
		291	print "second: - $i\n";
242	my $onefile = ${$filesref}[$i];	292	my $onefile = ${$filesref}[$i];
243	$cabinetfile = $onefile->{'cabinet'};	293	$cabinetfile = $onefile->{'cabinet'};
244	my $sourcepath = $onefile->{'sourcepath'};	294	my $sourcepath = $onefile->{'sourcepath'};
245	if ( $^O =~ /cygwin/i ) { chomp( $sourcepath = qx{cygpath -w "$sourcepath"} ); }	295	if ( $^O =~ /cygwin/i ) { $sourcepath = $onefile->{'cyg_sourcepath'}; }
		296	# if ( $^O =~ /cygwin/i ) { chomp( $sourcepath = qx{cygpath -w "$sourcepath"} ); }
246	my $uniquename = $onefile->{'uniquename'};	297	my $uniquename = $onefile->{'uniquename'};
247		298
248	# to avoid lines with more than 256 characters, it can be useful to use relative pathes	299	# to avoid lines with more than 256 characters, it can be useful to use relative pathes