diff options
Diffstat (limited to 'solenv/bin/modules/installer/control.pm')
| -rw-r--r-- | solenv/bin/modules/installer/control.pm | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm index decf519eb881..c013b593cb79 100644 --- a/solenv/bin/modules/installer/control.pm +++ b/solenv/bin/modules/installer/control.pm @@ -70,12 +70,6 @@ sub check_system_path # All platforms: zip # Windows only: "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe", "expand.exe" for msi database and packaging - if ($ENV{'CROSS_COMPILING'} eq 'TRUE') - { - # we build our own msi* etc. tools when cross-compiling - $ENV{'PATH'} .= $installer::globals::pathseparator . $ENV{'WORKDIR_FOR_BUILD'} . '/LinkTarget/Executable'; - } - my $onefile; my $error = 0; my $pathvariable = $ENV{'PATH'}; @@ -100,10 +94,6 @@ sub check_system_path { @needed_files_in_path = ("zip.exe", "msiinfo.exe", "msidb.exe", "uuidgen", "makecab.exe", "msitran.exe", "expand.exe"); } - elsif ($installer::globals::isunix && $installer::globals::packageformat eq 'msi') - { - @needed_files_in_path = ("zip", "msiinfo.exe", "msidb.exe", "uuidgen", "makecab.exe", "msitran.exe", "cabextract"); - } elsif ($installer::globals::iswin) { @needed_files_in_path = ("zip.exe"); @@ -167,10 +157,6 @@ sub get_makecab_version my $makecabversion = -1; my $systemcall = "makecab.exe |"; - if ( $installer::globals::isunix ) - { - $systemcall = "$ENV{'WORKDIR_FOR_BUILD'}/LinkTarget/Executable/makecab.exe |"; - } my @makecaboutput = (); open (CAB, $systemcall); |