Remove support for cross-building .msi on Linux

...which is no longer needed after 8646ab97dc37c0606b19057686bf3d610f9c15ee
"Remove MinGW support".  This effectively removes the commits
8251cd1936af5047c817adf88333fef31031c506 "Call uuidgen without -n when cross-
compiling", e8ddf693e69ea768e4cb1bd4c0445990149af07d "Cross-compiling-msi-
related changes; not finished", 60865562c89f2d9a5d157f809e401d725dee9a86 "We
have to add the path to solver for the msi* tools when cross-compiling", and
61b1c24615445d7677dbfe4a702d3dd97eaa4939 "More full paths for cross msi* tools"
(while 8429bd67715a33751f4cfd50cb4be0346d78ee65 "Make the relativisation of the
path working even on Linux" from amidst them is probably "harmless").

Change-Id: I0b9be32babdf6db83e2093eafd556c875910d92b
Reviewed-on: https://gerrit.libreoffice.org/36471
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

1 files changed, 0 insertions, 13 deletions

diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm
index 6fb18583110f..27e4ba7c3232 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -39,11 +39,6 @@ sub unpack_cabinet_file
     push( @installer::globals::logfileinfo, $infoline);
 
     my $expandfile = "expand.exe";  # Has to be in the path
-    if ( $installer::globals::isunix )
-    {
-        $infoline = "ERROR: We need to change this to use cabextract instead of expand.exe\n";
-        push( @installer::globals::logfileinfo, $infoline);
-    }
 
     # expand.exe has to be located in the system directory.
     # Cygwin has another tool expand.exe, that converts tabs to spaces. This cannot be used of course.
@@ -100,10 +95,6 @@ sub extract_tables_from_pcpfile
     my ($fullmsidatabasepath, $workdir, $tablelist) = @_;
 
     my $msidb = "msidb.exe";    # Has to be in the path
-    if ( $installer::globals::isunix )
-    {
-        $msidb = "$ENV{'WORKDIR_FOR_BUILD'}/LinkTarget/Executable/msidb.exe";
-    }
     my $infoline = "";
     my $systemcall = "";
     my $returnvalue = "";
@@ -405,10 +396,6 @@ sub write_sis_info
     if ( ! -f $msidatabase ) { installer::exiter::exit_program("ERROR: Cannot find file $msidatabase", "write_sis_info"); }
 
     my $msiinfo = "msiinfo.exe";    # Has to be in the path
-    if ( $installer::globals::isunix )
-    {
-        $msiinfo = "$ENV{'WORKDIR_FOR_BUILD'}/LinkTarget/Executable/msiinfo.exe";
-    }
     my $infoline = "";
     my $systemcall = "";
     my $returnvalue = "";