more langpacks installer hacks ported for helppacks

17 files changed, 97 insertions, 18 deletions

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 682873970dae..19da0edf7ad7 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -491,6 +491,7 @@ if (( ! $allvariableshashref->{'XPDINSTALLER'} ) || ( ! $installer::globals::isx
 }
 
 if ( $installer::globals::languagepack ) { installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref); }
+if ( $installer::globals::helppack ) { installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref); }
 if ( $installer::globals::patch ) { installer::scriptitems::use_patch_copy_scpaction($scpactionsinproductarrayref); }
 if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions1b.log", $scpactionsinproductarrayref); }
 
@@ -830,7 +831,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
         if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles10c.log", $filesinproductlanguageresolvedarrayref); }
     }
 
-
     if ( ! $allvariableshashref->{'NO_README_IN_ROOTDIR'} )
     {
         $filesinproductlanguageresolvedarrayref = installer::scriptitems::add_License_Files_into_Installdir($filesinproductlanguageresolvedarrayref, $dirsinproductlanguageresolvedarrayref, $languagesarrayref);
@@ -1857,6 +1857,9 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
             # Creating installation set for Unix language packs, that are not part of multi lingual installation sets
             if ( ( $installer::globals::languagepack ) && ( ! $installer::globals::debian ) && ( ! $installer::globals::makedownload ) ) { installer::languagepack::build_installer_for_languagepack($installer::globals::epmoutpath, $allvariableshashref, $includepatharrayref, $languagesarrayref, $languagestringref); }
 
+            # Creating installation set for Unix help packs, that are not part of multi lingual installation sets
+            if ( ( $installer::globals::helppack ) && ( ! $installer::globals::debian ) && ( ! $installer::globals::makedownload ) ) { installer::helppack::build_installer_for_helppack($installer::globals::epmoutpath, $allvariableshashref, $includepatharrayref, $languagesarrayref, $languagestringref); }
+
             # Finalizing patch installation sets
             if (( $installer::globals::patch ) && ( $installer::globals::issolarispkgbuild )) { installer::epmfile::finalize_patch($installer::globals::epmoutpath, $allvariableshashref); }
             if (( $installer::globals::patch ) && ( $installer::globals::isrpmbuild )) { installer::epmfile::finalize_linux_patch($installer::globals::epmoutpath, $allvariableshashref, $includepatharrayref); }
@@ -1895,6 +1898,9 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
             # Creating installation set for Unix language packs, that are not part of multi lingual installation sets
             if ( ( $installer::globals::languagepack ) && ( ! $installer::globals::debian ) && ( ! $installer::globals::makedownload ) ) { installer::languagepack::build_installer_for_languagepack($newepmdir, $allvariableshashref, $includepatharrayref, $languagesarrayref, $languagestringref); }
 
+            # Creating installation set for Unix help packs, that are not part of multi lingual installation sets
+            if ( ( $installer::globals::helppack ) && ( ! $installer::globals::debian ) && ( ! $installer::globals::makedownload ) ) { installer::helppack::build_installer_for_helpepack($newepmdir, $allvariableshashref, $includepatharrayref, $languagesarrayref, $languagestringref); }
+
             chdir($currentdir); # changing back into start directory
         }
 
@@ -2087,7 +2093,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
 
         installer::windows::upgrade::create_upgrade_table($newidtdir, $allvariableshashref);
 
-        if ( ! $installer::globals::languagepack )   # the following tables not for language packs
+        if (( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack )) # the following tables not for language packs or help packs
         {
             installer::windows::removefile::create_removefile_table($folderitemsinproductlanguageresolvedarrayref, $newidtdir);
 
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 01fe0e4691e6..e9510e97defb 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -420,6 +420,7 @@ sub get_installation_type
     my $type = "";
 
     if ( $installer::globals::languagepack ) { $type = "langpack"; }
+    elsif ( $installer::globals::helppack ) { $type = "helppack"; }
     else { $type = "install"; }
 
     return $type;
@@ -661,6 +662,25 @@ sub get_install_type
             $type = $type . "-arc";
         }
     }
+    elsif ( $installer::globals::helppack )
+    {
+        $type = "langpack";
+
+        if ( $installer::globals::isrpmbuild )
+        {
+            $type = $type . "-rpm";
+        }
+
+        if ( $installer::globals::isdebbuild )
+        {
+            $type = $type . "-deb";
+        }
+
+        if ( $installer::globals::packageformat eq "archive" )
+        {
+            $type = $type . "-arc";
+        }
+    }
     else
     {
         $type = "install";
@@ -1025,7 +1045,7 @@ sub put_windows_productpath_into_template
 
     if (length($locallangs) > $installer::globals::max_lang_length) { $locallangs = "multi lingual"; }
 
-    if ( ! $installer::globals::languagepack ) { $productpath = $productpath . " (" . sprintf('%x', time()) . ")"; }
+    if ( ! $installer::globals::languagepack || ! $installer::globals::helppack ) { $productpath = $productpath . " (" . sprintf('%x', time()) . ")"; }
 
     replace_one_variable($templatefile, "PRODUCTPATHPLACEHOLDER", $productpath);
 }
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index c80a032a1e1c..267341396939 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -402,7 +402,8 @@ sub create_epm_header
         $readmefilenameen = "README_en-US";
     }
 
-    if (( $installer::globals::languagepack )   # in language packs the files LICENSE and README are removed, because they are not language specific
+    if (( $installer::globals::languagepack )   # in language packs and help packs the files LICENSE and README are removed, because they are not language specific
+        || ( $installer::globals::helppack )
         || ( $variableshashref->{'NO_README_IN_ROOTDIR'} ))
     {
         if ( $installer::globals::iswindowsbuild )
diff --git a/solenv/bin/modules/installer/followme.pm b/solenv/bin/modules/installer/followme.pm
index 9a6998a9dfc4..535ac31588ff 100644
--- a/solenv/bin/modules/installer/followme.pm
+++ b/solenv/bin/modules/installer/followme.pm
@@ -87,6 +87,7 @@ sub save_followme_info
     push(@filecontent, "globals:product: $installer::globals::product\n");
     push(@filecontent, "globals:patch: $installer::globals::patch\n");
     push(@filecontent, "globals:languagepack: $installer::globals::languagepack\n");
+    push(@filecontent, "globals:helppack: $installer::globals::helppack\n");
     push(@filecontent, "globals:installertypedir: $installer::globals::installertypedir\n");
     push(@filecontent, "globals:max_lang_length: $installer::globals::max_lang_length\n");
     push(@filecontent, "globals:compiler: $installer::globals::compiler\n");
@@ -189,6 +190,7 @@ sub read_followme_info
             if ( $name eq "product" ) { $installer::globals::product = $value; }
             if ( $name eq "patch" ) { $installer::globals::patch = $value; }
             if ( $name eq "languagepack" ) { $installer::globals::languagepack = $value; }
+            if ( $name eq "helppack" ) { $installer::globals::helppack = $value; }
             if ( $name eq "installertypedir" ) { $installer::globals::installertypedir = $value; }
             if ( $name eq "max_lang_length" ) { $installer::globals::max_lang_length = $value; }
             if ( $name eq "compiler" ) { $installer::globals::compiler = $value; }
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index 01210e796d7c..a963a64f6854 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -1226,6 +1226,7 @@ sub get_Source_Directory_For_Files_From_Includepathlist
         if (( $styles =~ /\bSTARREGISTRY\b/ ) || ( $styles =~ /\bFILE_CAN_MISS\b/ )) { $file_can_miss = 1; }
 
         if (( $installer::globals::languagepack ) && ( ! $onefile->{'ismultilingual'} ) && ( ! ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))) { $file_can_miss = 1; }
+        if (( $installer::globals::helppack ) && ( ! $onefile->{'ismultilingual'} ) && ( ! ( $styles =~ /\bFORCEHELPPACK\b/ ))) { $file_can_miss = 1; }
 
         my $sourcepathref = "";
 
@@ -1367,7 +1368,7 @@ sub remove_Files_Without_Sourcedirectory
 
                     next;   # removing this file from list, if sourcepath is empty
                 }
-                else # special case for language packs
+                elsif ( $installer::globals::languagepack ) # special case for language packs
                 {
                     if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))
                     {
@@ -1389,6 +1390,28 @@ sub remove_Files_Without_Sourcedirectory
                         next;   # removing this file from list, if sourcepath is empty
                     }
                 }
+                else # special case for help packs
+                {
+                    if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCEHELPPACK\b/ ))
+                    {
+                        $infoline = "ERROR: Removing file $filename from file list.\n";
+                        push( @installer::globals::logfileinfo, $infoline);
+
+                        push(@missingfiles, "ERROR: File not found: $filename\n");
+                        $error_occured = 1;
+
+                        next;   # removing this file from list, if sourcepath is empty
+                    }
+                    else
+                    {
+                        $infoline = "INFO: Removing file $filename from file list. It is not language dependent.\n";
+                        push( @installer::globals::logfileinfo, $infoline);
+                        $infoline = "INFO: It is not language dependent and can be ignored in help packs.\n";
+                        push( @installer::globals::logfileinfo, $infoline);
+
+                        next;   # removing this file from list, if sourcepath is empty
+                    }
+                }
             }
         }
 
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index adf1a9afdae6..b54a9dfbffb1 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -111,6 +111,13 @@ sub register_extensions
         push( @installer::globals::logfileinfo, $infoline);
     }
 
+    if (( $installer::globals::helppack ) && ( ! -f $unopkgfile ))
+    {
+        $unopkgexists = 0;
+        $infoline = "Help packs do not contain unopkg!\n";
+        push( @installer::globals::logfileinfo, $infoline);
+    }
+
     if ( ! -f $unopkgfile )
     {
         $unopkgexists = 0;
@@ -424,10 +431,11 @@ sub create_package
 
         my $localtempdir = $tempdir;
 
-        if (( $installer::globals::languagepack ) || ( $installer::globals::patch ))
+        if (( $installer::globals::languagepack ) || ( $installer::globals::helppack ) || ( $installer::globals::patch ))
         {
             $localtempdir = "$tempdir/$packagename";
             if ( $installer::globals::languagepack ) { $volume_name = "$volume_name Language Pack"; }
+            if ( $installer::globals::helppack ) { $volume_name = "$volume_name Help Pack"; }
             if ( $installer::globals::patch ) { $volume_name = "$volume_name Patch"; }
 
             # Create tar ball named tarball.tar.bz2
@@ -472,6 +480,7 @@ sub create_package
             my $scriptrealfilename = "osx_install.applescript";
             my $scriptfilename = "";
             if ( $installer::globals::languagepack ) { $scriptfilename = "osx_install_languagepack.applescript"; }
+            if ( $installer::globals::helppack ) { $scriptfilename = "osx_install_helppack.applescript"; }
             if ( $installer::globals::patch ) { $scriptfilename = "osx_install_patch.applescript"; }
             my $scripthelpersolverfilename = "mac_install.script";
             my $scripthelperrealfilename = $volume_name;
@@ -616,6 +625,7 @@ sub create_simple_package
         {
             $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "downloadname");
             if ( $installer::globals::languagepack ) { $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "langpackdownloadname"); }
+            if ( $installer::globals::helppack ) { $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "helppackdownloadname"); }
             if ( $installer::globals::patch ) { $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "patchdownloadname"); }
             $packagename = installer::download::resolve_variables_in_downloadname($allvariables, $$downloadname, \$locallanguage);
         }
diff --git a/solenv/bin/modules/installer/windows/createfolder.pm b/solenv/bin/modules/installer/windows/createfolder.pm
index 9cf3cb1e214d..a824a98275fe 100644
--- a/solenv/bin/modules/installer/windows/createfolder.pm
+++ b/solenv/bin/modules/installer/windows/createfolder.pm
@@ -122,8 +122,8 @@ sub create_createfolder_table
     {
         my $onedir = ${$dirref}[$i];
 
-        # language packs get only language dependent directories
-        if (( $installer::globals::languagepack ) && ( $onedir->{'specificlanguage'} eq "" )) { next };
+        # language packs and help packs get only language dependent directories
+        if (( $installer::globals::languagepack ) ||  ( $installer::globals::languagepack ) && ( $onedir->{'specificlanguage'} eq "" )) { next };
 
         my $styles = "";
 
@@ -151,4 +151,4 @@ sub create_createfolder_table
 
 }
 
-1;
\ No newline at end of file
+1;
diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm
index 22092f39aa53..49de6210bbc6 100644
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@@ -160,6 +160,7 @@ sub check_sourcedir_addon
     if (($installer::globals::addchildprojects) ||
         ($installer::globals::patch) ||
         ($installer::globals::languagepack) ||
+        ($installer::globals::helppack) ||
         ($allvariableshashref->{'CHANGETARGETDIR'}))
     {
         my $sourcediraddon = "\:\.";
@@ -321,7 +322,7 @@ sub add_root_directories
 
     my $oneline = "";
 
-    if (( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $allvariableshashref->{'DONTUSESTARTMENUFOLDER'} ))
+    if (( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ) && ( ! $allvariableshashref->{'DONTUSESTARTMENUFOLDER'} ))
     {
         my $productname = $allvariableshashref->{'PRODUCTNAME'};
         my $productversion = $allvariableshashref->{'PRODUCTVERSION'};
diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm
index 7b41e4490b89..f1c20b01b5a8 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -120,8 +120,8 @@ sub get_feature_display
     # Special handling for c05office. No program module visible.
     if (( $onefeature->{'gid'} eq "gid_Module_Prg" ) && ( $installer::globals::product =~ /c05office/i )) { $display = "0"; }
 
-    # making all feature invisible in Language packs!
-    if ( $installer::globals::languagepack ) { $display = "0"; }
+    # making all feature invisible in Language packs and in Help packs!
+    if ( $installer::globals::languagepack || $installer::globals::helppack ) { $display = "0"; }
 
     return $display
 }
diff --git a/solenv/bin/modules/installer/windows/mergemodule.pm b/solenv/bin/modules/installer/windows/mergemodule.pm
index 5f45f8ad59c8..981738b7fb4d 100755
--- a/solenv/bin/modules/installer/windows/mergemodule.pm
+++ b/solenv/bin/modules/installer/windows/mergemodule.pm
@@ -51,7 +51,7 @@ sub merge_mergemodules_into_msi_database
     my ($mergemodules, $filesref, $msifilename, $languagestringref, $language, $languagefile, $allvariables, $includepatharrayref, $allupdatesequences, $allupdatelastsequences, $allupdatediskids) = @_;
 
     my $domerge = 0;
-    if (( $#{$mergemodules} > -1 ) && ( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack )) { $domerge = 1; }
+    if (( $#{$mergemodules} > -1 ) && ( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack )) { $domerge = 1; }
 
     if ( $domerge )
     {
diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm
index 0f79d6b3b261..93f7af1a89d9 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -706,7 +706,7 @@ sub change_patchmetadata_table
     my $descriptionvalue = "";
 
     my $base = $allvariables->{'PRODUCTNAME'} . " " . $allvariables->{'PRODUCTVERSION'};
-    if ( $installer::globals::languagepack ) { $base = $targetproductnamevalue; }
+    if ( $installer::globals::languagepack || $installer::globals::helppack ) { $base = $targetproductnamevalue; }
 
     my $windowspatchlevel = 0;
     if ( $allvariables->{'WINDOWSPATCHLEVEL'} ) { $windowspatchlevel = $allvariables->{'WINDOWSPATCHLEVEL'}; }
@@ -985,6 +985,7 @@ sub correct_patch
 
     my $localproduct = $installer::globals::product;
     if ( $installer::globals::languagepack ) { $localproduct = $localproduct . "LanguagePack"; }
+    elsif ( $installer::globals::helppack ) { $localproduct = $localproduct . "HelpPack"; }
 
     if ( $product eq $localproduct ) { $product_is_good = 1; }
 
@@ -1211,6 +1212,7 @@ sub create_msp_patch
     my $pcpfilename = $allvariables->{'PCPFILENAME'};
 
     if ( $installer::globals::languagepack ) { $pcpfilename =~ s/.pcp\s*$/languagepack.pcp/; }
+    elsif ( $installer::globals::helppack ) { $pcpfilename =~ s/.pcp\s*$/helppack.pcp/; }
 
     # Searching the pcp file in the include pathes
     my $fullpcpfilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$pcpfilename, $includepatharrayref, 1);
@@ -1259,7 +1261,7 @@ sub create_msp_patch
     installer::systemactions::copy_complete_directory($oldinstallationsetpath, $mspdir);
 
     # Copying additional patches into the installation set, if required
-    if (( $allvariables->{'ADDITIONALREQUIREDPATCHES'} ) && ( $allvariables->{'ADDITIONALREQUIREDPATCHES'} ne "" ) && ( ! $installer::globals::languagepack ))
+    if (( $allvariables->{'ADDITIONALREQUIREDPATCHES'} ) && ( $allvariables->{'ADDITIONALREQUIREDPATCHES'} ne "" ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ))
     {
         my $filename = $allvariables->{'ADDITIONALREQUIREDPATCHES'};
 
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index dc1232246478..87cde91a6450 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -54,6 +54,7 @@ sub get_arpcomments_for_property_table
     }
 
     if ( $installer::globals::languagepack ) { $comment = $comment . " " . "Language Pack"; }
+    elsif ( $installer::globals::helppack ) { $comment = $comment . " " . "Help Pack"; }
 
     if ( $installer::globals::patch )
     {
@@ -184,6 +185,11 @@ sub get_productname_for_property_table($$)
         my $langstring = get_english_language_string(); # New: (English, German)
         $productname = $name . " " . $version . " Language Pack" . " " . $langstring;
     }
+    elsif ( $installer::globals::helppack )
+    {
+        my $langstring = get_english_language_string(); # New: (English, German)
+        $productname = $name . " " . $version . " Help Pack" . " " . $langstring;
+    }
 
     if ( $installer::globals::patch )
     {
@@ -365,6 +371,11 @@ sub set_important_properties
         my $onepropertyline = "ISLANGUAGEPACK" . "\t" . "1" . "\n";
         push(@{$propertyfile}, $onepropertyline);
     }
+    elsif ( $installer::globals::helppack )
+    {
+        my $onepropertyline = "ISHELPPACK" . "\t" . "1" . "\n";
+        push(@{$propertyfile}, $onepropertyline);
+    }
 
     my $languagesline = "PRODUCTALLLANGUAGES" . "\t" . $$languagestringref . "\n";
     push(@{$propertyfile}, $languagesline);
diff --git a/solenv/bin/modules/installer/windows/registry.pm b/solenv/bin/modules/installer/windows/registry.pm
index cf87ba174dd0..bc907d704f50 100644
--- a/solenv/bin/modules/installer/windows/registry.pm
+++ b/solenv/bin/modules/installer/windows/registry.pm
@@ -93,6 +93,7 @@ sub get_registry_component_name
     $componentname = $componentname . $addon;
 
     if (( $styles =~ /\bLANGUAGEPACK\b/ ) && ( $installer::globals::languagepack )) { $componentname = $componentname . "_lang"; }
+    elsif (( $styles =~ /\bHELPPACK\b/ ) && ( $installer::globals::helppack )) { $componentname = $componentname . "_help"; }
     if ( $styles =~ /\bALWAYS_REQUIRED\b/ ) { $componentname = $componentname . "_forced"; }
 
     if ( $isrootmodule ) { $installer::globals::registryrootcomponent = $componentname; }
diff --git a/solenv/bin/modules/installer/windows/update.pm b/solenv/bin/modules/installer/windows/update.pm
index efe6949b6fc4..503b3f91058a 100644
--- a/solenv/bin/modules/installer/windows/update.pm
+++ b/solenv/bin/modules/installer/windows/update.pm
@@ -215,6 +215,7 @@ sub correct_database
 
     my $localproduct = $installer::globals::product;
     if ( $installer::globals::languagepack ) { $localproduct = $localproduct . "LanguagePack"; }
+    elsif ( $installer::globals::helppack ) { $localproduct = $localproduct . "HelpPack"; }
 
     if ( $product eq $localproduct ) { $product_is_good = 1; }
 
@@ -597,4 +598,4 @@ sub create_database_hashes
 }
 
 
-1;
\ No newline at end of file
+1;
diff --git a/solenv/bin/modules/installer/windows/upgrade.pm b/solenv/bin/modules/installer/windows/upgrade.pm
index a17468ee30da..547bc4ce7bf1 100644
--- a/solenv/bin/modules/installer/windows/upgrade.pm
+++ b/solenv/bin/modules/installer/windows/upgrade.pm
@@ -94,7 +94,7 @@ sub create_upgrade_table
 
         # also searching for the beta
 
-        if (( $allvariableshashref->{'BETAUPGRADECODE'} ) && ( ! $installer::globals::languagepack ))
+        if (( $allvariableshashref->{'BETAUPGRADECODE'} ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ))
         {
             $newline = $allvariableshashref->{'BETAUPGRADECODE'} . "\t" . "1.0" . "\t" . "\t" . "\t" . "1" . "\t" . "\t" . "BETAPRODUCTS" . "\n";
             push(@upgradetable, $newline);
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index d5d81b357b1d..2ea8ec332961 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -827,7 +827,7 @@ sub install_simple ($$$$$$)
     {
         my $filelist;
         my $fname = $installer::globals::destdir . "/$packagename";
-        if ($installer::globals::languagepack) { $fname .= ".$languagestring"; }
+        if ($installer::globals::languagepack || $installer::globals::helppack) { $fname .= ".$languagestring"; }
         open ($filelist, ">$fname") || die "Can't open $fname: $!";
         print $filelist @lines;
         close ($filelist);
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index b3961841bbfe..bcdc0e52274a 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -793,6 +793,7 @@ sub add_variables_to_allvariableshashref
 
     if ( $installer::globals::patch ) { $variableshashref->{'PRODUCTADDON'} = $installer::globals::patchaddon; }
     elsif ( $installer::globals::languagepack ) { $variableshashref->{'PRODUCTADDON'} = $installer::globals::languagepackaddon; }
+    elsif ( $installer::globals::helppack ) { $variableshashref->{'PRODUCTADDON'} = $installer::globals::helppackpackaddon; }
     else { $variableshashref->{'PRODUCTADDON'} = ""; }
 
     my $localbuild = $installer::globals::build;