[Libreoffice-commits] .: Branch 'libreoffice-3-3' - solenv/bin

[Fridrich Strba]

 solenv/bin/modules/installer/globals.pm              |    2 
 solenv/bin/modules/installer/windows/createfolder.pm |   53 -------------------
 2 files changed, 2 insertions(+), 53 deletions(-)

New commits:
commit 87f772f7e881b3f8c9f8bbc0f4f948b6195579bc
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Sat Dec 18 00:41:26 2010 +0100

    don't try to be smart, just hardcode one of the help files

diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 8f4e0c5..1f9a299 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -419,7 +419,7 @@ BEGIN
     $cab_file_per_component = 0;
     $cabfilecompressionlevel = 7;
     $number_of_cabfiles = 1;	# only for $fix_number_of_cab_files = 1 
-    $include_cab_in_msi = 1;
+    $include_cab_in_msi = 0;
     $use_packages_for_cabs = 0;
     $msidatabasename = "";
     $prepare_winpatch = 0;
diff --git a/solenv/bin/modules/installer/windows/createfolder.pm b/solenv/bin/modules/installer/windows/createfolder.pm
index f8d7600..ac2d517 100644
--- a/solenv/bin/modules/installer/windows/createfolder.pm
+++ b/solenv/bin/modules/installer/windows/createfolder.pm
@@ -75,57 +75,6 @@ sub get_languagepack_file
 }
 
 ##############################################################
-# Searching the correct file for help pack directories.
-##############################################################
-
-sub get_helppack_file
-{
-    my ($filesref, $onedir) = @_;
-
-    my $language = $onedir->{'specificlanguage'};
-    my $foundfile = 0;
-    my $onefile = "";
-
-    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
-    {
-        last if ($foundfile);
-
-        $onefile = ${$filesref}[$i];
-
-        my $styles = "";
-        if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-
-        # we need a file with the HELPPACK flag
-        if (( $styles =~ /\bHELPPACK\b/ ) || ( $styles =~ /\bFORCEHELPPACK\b/ ))
-        {
-            # chect that the language is correct
-            if ($onefile->{'ismultilingual'};)
-            {
-                my $specificlanguage = "";
-                if ( $onefile->{'specificlanguage'} ) { $specificlanguage = $onefile->{'specificlanguage'}; }
-
-                for ( my $j = 0; $j <= $#{$languagesarrayref}; $j++ )   # iterating over all languages
-                {
-                    my $onelanguage = ${$languagesarrayref}[$j];
-                    my $locallang = $onelanguage;
-                    $locallang =~ s/-/_/;
-
-                    if ( $specificlanguage eq $onelanguage )
-                    {
-                        $foundfile = 1;
-                        last;
-                    }
-                }
-            }
-        }
-    }
-
-    if ( ! $foundfile ) { installer::exiter::exit_program("ERROR: No file with correct language found (language pack build)!", "get_languagepack_file"); }
-
-    return $onefile;
-}
-
-##############################################################
 # Returning component for createfolder table.
 ##############################################################
 
@@ -147,7 +96,7 @@ sub get_createfolder_component
 
     my $onefile = "";
     if ( $installer::globals::languagepack ) { $onefile = get_languagepack_file($filesref, $onedir); }
-    elsif ( $installer::globals::helppack ) { $onefile = get_helppack_file($filesref, $onedir); }
+    elsif ( $installer::globals::helppack ) { $onefile = installer::existence::get_specified_file($filesref, 'gid_File_Help_Common_Zip'); }
     else { $onefile = installer::existence::get_specified_file($filesref, $globalfilegid); }
 
     return $onefile->{'componentname'};