registry.pm (677600b0) registry.pm (d62abd1a)
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 70 unchanged lines hidden (view full) ---

79 {
80 $addon .= $allvariables->{'PRODUCTNAME'};
81 }
82
83 # Append the version number.
84 # Previously that was the full version number as provided by 'PRODUCTVERSION'.
85 # But MSI patches introduce the restriction that component names must not change.
86 # Use just the major version number.
1#**************************************************************
2#
3# Licensed to the Apache Software Foundation (ASF) under one
4# or more contributor license agreements. See the NOTICE file
5# distributed with this work for additional information
6# regarding copyright ownership. The ASF licenses this file
7# to you under the Apache License, Version 2.0 (the
8# "License"); you may not use this file except in compliance

--- 70 unchanged lines hidden (view full) ---

79 {
80 $addon .= $allvariables->{'PRODUCTNAME'};
81 }
82
83 # Append the version number.
84 # Previously that was the full version number as provided by 'PRODUCTVERSION'.
85 # But MSI patches introduce the restriction that component names must not change.
86 # Use just the major version number.
87 my $version = $allvariables->{"BRANDPACKAGEVERSION"} // "";
87 my $version = $allvariables->{"BRANDPACKAGEVERSION"};
88 $version = "" unless defined $version;
88 $addon .= $version;
89 $addon = lc($addon);
90 $addon =~ s/ //g;
91 $addon =~ s/-//g;
92 $addon =~ s/\.//g;
93
94 $componentname = $componentname . $addon;
95

--- 285 unchanged lines hidden (view full) ---

381 $registry{'Name'} = get_registry_name($oneregistry, $allvariableshashref);
382 $registry{'Value'} = get_registry_value($oneregistry, $allvariableshashref);
383 $registry{'Val64'} = get_registry_val64($oneregistry, $allvariableshashref);
384 my $component_name = get_registry_component_name($oneregistry, $allvariableshashref);
385 $oneregistry->{'componentname'} = $component_name;
386 $registry{'Component_'} = $component_name;
387
388 # Collecting all components with DONT_DELETE style
89 $addon .= $version;
90 $addon = lc($addon);
91 $addon =~ s/ //g;
92 $addon =~ s/-//g;
93 $addon =~ s/\.//g;
94
95 $componentname = $componentname . $addon;
96

--- 285 unchanged lines hidden (view full) ---

382 $registry{'Name'} = get_registry_name($oneregistry, $allvariableshashref);
383 $registry{'Value'} = get_registry_value($oneregistry, $allvariableshashref);
384 $registry{'Val64'} = get_registry_val64($oneregistry, $allvariableshashref);
385 my $component_name = get_registry_component_name($oneregistry, $allvariableshashref);
386 $oneregistry->{'componentname'} = $component_name;
387 $registry{'Component_'} = $component_name;
388
389 # Collecting all components with DONT_DELETE style
389 my $style = $oneregistry->{'Styles'} // "";
390 my $style = $oneregistry->{'Styles'};
391 $style = "" unless defined $style;
390 $registry{'styles'} = $style;
391
392 if ( $style =~ /\bDONT_DELETE\b/ )
393 {
394 $installer::globals::dontdeletecomponents{$component_name} = 1;
395 }
396
397 # Saving upgradekey to write this into setup.ini for minor upgrades

--- 165 unchanged lines hidden --- 		392 $registry{'styles'} = $style;
393
394 if ( $style =~ /\bDONT_DELETE\b/ )
395 {
396 $installer::globals::dontdeletecomponents{$component_name} = 1;
397 }
398
399 # Saving upgradekey to write this into setup.ini for minor upgrades

--- 165 unchanged lines hidden ---