diff options
Diffstat (limited to 'solenv/bin')
| -rw-r--r-- | solenv/bin/make_installer.pl | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/windows/msiglobal.pm | 23 |
2 files changed, 0 insertions, 25 deletions
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index c9d9f02109ad..a21ac4d1fa99 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -2211,8 +2211,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) } installer::windows::msiglobal::rename_msi_database_in_installset($defaultlanguage, $installdir, $allvariableshashref); - - if ( $allvariableshashref->{'ADDLANGUAGEINDATABASENAME'} ) { installer::windows::msiglobal::add_language_to_msi_database($defaultlanguage, $installdir, $allvariableshashref); } } # Analyzing the ScpActions and copying the files into the installation set diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm index 73a84c48440f..8a2fa0921f2d 100644 --- a/solenv/bin/modules/installer/windows/msiglobal.pm +++ b/solenv/bin/modules/installer/windows/msiglobal.pm @@ -1170,29 +1170,6 @@ sub rename_msi_database_in_installset $installer::globals::msidatabasename = $newdatabasename; } -######################################################################### -# Adding the language to the name of the msi databasename, -# if this is required (ADDLANGUAGEINDATABASENAME) -######################################################################### - -sub add_language_to_msi_database -{ - my ($defaultlanguage, $installdir, $allvariables) = @_; - - my $languagestring = $defaultlanguage; - if ( $allvariables->{'USELANGUAGECODE'} ) { $languagestring = installer::windows::language::get_windows_language($defaultlanguage); } - my $newdatabasename = $installer::globals::shortmsidatabasename; - $newdatabasename =~ s/\.msi\s*$/_$languagestring\.msi/; - $installer::globals::shortmsidatabasename = $newdatabasename; - $newdatabasename = $installdir . $installer::globals::separator . $newdatabasename; - - my $olddatabasename = $installer::globals::msidatabasename; - - installer::systemactions::rename_one_file($olddatabasename, $newdatabasename); - - $installer::globals::msidatabasename = $newdatabasename; -} - ########################################################################## # Writing the databasename into the setup.ini. ########################################################################## |