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

[tml svn gnome org]

Author: tml
Date: Fri Sep 12 12:45:45 2008
New Revision: 13887
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13887&view=rev

Log:
2008-09-12  Tor Lillqvist  <tml novell com>

	Merge from ooo-build-3-0:
	
	* patches/dev300/win32-multi-lang-installer.diff
	(solenv/bin/modules/installer/windows/update.pm): For some reason
	we must pass the directory path given as the -f option to msidb in
	backslash format. Using slashes causes msidb to fail. So pass
	$workdir through cygpath -w, chomp it, and put it on the command
	line inside single quotes. Also quote the asterisk passed on the
	command line to msidb properly, have to use two backslashes so
	that one backslash actually gets into the command line.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/win32-multi-lang-installer.diff

Modified: trunk/patches/dev300/win32-multi-lang-installer.diff
==============================================================================
--- trunk/patches/dev300/win32-multi-lang-installer.diff	(original)
+++ trunk/patches/dev300/win32-multi-lang-installer.diff	Fri Sep 12 12:45:45 2008
@@ -499,6 +499,19 @@
  	elsif ( $language eq "zh-CN" ) { $nsislanguage = "SimpChinese"; }
  	elsif ( $language eq "zh-TW" ) { $nsislanguage = "TradChinese"; }
  	else { 
+--- solenv/bin/modules/installer/windows/update.pm
++++ solenv/bin/modules/installer/windows/update.pm
+@@ -51,7 +51,9 @@
+ 
+ 	# Export of all tables by using "*"
+ 							
+-	$systemcall = $msidb . " -d " . $fulldatabasepath . " -f " . $workdir . " -e \*";
++	$workdir = qx(cygpath -w $workdir);
++	chomp ($workdir);
++	$systemcall = $msidb . " -d " . $fulldatabasepath . " -f '" . $workdir . "' -e \\*";
+ 	$returnvalue = system($systemcall);
+ 
+ 	$infoline = "Systemcall: $systemcall\n";
 --- instsetoo_native/util/makefile.mk
 +++ instsetoo_native/util/makefile.mk
 @@ -222,7 +222,7 @@