diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-05 17:39:43 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-05 17:39:43 +0000 |
| commit | 0264595816e7bcc562f549273813de87d9c1e1b5 (patch) | |
| tree | 3eac7569c8671afefb11476fc612cb882de81680 /solenv | |
| parent | b0eeebac709d3fd21cf47e6a9fc103eb8ebf7f03 (diff) | |
INTEGRATION: CWS native133 (1.18.118); FILE MERGED
2008/02/27 13:00:23 is 1.18.118.1: #i86059# adding extension to Windows productname
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/windows/property.pm | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm index 312a53a97b15..395d8b0ef146 100644 --- a/solenv/bin/modules/installer/windows/property.pm +++ b/solenv/bin/modules/installer/windows/property.pm @@ -4,9 +4,9 @@ # # $RCSfile: property.pm,v $ # -# $Revision: 1.19 $ +# $Revision: 1.20 $ # -# last change: $Author: kz $ $Date: 2008-03-05 17:26:02 $ +# last change: $Author: kz $ $Date: 2008-03-05 18:39:43 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -65,7 +65,7 @@ sub get_arpcomments_for_property_table if ( $installer::globals::patch ) { - if ( ! $allvariables->{'WINDOWSPATCHLEVEL'} ) { installer::exiter::exit_program("ERROR: No Patch level defined for Windows patch: WINDOWSPATCHLEVEL", "get_productname_for_property_table"); } + if ( ! $allvariables->{'WINDOWSPATCHLEVEL'} ) { installer::exiter::exit_program("ERROR: No Patch level defined for Windows patch: WINDOWSPATCHLEVEL", "get_arpcomments_for_property_table"); } my $patchstring = "Product Update" . " " . $allvariables->{'WINDOWSPATCHLEVEL'}; $comment = $comment . " " . $patchstring; } @@ -145,6 +145,13 @@ sub get_productname_for_property_table $productname = $productname . " " . $postversionextension; } + my $productextension = ""; + if ( $allvariables->{'PRODUCTEXTENSION'} ) + { + $productextension = $allvariables->{'PRODUCTEXTENSION'}; + $productname = $productname . " " . $productextension; + } + if ( $installer::globals::languagepack ) { my $langstring = get_language_string(); # Example (English, Deutsch) |