From 575d8a89262280d361b87ba23ad563ab9e50db78 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Wed, 25 Jul 2012 13:32:51 +0200 Subject: These msi packaging pieces should be executed even when cross-compiling. Change-Id: I383f9467e708007e006d479967c9fd0e96ca4c87 --- solenv/bin/make_installer.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'solenv') diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index af2cf7ef56cd..914c79143310 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -1779,7 +1779,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) # Then the language specific msi database can be created - if ( $installer::globals::iswin ) # only possible on a Windows platform + if ( $installer::globals::iswin || $installer::globals::packageformat eq 'msi' ) { my $msidatabasename = installer::windows::msiglobal::get_msidatabasename($allvariableshashref, $onelanguage); my $msifilename = $languageidtdir . $installer::globals::separator . $msidatabasename; @@ -1812,7 +1812,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) my $defaultlanguage = installer::languages::get_default_language($languagesarrayref); - if ( $installer::globals::iswin ) # only possible on a Windows platform + if ( $installer::globals::iswin || $installer::globals::packageformat eq 'msi' ) { if ( $#{$languagesarrayref} > 0 ) { @@ -1868,7 +1868,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) # Only for Windows and only on a windows platform. ####################################################### - if ( $installer::globals::iswin ) # only possible on a Windows platform + if ( $installer::globals::iswin || $installer::globals::packageformat eq 'msi' ) { installer::logger::print_message( "... packaging installation set ... \n" ); installer::windows::msiglobal::execute_packaging($packjobref, $loggingdir, $allvariableshashref); -- cgit