[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - solenv/bin

[Andras Timar]

 solenv/bin/modules/installer/globals.pm           |    1 -
 solenv/bin/modules/installer/windows/directory.pm |    3 ---
 2 files changed, 4 deletions(-)

New commits:
commit 3c9408f069658fca3e3d29eb09005ae0c7d3f3e2
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Dec 1 12:19:49 2014 -0800

    msi: LibreOffice does not use SystemFolder, don't define it
    
    LibreOffice does not install anything into SystemFolder (i.e. into
    C:\WINDOWS\SYSTEM32 or similar). However, merge module of MS VC++
    Runtime does. And if SystemFolder defined in MSM is different than
    SystemFolder defined in base MSI, then a conflict will occur, and
    merge will fail.
    
    Change-Id: I33649babcd33575aa17cd0e3c0ab612a81ceec98
    (cherry picked from commit af7a972fbc29631b7844440a9fc6863a2b9ae9da)

diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 163486e..5a7423a 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -82,7 +82,6 @@ BEGIN
     $templatefolder = "TemplateFolder";
     $templatefoldername = "Templates";
     $programmenufolder = "ProgramMenuFolder";
-    $systemfolder = "SystemFolder";
     $lcidlistname = $ENV{'SRCDIR'} . "/l10ntools/source/ulfconv/msi-encodinglist.txt";
     $msilanguage = "";  # hash reference for msi languages LCID
     $sofficeiconadded = 0;
diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm
index e4100fe..b84b05a 100644
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@@ -507,9 +507,6 @@ sub add_root_directories
         push(@{$directorytableref}, $oneline);
     }
 
-    $oneline = "$installer::globals::systemfolder\tTARGETDIR\t.\n";
-    push(@{$directorytableref}, $oneline);
-
     my $localtemplatefoldername = $installer::globals::templatefoldername;
     my $directorytableentry = $localtemplatefoldername;
     my $shorttemplatefoldername = installer::windows::idtglobal::make_eight_three_conform($localtemplatefoldername, "dir");