diff options
| author | Andras Timar <andras.timar@collabora.com> | 2013-09-10 09:10:32 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2013-09-10 09:10:32 +0200 |
| commit | a41d72333d15c609f0441bd7df1722b31297756d (patch) | |
| tree | 8a21752ccbf8a716f5d0c13fcae78f03d36e82b2 /solenv/bin | |
| parent | f5248b4f4e83d491347749cb6731a12a9509b560 (diff) | |
kill VERSION_INDEPENDENT_COMP_ID
Version independent ComponentID in Component table of MSI means
that the GUID is calculated from the Component name only, the
PRODUCTVERSION is not concatenated to the name. Providing that
name is constant in all versions, the resulting GUID would be
the same e.g. for 4.0, 4.1, 4.2 etc. But what is it good for?
Faster upgrades maybe? But name can also change, we did not
pay attention to keep it constant. So in order to help scp2
cleanup, VERSION_INDEPENDENT_COMP_ID flag was obsoleted and
removed.
Change-Id: I8e1ee450524b02f07d0b0553f6b82d0321dbddcf
Diffstat (limited to 'solenv/bin')
| -rw-r--r-- | solenv/bin/modules/installer/globals.pm | 1 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/windows/file.pm | 7 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/windows/msiglobal.pm | 10 |
3 files changed, 2 insertions, 16 deletions
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index 2940407c0b81..f6bc9fcd6ceb 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -264,7 +264,6 @@ BEGIN %dontdeletecomponents = (); %allcalculated_guids = (); %calculated_component_guids = (); - %base_independent_components = (); %all_english_languagestrings = (); %all_required_english_languagestrings = (); diff --git a/solenv/bin/modules/installer/windows/file.pm b/solenv/bin/modules/installer/windows/file.pm index 2bf02fc9ba5b..93f7cc52e624 100644 --- a/solenv/bin/modules/installer/windows/file.pm +++ b/solenv/bin/modules/installer/windows/file.pm @@ -917,13 +917,6 @@ sub create_files_table # Collecting also all tree conditions for multilayer products get_tree_condition_for_component($onefile, $file{'Component_'}); - # Collecting all component names, that have flag VERSION_INDEPENDENT_COMP_ID - # This should be all components with constant API, for example URE - if ( $styles =~ /\bVERSION_INDEPENDENT_COMP_ID\b/ ) - { - $installer::globals::base_independent_components{$onefile->{'componentname'}} = 1; - } - unless ( $file{'Version'} ) { my $path = $onefile->{'sourcepath'}; diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm index 7a7a121b8de0..705e5757d090 100644 --- a/solenv/bin/modules/installer/windows/msiglobal.pm +++ b/solenv/bin/modules/installer/windows/msiglobal.pm @@ -1014,15 +1014,9 @@ sub set_uuid_into_component_table else { # Calculating new GUID with the help of the component name. - my $useproductversion = 1; - if ( exists($installer::globals::base_independent_components{$componentname})) { $useproductversion = 0; } - my $sourcestring = $componentname; - if ( $useproductversion ) - { - if ( ! exists($allvariables->{'PRODUCTVERSION'}) ) { installer::exiter::exit_program("ERROR: Could not find variable \"PRODUCTVERSION\" (required value for GUID creation)!", "set_uuid_into_component_table"); } - $sourcestring = $sourcestring . "_" . $allvariables->{'PRODUCTVERSION'}; - } + if ( ! exists($allvariables->{'PRODUCTVERSION'}) ) { installer::exiter::exit_program("ERROR: Could not find variable \"PRODUCTVERSION\" (required value for GUID creation)!", "set_uuid_into_component_table"); } + my $sourcestring = $componentname . "_" . $allvariables->{'PRODUCTVERSION'}; $uuid = calculate_guid($sourcestring); $counter++; |