[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/novell-win32-msi-patchability.diff |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

New commits:
commit 53e57ce385366ee2a3260494ad6a284abef89674
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Jul 28 09:30:42 2009 +0300

    Don't make .msp file name too long.
    
    There is no need to put the language string in the name of the .msp
    file being built. The folder name already contains the language string
    (or, as it happens, a hash code of it in the cases where the number of
    languages is large, as it is for us (Novell), to avoid too long
    pathnames). The code used the language string as such as part of the
    msp file name, which made it much too long for us.

diff --git a/patches/dev300/novell-win32-msi-patchability.diff b/patches/dev300/novell-win32-msi-patchability.diff
index 7214a2e..286aff2 100644
--- a/patches/dev300/novell-win32-msi-patchability.diff
+++ b/patches/dev300/novell-win32-msi-patchability.diff
@@ -225,3 +225,23 @@
 +tg = "{C5C00559-A17F-4ED2-B475-82D94A5BB1B4}"
  multiwestern = "{385A1970-0257-4C57-9383-DD2D668B23CE}"
  multiasia = "{74543111-6ABF-4A12-AC11-D315E2939D2A}"
+--- solenv/bin/modules/installer/windows/msp.pm
++++ solenv/bin/modules/installer/windows/msp.pm
+@@ -285,8 +285,15 @@
+ 		my $windowspatchlevel = 0;
+ 		if ( $allvariables->{'MSPPATCHLEVEL'} ) { $windowspatchlevel = $allvariables->{'MSPPATCHLEVEL'}; }
+ 		$databasename = $databasename . "_servicepack_" . $windowspatchlevel;
+-		my $languagestring = create_langstring($languagesarrayref);
+-		$databasename = $databasename . $languagestring;
++		# Upstream just loves deep folder structures with lots of 
++		# redundancy.
++		# Don't make the name too long. We already have the frigging
++		# language string (or, a hash of it, in case it is long) 
++		# in the folder name, no need to repeat it in this file name.
++		# And when actually providing the resulting .msp file to
++		# customers, it will be given a better name anyway.
++		# my $languagestring = create_langstring($languagesarrayref);
++		# $databasename = $databasename . $languagestring;
+ 	}
+ 	else
+ 	{