[Libreoffice-commits] .: solenv/bin

[Caolán McNamara]

 solenv/bin/modules/installer/windows/featurecomponent.pm |   69 ---------------
 1 file changed, 69 deletions(-)

New commits:
commit 37c8df84a9c998dd5be1b0c9c666f6696b401047
Author: Jordan Ayers <jordan.ayers at gmail.com>
Date:   Wed Nov 10 21:26:46 2010 -0600

    Perl Installer: Remove disabled Win9x build guard.
    
    Remove the feature component counting routines.
    These were added to enforce a Win9x component count limit, but no longer
    do anything except collect and log counts.

diff --git a/solenv/bin/modules/installer/windows/featurecomponent.pm b/solenv/bin/modules/installer/windows/featurecomponent.pm
index 88269f0..f52032d 100644
--- a/solenv/bin/modules/installer/windows/featurecomponent.pm
+++ b/solenv/bin/modules/installer/windows/featurecomponent.pm
@@ -132,71 +132,6 @@ sub create_featurecomponent_table_from_registry_collector
 }
 
 #################################################################################
-# Collecting all feature that are listed in the featurecomponent table.
-#################################################################################
-
-sub collect_all_feature
-{
-    my ($featurecomponenttable) = @_;
-    
-    my @allfeature = ();
-
-    for ( my $i = 3; $i <= $#{$featurecomponenttable}; $i++ )	# beginning in line 4
-    {
-        my $oneline = ${$featurecomponenttable}[$i];
-        
-        if ( $oneline =~ /^\s*(\S+)\s+(\S+)\s*$/ )
-        {
-            my $feature = $1;
-
-            if (! installer::existence::exists_in_array($feature, \@allfeature)) { push(@allfeature, $feature); }			
-        }
-    }
-    
-    return \@allfeature;
-}
-
-#################################################################################
-# On Win98 and Win Me there seems to be the problem, that maximum 817
-# components can be added to a feature. Even if Windows Installer 2.0
-# is used.
-#################################################################################
-
-sub check_number_of_components_at_feature
-{
-    my ($featurecomponenttable) = @_;
-
-    my $infoline = "\nChecking number of components at features. Maximum is 817 (for Win 98 and Win Me)\n";
-    push(@installer::globals::logfileinfo, $infoline);		
-
-    my $allfeature = collect_all_feature($featurecomponenttable);
-
-    for ( my $i = 0; $i <= $#{$allfeature}; $i++ )
-    {
-        my $onefeature = ${$allfeature}[$i];
-        my $featurecomponents = 0;
-    
-        for ( my $j = 0; $j <= $#{$featurecomponenttable}; $j++ )
-        {
-            if ( ${$featurecomponenttable}[$j] =~ /^\s*\Q$onefeature\E\s+(\S+)\s*$/ ) { $featurecomponents++; }
-        }
-
-        # if ( $featurecomponents > 816 )
-        # {
-        #     installer::exiter::exit_program("ERROR: More than 816 components ($featurecomponents) at feature $onefeature. This causes problems on Win 98 and Win Me!", "check_number_of_components_at_feature");
-        # }
-        
-        # Logging the result
-        
-        $infoline = "Number of components at feature $onefeature : $featurecomponents\n"; 
-        push(@installer::globals::logfileinfo, $infoline);		
-    }
-
-    $infoline = "\n";
-    push(@installer::globals::logfileinfo, $infoline);
-}
-    
-#################################################################################
 # Creating the file FeatureC.idt dynamically
 # Content: 
 # Feature Component 
@@ -228,10 +163,6 @@ sub create_featurecomponent_table
 
     # Additional components have to be added here
 
-    # Checking, whether there are more than 817 components at a feature
-
-    check_number_of_components_at_feature(\@featurecomponenttable);
-
     # Saving the file
     
     my $featurecomponenttablename = $basedir . $installer::globals::separator . "FeatureC.idt";