diff options
author | Jan Holesovsky <kendy@suse.cz> | 2012-07-25 13:32:51 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2012-07-25 13:32:51 +0200 |
commit | 575d8a89262280d361b87ba23ad563ab9e50db78 (patch) | |
tree | 1a6e736236c51a25cb993cf96a521572589472c8 /solenv | |
parent | 60865562c89f2d9a5d157f809e401d725dee9a86 (diff) |
These msi packaging pieces should be executed even when cross-compiling.
Change-Id: I383f9467e708007e006d479967c9fd0e96ca4c87
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/bin/make_installer.pl | 6 |
1 files changed, 3 insertions, 3 deletions
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); |