This one is kind of in the 'accelerate perl installer' category.
In early October, the build abort in these functions was disabled,
with the end result that these functions are only collecting counts
for the log. This patch removes those functions, assuming that the
component count logs were only there for dealing with build aborts.
Alternatively, if the counts are useful for debugging, I could
change the comments and log messages to indicate that this is now
effectively a logging function. In that case I would also suggest
using the $installer::globals::debug flag to skip this routine for
normal builds.
LGPLv3+/MPL
Jordan Ayers
From 4f432b8b72ef38fcb272424912dfe7d688a05f93 Mon Sep 17 00:00:00 2001
From: Jordan Ayers <jordan.ay...@gmail.com>
Date: Wed, 10 Nov 2010 21:26:46 -0600
Subject: [PATCH] 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.
---
.../modules/installer/windows/featurecomponent.pm | 69 --------------------
1 files changed, 0 insertions(+), 69 deletions(-)
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";
--
1.7.1
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
