[Libreoffice-commits] .: solenv/bin

[Michael Meeks]

 solenv/bin/make_installer.pl                      |    3 ++-
 solenv/bin/modules/installer/windows/directory.pm |   22 ++++++++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

New commits:
commit 226ea21fddfad5140d229ddbde58854f0f7ac57a
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Wed Jan 12 14:22:21 2011 +0000

    BrOffice Windows start menu branding

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index dae71a6..b418f7e 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -2051,7 +2051,8 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
         if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles17c.log", $filesinproductlanguageresolvedarrayref); }
         if ( $installer::globals::updatedatabase ) { installer::windows::file::check_file_sequences($allupdatefileorder, $allupdatecomponentorder); }
 
-        installer::windows::directory::create_directory_table($directoriesforepmarrayref, $newidtdir, $allvariableshashref, $shortdirname, $loggingdir);
+        # Attention: The table "Director.idt" contains language specific strings -> parameter: $languagesarrayref !
+        installer::windows::directory::create_directory_table($directoriesforepmarrayref, $languagesarrayref, $newidtdir, $allvariableshashref, $shortdirname, $loggingdir);
         if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles18.log", $filesinproductlanguageresolvedarrayref); }
         if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt1.log", $directoriesforepmarrayref); }
 
diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm
index ec56df2..5fc86c3 100644
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@@ -308,13 +308,18 @@ sub create_directorytable_from_collection
 
 sub add_root_directories
 {
-    my ($directorytableref, $allvariableshashref) = @_;
+    my ($directorytableref, $allvariableshashref, $onelanguage) = @_;
     
     my $oneline = "";
 
     if (( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ) && ( ! $allvariableshashref->{'DONTUSESTARTMENUFOLDER'} ))
     {
-        my $productname = $allvariableshashref->{'PRODUCTNAME'};
+        my $productname;
+
+	$productname = $allvariableshashref->{'PRODUCTNAME'};
+	if ($onelanguage eq 'pt-BR' && defined $allvariableshashref->{'PRODUCTNAME_BR'}) {
+	    $productname = $allvariableshashref->{'PRODUCTNAME_BR'};
+	}
         my $productversion = $allvariableshashref->{'PRODUCTVERSION'};
         my $baseproductversion = $productversion;
 
@@ -417,7 +422,7 @@ sub add_root_directories
 
 sub create_directory_table
 {
-    my ($directoryref, $basedir, $allvariableshashref, $shortdirnamehashref, $loggingdir) = @_;
+    my ($directoryref, $languagesarrayref, $basedir, $allvariableshashref, $shortdirnamehashref, $loggingdir) = @_;
 
     # Structure of the directory table:
     # Directory Directory_Parent DefaultDir
@@ -427,6 +432,11 @@ sub create_directory_table
     # Before ":" : [sourcedir]:[destdir] (not programmed yet)
     # After ":" : 8+3 and not 8+3 the destination directory name
 
+    for ( my $m = 0; $m <= $#{$languagesarrayref}; $m++ )
+    {
+        my $onelanguage = ${$languagesarrayref}[$m];
+        $installer::globals::installlocationdirectoryset = 0;
+
     my @directorytable = ();
     my $infoline;
     
@@ -438,16 +448,16 @@ sub create_directory_table
     set_installlocation_directory($directoryref, $allvariableshashref);
     if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt_local_3.log", $directoryref); }
     installer::windows::idtglobal::write_idt_header(\@directorytable, "directory");
-    add_root_directories(\@directorytable, $allvariableshashref);
+    add_root_directories(\@directorytable, $allvariableshashref, $onelanguage);
     create_directorytable_from_collection(\@directorytable, $directoryref);
 
     # Saving the file
 
-    my $directorytablename = $basedir . $installer::globals::separator . "Director.idt";
+    my $directorytablename = $basedir . $installer::globals::separator . "Director.idt" . "." . $onelanguage;
     installer::files::save_file($directorytablename ,\@directorytable);
     $infoline = "Created idt file: $directorytablename\n"; 
     push(@installer::globals::logfileinfo, $infoline);
-
+    }
 }
 
 1;