diff options
Diffstat (limited to 'solenv/bin/modules/installer/windows/admin.pm')
| -rw-r--r-- | solenv/bin/modules/installer/windows/admin.pm | 13 |
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 = ""; |