diff options
| author | Tim Retout <tim@retout.co.uk> | 2012-08-20 18:34:35 +0100 |
|---|---|---|
| committer | Tim Retout <tim@retout.co.uk> | 2012-08-21 22:23:39 +0100 |
| commit | e56c2adc9ca31117058323f78295eae620f4efbb (patch) | |
| tree | de07b1168f35918a89b279ae44fa7c4735b9f40e | |
| parent | fee50583ec3aac1b4738aeb57290d94e27bc4451 (diff) | |
installer: Remove code handling unused DELETE_ONLY and NOT_IN_SUITE flags.
Change-Id: I899beba64478d7309d5eccdb9a5ff9a02f0c3cad
| -rw-r--r-- | solenv/bin/make_installer.pl | 4 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/scriptitems.pm | 58 |
2 files changed, 0 insertions, 62 deletions
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index 18f3838b6655..7b524df01be5 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -373,8 +373,6 @@ installer::logger::print_message( "... analyzing files ... \n" ); my $filesinproductarrayref = installer::setupscript::get_all_items_from_script($setupscriptref, "File"); -$filesinproductarrayref = installer::scriptitems::remove_delete_only_files_from_productlists($filesinproductarrayref); - if (( ! $installer::globals::iswindowsbuild ) && ( ! $installer::globals::isrpmbuild ) && ( ! $installer::globals::isdebbuild ) && @@ -384,8 +382,6 @@ if (( ! $installer::globals::iswindowsbuild ) && ( $installer::globals::packageformat ne "archive" )) { installer::control::check_oxtfiles($filesinproductarrayref); } -if ($installer::globals::product =~ /suite/i ) { $filesinproductarrayref = installer::scriptitems::remove_notinsuite_files_from_productlists($filesinproductarrayref); } - if (! $installer::globals::languagepack) { $filesinproductarrayref = installer::scriptitems::remove_Languagepacklibraries_from_Installset($filesinproductarrayref); diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index cc2d910c1377..6496efa8b2f3 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -150,64 +150,6 @@ sub resolve_all_directory_names } ############################################################################# -# Files with flag DELETE_ONLY do not need to be packed into installation set -############################################################################# - -sub remove_delete_only_files_from_productlists -{ - my ($productarrayref) = @_; - - my @newitems = (); - - for ( my $i = 0; $i <= $#{$productarrayref}; $i++ ) - { - my $oneitem = ${$productarrayref}[$i]; - my $styles = ""; - - if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; } - - if (!($styles =~ /\bDELETE_ONLY\b/)) - { - push(@newitems, $oneitem); - } - } - - return \@newitems; -} - -############################################################################# -# Files with flag NOT_IN_SUITE do not need to be packed into -# Suite installation sets -############################################################################# - -sub remove_notinsuite_files_from_productlists -{ - my ($productarrayref) = @_; - - my @newitems = (); - - for ( my $i = 0; $i <= $#{$productarrayref}; $i++ ) - { - my $oneitem = ${$productarrayref}[$i]; - my $styles = ""; - - if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; } - - if (!($styles =~ /\bNOT_IN_SUITE\b/)) - { - push(@newitems, $oneitem); - } - else - { - my $infoline = "INFO: Flag NOT_IN_SUITE \-\> Removing $oneitem->{'gid'} from file list.\n"; - push( @installer::globals::globallogfileinfo, $infoline); - } - } - - return \@newitems; -} - -############################################################################# # Files with flag NOT_IN_SUITE do not need to be packed into # Suite installation sets ############################################################################# |