ooo-build r13623 - trunk/patches/dev300

[tml svn gnome org]

Author: tml
Date: Tue Aug 19 10:12:26 2008
New Revision: 13623
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13623&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): New
	patch. Use full path to the Windows expand.exe so that the Cygwin
	one which is something completely different isn't used.

	* patches/dev300/apply: Add it to Fixes.



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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Aug 19 10:12:26 2008
@@ -2505,3 +2505,5 @@
 # See what breaks if we build with more optimizations
 testing-more-optimizations-ark.diff
 
+[ Fixes ]
+win32-expand-exe-full-path.diff, tml

Added: trunk/patches/dev300/win32-expand-exe-full-path.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/win32-expand-exe-full-path.diff	Tue Aug 19 10:12:26 2008
@@ -0,0 +1,14 @@
+--- solenv/bin/modules/installer/windows/mergemodule.pm
++++ solenv/bin/modules/installer/windows/mergemodule.pm
+@@ -1138,7 +1138,10 @@
+ 		$infoline = "Unpacking cabinet file: $mergemodulehash->{'cabinetfile'}\n";
+ 		push( @installer::globals::logfileinfo, $infoline);
+ 
+-		my $expandfile = "expand.exe";	# Has to be in the path
++		# Avoid the Cygwin expand command
++		my $expandfile = qx(cygpath -u "$ENV{WINDIR}"/System32/expand.exe);
++		chomp $expandfile;
++
+ 		my $cabfilename = "MergeModule.CABinet";
+ 
+ 		# exclude cabinet file