diff options
author | Eilidh McAdam <eilidh@lanedo.com> | 2012-08-02 12:05:42 +0100 |
---|---|---|
committer | Eilidh McAdam <eilidh@lanedo.com> | 2012-08-02 12:07:10 +0100 |
commit | 73ec8371d797b5be564381d8982977696444ffa6 (patch) | |
tree | 6719c8311920e320b8406361e9a3b22495dbe71b /solenv | |
parent | 013d1e01c33ad41d16427470ac151192ea52adec (diff) |
Installer logic changed call msi functions on request
Change-Id: Ic73825cab20bd9e56be69531cba6452fe0202b72
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/bin/make_installer.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index ea77d9f99306..38b479346533 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -604,7 +604,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) my $allupdatelastsequences = ""; my $allupdatediskids = ""; - if ( $installer::globals::iswindowsbuild ) + if ( $installer::globals::iswindowsbuild || $installer::globals::packageformat eq 'msi' ) { if ( $allvariableshashref->{'UPDATE_DATABASE'} ) { @@ -625,7 +625,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) if (!($installer::globals::is_copy_only_project)) { - if (( $installer::globals::iswindowsbuild ) && ( $installer::globals::packageformat ne "archive" ) && ( $installer::globals::packageformat ne "installed" )) + if ((( $installer::globals::iswindowsbuild ) && ( $installer::globals::packageformat ne "archive" ) && ( $installer::globals::packageformat ne "installed" ) ) || $insaller::globals::packageformat eq 'msi' ) { installer::windows::msiglobal::set_global_code_variables($languagesarrayref, $languagestringref, $allvariableshashref, $alloldproperties); } |