Attachment 41924 Details for Bug 32635 – test patch

[patch] test patch

broffice-test.diff (text/plain), 4.32 KB, created by Michael Meeks on 2011-01-12 06:12:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Meeks

Created: 2011-01-12 06:12:12 UTC

Size: 4.32 KB

patch

obsolete

>diff -ur /cygdrive/q/clone/bootstrap/solenv/bin/make_installer.pl solenv/bin/make_installer.pl
>--- /cygdrive/q/clone/bootstrap/solenv/bin/make_installer.pl	2010-12-18 15:38:09.142907600 -0700
>+++ solenv/bin/make_installer.pl	2011-01-10 08:18:32.762603500 -0700
>@@ -2051,7 +2051,8 @@
>         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 -ur /cygdrive/q/clone/bootstrap/solenv/bin/modules/installer/windows/directory.pm solenv/bin/modules/installer/windows/directory.pm
>--- /cygdrive/q/clone/bootstrap/solenv/bin/modules/installer/windows/directory.pm	2010-12-18 15:38:09.192910400 -0700
>+++ solenv/bin/modules/installer/windows/directory.pm	2011-01-12 04:49:32.744950200 -0700
>@@ -309,7 +309,7 @@
> 
> sub add_root_directories
> {
>-    my ($directorytableref, $allvariableshashref) = @_;
>+    my ($directorytableref, $allvariableshashref, $onelanguage) = @_;
>     
> #	my $sourcediraddon = "";
> #	if (($installer::globals::addchildprojects) ||
>@@ -324,7 +324,7 @@
> 
>     if (( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ) && ( ! $allvariableshashref->{'DONTUSESTARTMENUFOLDER'} ))
>     {
>-        my $productname = $allvariableshashref->{'PRODUCTNAME'};
>+        my $productname = $allvariableshashref->{'PRODUCTNAME'} . $onelanguage . "foo";
>         my $productversion = $allvariableshashref->{'PRODUCTVERSION'};
>         my $baseproductversion = $productversion;
> 
>@@ -427,7 +427,7 @@
> 
> 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
>@@ -437,6 +437,11 @@
>     # 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;
>     
>@@ -448,16 +453,17 @@
>     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);
>-
>+		print STDERR "create_directory_foo to $directorytablename !!!\n";
>+    }
> }
> 
> 1;
>Only in solenv/bin/modules/installer/windows: directory.pm.orig
>Only in solenv/bin/modules/installer/windows: directory.pm.rej

Actions: View

Attachments on bug 32635: 41417 | 41420 | 41546 | 41752 | 41753 | 41771 | 41924