Index: worker.pm =================================================================== RCS file: /cvs/tools/solenv/bin/modules/installer/worker.pm,v retrieving revision 1.46.18.3 diff -r1.46.18.3 worker.pm 38a39 > use File::Temp qw(tmpnam); 2559a2561,2584 > ######################################## > # Generating pathes for cygwin. > ######################################## > > sub generate_cygwin_pathes > { > my ($filesref) = @_; > > my ($tmpfilehandle, $tmpfilename) = tmpnam(); > open SOURCEPATHLIST, ">$tmpfilename" or die "oops...\n"; > for ( my $i = 0; $i <= $#{$filesref}; $i++ ) > { > print SOURCEPATHLIST "${$filesref}[$i]->{'sourcepath'}\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++ ) > { > ${$filesref}[$i]->{'cyg_sourcepath'} = $cyg_sourcepathlist[$i]; > } > } > Index: windows/file.pm =================================================================== RCS file: /cvs/tools/solenv/bin/modules/installer/windows/file.pm,v retrieving revision 1.11.24.2 diff -r1.11.24.2 file.pm 38,39d37 < require Filesys::CygwinPaths if $^O =~ /cygwin/i; < 46a45 > use installer::worker; 396a396,397 > > if ( $^O =~ /cygwin/i ) { installer::worker::generate_cygwin_pathes($filesref); } 458c459 < if ( $^O =~ /cygwin/i ) { $path = Filesys::CygwinPaths::win32path ($onefile->{'sourcepath'}); } --- > if ( $^O =~ /cygwin/i ) { $path = $onefile->{'cyg_sourcepath'}; } Index: windows/msiglobal.pm =================================================================== RCS file: /cvs/tools/solenv/bin/modules/installer/windows/msiglobal.pm,v retrieving revision 1.36.58.4 diff -r1.36.58.4 msiglobal.pm 39d38 < use File::Temp qw(tmpnam); 48a48 > use installer::worker; 157a158,159 > if ( $^O =~ /cygwin/i ) { installer::worker::generate_cygwin_pathes($filesref); } > 160,180d161 < 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"; < } < 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]; < } < } < 261,280d241 < 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"; < } < 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]; < } < }