[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - solenv/bin

Andras Timar andras.timar at collabora.com
Fri Jul 6 08:40:10 UTC 2018


 solenv/bin/modules/installer/windows/msp.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e82ba4850ed17d93f659de036feda6ebdd8012b4
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Jul 5 23:27:53 2018 -0700

    Take MsiMsp.Exe from Windows SDK 7.1A
    
    Change-Id: I68914ca86fa9cabaac3ce28d9aa870a522cdb2da

diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm
index 75bcceefcdf8..e76d5da7ab7f 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -198,7 +198,7 @@ sub execute_msimsp
 {
     my ($fullpcpfilename, $mspfilename, $localmspdir) = @_;
 
-    my $msimsp = "msimsp.exe";  # Has to be in the path
+    my $msimsp = "/cygdrive/c/PROGRA~2/MICROS~1/Windows/v7.1A/Bin/MsiMsp.Exe"; # FIXME Higher versions of Windows SDK do not have mspatchc.dll :(
     my $infoline = "";
     my $systemcall = "";
     my $returnvalue = "";


More information about the Libreoffice-commits mailing list