Index: solenv/bin/gen_update_info.pl =================================================================== RCS file: /cvs/tools/solenv/bin/gen_update_info.pl,v retrieving revision 1.2 diff -u -r1.2 gen_update_info.pl --- solenv/bin/gen_update_info.pl 1 Mar 2007 15:57:47 -0000 1.2 +++ solenv/bin/gen_update_info.pl 14 Jan 2008 04:38:39 -0000 @@ -74,6 +74,14 @@ } } +$sourcefile = $ARGV[0]; + +if( $^O =~ /cygwin/i ) { + # We might get paths with backslashes, fix that. + $lstfile =~ s/\\/\//g; + $sourcefile =~ s/\\/\//g; +} + # read openoffice.lst unless(open(LSTFILE, "sed -n \"/^$product\$/,/^}\$/ p\" $lstfile |")) { print STDERR "Can't open $lstfile file: $!\n"; @@ -105,8 +113,8 @@ $id = $productname . "_" . $id . "_" . $languages; # open input file -unless (open(SOURCE, $ARGV[0])) { - print STDERR "Can't open $ARGV[0] file: $!\n"; +unless (open(SOURCE, $sourcefile)) { + print STDERR "Can't open $sourcefile file: $!\n"; return; } Index: solenv/bin/modules/installer/control.pm =================================================================== RCS file: /cvs/tools/solenv/bin/modules/installer/control.pm,v retrieving revision 1.36 diff -u -r1.36 control.pm --- solenv/bin/modules/installer/control.pm 12 Dec 2007 15:33:26 -0000 1.36 +++ solenv/bin/modules/installer/control.pm 14 Jan 2008 04:38:39 -0000 @@ -63,7 +63,7 @@ if( $^O =~ /cygwin/i ) { # When using cygwin's perl the PATH variable is POSIX style and ... - $pathvariable = qx{guw.exe echo "$pathvariable"} ; + $pathvariable = qx{cygpath -dp "$pathvariable"} ; # has to be converted to DOS style for further use. $local_pathseparator = ';'; } Index: solenv/bin/modules/installer/servicesfile.pm =================================================================== RCS file: /cvs/tools/solenv/bin/modules/installer/servicesfile.pm,v retrieving revision 1.30 diff -u -r1.30 servicesfile.pm --- solenv/bin/modules/installer/servicesfile.pm 12 Dec 2007 15:34:05 -0000 1.30 +++ solenv/bin/modules/installer/servicesfile.pm 14 Jan 2008 04:38:39 -0000 @@ -899,7 +899,7 @@ if ( $^O =~ /cygwin/i && $ENV{'USE_SHELL'} eq "4nt" ) { # $servicesdir is used as a parameter for regcomp and has to be DOS style - $servicesdir = qx{guw.exe echo "$servicesdir"}; + $servicesdir = qx{cygpath -d "$servicesdir"}; chomp($servicesdir); $servicesdir =~ s/\\/\//g; }