ooo-build r13624 - in trunk: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Tue Aug 19 13:38:29 2008
New Revision: 13624
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13624&view=rev

Log:
2008-08-19  Tor Lillqvist  <tml novell com>

	* patches/dev300/win32-expand-exe-full-path.diff
	(solenv/bin/modules/installer/windows/mergemodule.pm): Convert
	between Cygwin and Windows path formats in two places.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/win32-expand-exe-full-path.diff

Modified: trunk/patches/dev300/win32-expand-exe-full-path.diff
==============================================================================
--- trunk/patches/dev300/win32-expand-exe-full-path.diff	(original)
+++ trunk/patches/dev300/win32-expand-exe-full-path.diff	Tue Aug 19 13:38:29 2008
@@ -1,5 +1,16 @@
 --- solenv/bin/modules/installer/windows/mergemodule.pm
 +++ solenv/bin/modules/installer/windows/mergemodule.pm
+@@ -1128,7 +1128,9 @@
+ 						
+ 		# changing directory
+ 		my $from = cwd();
+ 		my $to = $mergemodulehash->{'workdir'};
++		$to = qx(cygpath -u "$to");
++		chomp $to;
+-		chdir($to);
++		chdir($to) || die "Could not chdir to \"$to\"\n";
+ 
+ 		# Unpack the cab file, so that in can be included into the last office cabinet file.
 @@ -1138,7 +1138,10 @@
  		$infoline = "Unpacking cabinet file: $mergemodulehash->{'cabinetfile'}\n";
  		push( @installer::globals::logfileinfo, $infoline);
@@ -12,3 +23,14 @@
  		my $cabfilename = "MergeModule.CABinet";
  
  		# exclude cabinet file
+@@ -1151,8 +1151,8 @@
+ 
+ 		my $systemcall = "";
+ 		if ( $^O =~ /cygwin/i ) {
+-			my $localunpackdir = $unpackdir;
+-			$localunpackdir =~ s/\//\\\\/g;
++			my $localunpackdir = qx(cygpath -m "$unpackdir");
++			chomp $localunpackdir;
+ 			$systemcall = $expandfile . " " . $cabfilename . " -F:\\\* " . $localunpackdir;
+ 		}
+ 		else