summaryrefslogtreecommitdiff
path: root/solenv/bin
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2012-08-30 22:16:26 +0200
committerAndras Timar <atimar@suse.com>2012-08-30 22:16:26 +0200
commit743e51000adbf6cf0f50d96189511fe1649e47c8 (patch)
tree26f315debea0dead53d47a201f30f198efd3d2e9 /solenv/bin
parent8175dd0a461f9a8ab3b6d277d70a9ef0eecd53ef (diff)
remove obsoleted IS<LCIĐ> properties and conditions based on them
Change-Id: I75efbc3815551a9cff43f0c1501e94db7c834afd
Diffstat (limited to 'solenv/bin')
-rw-r--r--solenv/bin/modules/installer/globals.pm1
-rw-r--r--solenv/bin/modules/installer/windows/file.pm26
-rw-r--r--solenv/bin/modules/installer/windows/property.pm8
3 files changed, 0 insertions, 35 deletions
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 7473b31c4a74..d8d527343ce0 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -347,7 +347,6 @@ BEGIN
%componentcondition = ();
%componentid = ();
%comparecomponentname = ();
- %languageproperties = ();
%allcabinets = ();
%allcabinetassigns = ();
%cabfilecounter = ();
diff --git a/solenv/bin/modules/installer/windows/file.pm b/solenv/bin/modules/installer/windows/file.pm
index 227912912dab..f5449ce8ce09 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -992,32 +992,6 @@ sub create_files_table
}
}
- # Collecting all language specific conditions
- if ( $onefile->{'ismultilingual'} )
- {
- if ( $onefile->{'ComponentCondition'} ) { installer::exiter::exit_program("ERROR: Cannot set language condition. There is already another component condition for file $onefile->{'gid'}: \"$onefile->{'ComponentCondition'}\" !", "create_files_table"); }
-
- if ( $onefile->{'specificlanguage'} eq "" ) { installer::exiter::exit_program("ERROR: There is no specific language for file at language module: $onefile->{'gid'} !", "create_files_table"); }
- my $locallanguage = $onefile->{'specificlanguage'};
- my $property = "IS" . $file{'Language'};
- my $value = 1;
- my $condition = $property . "=" . $value;
-
- $onefile->{'ComponentCondition'} = $condition;
-
- if ( exists($installer::globals::componentcondition{$file{'Component_'}}))
- {
- if ( $installer::globals::componentcondition{$file{'Component_'}} ne $condition ) { installer::exiter::exit_program("ERROR: There is already another component condition for file $onefile->{'gid'}: \"$installer::globals::componentcondition{$file{'Component_'}}\" and \"$condition\" !", "create_files_table"); }
- }
- else
- {
- $installer::globals::componentcondition{$file{'Component_'}} = $condition;
- }
-
- # collecting all properties for table Property
- if ( ! exists($installer::globals::languageproperties{$property}) ) { $installer::globals::languageproperties{$property} = $value; }
- }
-
unless ( $file{'Version'} )
{
my $path = $onefile->{'sourcepath'};
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index 7d4ba0d9f254..6e70a1c77785 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -523,7 +523,6 @@ sub update_property_table
####################################################################################
# Setting language specific Properties in file Property.idt dynamically
# Adding:
-# is1033 = 1
# isMulti = 1
####################################################################################
@@ -534,13 +533,6 @@ sub set_languages_in_property_table
my $properyfilename = $basedir . $installer::globals::separator . "Property.idt";
my $propertyfile = installer::files::read_file($properyfilename);
- # Setting the component properties saved in %installer::globals::languageproperties
- foreach my $localproperty ( keys %installer::globals::languageproperties )
- {
- $onepropertyline = $localproperty . "\t" . $installer::globals::languageproperties{$localproperty} . "\n";
- push(@{$propertyfile}, $onepropertyline);
- }
-
# Setting the info about multilingual installation in property "isMulti"
my $propertyname = "isMulti";