installer: Remove unused -tab command-line option and TAB_ONLY flag.

Change-Id: Idcb8be8882db8f487ba9bda2ae8947ccd9d99712
Reviewed-on: https://gerrit.libreoffice.org/462
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

7 files changed, 2 insertions, 51 deletions

diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index c1980504768f..a530774b0e22 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -290,7 +290,6 @@ End
 
 Module gid_Module_Root_Files_5
     PackageInfo = "packinfo_office.txt";
-    TabPackageInfo = "packinfo_office_tab.txt";
 	ParentID = gid_Module_Root;
     InstallOrder = "40";
 	Name = "gid_Module_Root_Files_5";
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 23196e2ddbed..c5c9c221cab2 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -30,7 +30,6 @@
 Module gid_Module_Root
     Sortkey = "10";
     PackageInfo = "packinfo_office.txt";
-    TabPackageInfo = "packinfo_office_tab.txt";
     InstallOrder = "20";
     MOD_NAME_DESC(MODULE_ROOT_OSL);
     XpdPackageName = "gid_Module_Root_Files_1";
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index ceafede4880a..3820c7002c9a 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -398,11 +398,6 @@ sub main {
         $filesinproductarrayref = installer::scriptitems::remove_patchonlyfiles_from_Installset($filesinproductarrayref);
     }
 
-    if (! $installer::globals::tab)
-    {
-        $filesinproductarrayref = installer::scriptitems::remove_tabonlyfiles_from_Installset($filesinproductarrayref);
-    }
-
     installer::logger::print_message( "... analyzing scpactions ... \n" );
 
     my $scpactionsinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "ScpAction");
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index af8d8dd65e61..419a8e35b517 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -265,7 +265,6 @@ BEGIN
     $addchildprojects = 0;
     $languagepack = 0;
     $helppack = 0;
-    $tab = 0;
     $patch = 0;
     $patchincludepath = "";
     $refresh_includepaths = 0;
diff --git a/solenv/bin/modules/installer/packagelist.pm b/solenv/bin/modules/installer/packagelist.pm
index 0612ecb3257a..66b52e2f796d 100644
--- a/solenv/bin/modules/installer/packagelist.pm
+++ b/solenv/bin/modules/installer/packagelist.pm
@@ -634,10 +634,7 @@ sub collectpackages
     my $onemodule;
     foreach $onemodule ( @{$allmodules} )
     {
-        my $packageinfo = "PackageInfo";
-        if (( $installer::globals::tab ) && ( $onemodule->{"TabPackageInfo"} )) { $packageinfo = "TabPackageInfo" }
-
-        if ( $onemodule->{$packageinfo} )   # this is a package module!
+        if ( $onemodule->{'PackageInfo'} )   # this is a package module!
         {
             my $modulegid = $onemodule->{'gid'};
 
@@ -658,7 +655,7 @@ sub collectpackages
             if ( exists($gid_analyzed{$modulegid}) ) { next; }
             $gid_analyzed{$modulegid} = 1;
 
-            my $packinfofile = $onemodule->{$packageinfo};
+            my $packinfofile = $onemodule->{'PackageInfo'};
 
             # The file with package information has to be found in path list
             my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$packinfofile, "" , 0);
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 7cbc28da44b0..c749af73d9c6 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -133,7 +133,6 @@ sub getparameter
         elsif ($param eq "-format") { $installer::globals::packageformat = shift(@ARGV); }
         elsif ($param eq "-quiet") { $installer::globals::quiet = 1; }
         elsif ($param eq "-verbose") { $installer::globals::quiet = 0; }
-        elsif ($param eq "-tab") { $installer::globals::tab = 1; }
         elsif ($param eq "-u") { $installer::globals::unpackpath = shift(@ARGV); }
         elsif ($param eq "-i") { $installer::globals::rootpath = shift(@ARGV); }
         elsif ($param eq "-dontcallepm") { $installer::globals::call_epm = 0; }
@@ -564,7 +563,6 @@ sub outputparameter
     if ((!($installer::globals::iswindowsbuild)) && ( $installer::globals::call_epm )) { push(@output, "Calling epm\n"); }
     if ((!($installer::globals::iswindowsbuild)) && (!($installer::globals::call_epm))) { push(@output, "Not calling epm\n"); }
     if ( $installer::globals::patchincludepath ) { push(@output, "Patch include path: $installer::globals::patchincludepath\n"); }
-    if ( $installer::globals::tab ) { push(@output, "TAB version\n"); }
     if ( $installer::globals::strip ) { push(@output, "Stripping files\n"); }
     else { push(@output, "No file stripping\n"); }
     if ( $installer::globals::debian ) { push(@output, "Linux: Creating Debian packages\n"); }
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index 8467d682dd43..2d7bd517061f 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -1652,42 +1652,6 @@ sub remove_patchonlyfiles_from_Installset
 }
 
 ############################################################################
-# Removing all files with flag TAB_ONLY from installation set.
-# This function is not called during tab creation.
-############################################################################
-
-sub remove_tabonlyfiles_from_Installset
-{
-    my ($itemsarrayref) = @_;
-
-    my $infoline;
-
-    my @newitemsarray = ();
-
-    for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ )
-    {
-        my $oneitem = ${$itemsarrayref}[$i];
-        my $styles = "";
-        if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
-
-        if ( $styles =~ /\bTAB_ONLY\b/ )
-        {
-            $infoline = "Removing tab only file $oneitem->{'gid'} from the installation set.\n";
-            push( @installer::globals::globallogfileinfo, $infoline);
-
-            next;
-        }
-
-        push(@newitemsarray, $oneitem);
-    }
-
-    $infoline = "\n";
-    push( @installer::globals::globallogfileinfo, $infoline);
-
-    return \@newitemsarray;
-}
-
-############################################################################
 # Some files cotain a $ in their name. epm conflicts with such files.
 # Solution: Renaming this files, converting "$" to "$$"
 ############################################################################