scp2/source/ooo/common_brand.scp | 37 ----------------------
solenv/bin/modules/installer.pm | 1
solenv/bin/modules/installer/scriptitems.pm | 3 -
solenv/bin/modules/installer/windows/msiglobal.pm | 28 ----------------
4 files changed, 1 insertion(+), 68 deletions(-)
New commits:
commit 9919d02c1e9be7ab2f2690ca16da65b75ebde666
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Fri Jan 12 16:46:39 2024 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Mon Jan 22 09:33:27 2024 +0100
Remove (Windows-only) ProductCode from setup.ini and version.ini
(See a31f334d36b5735ba6fc8d0f89e834a73bdcc561 "Windows MAR update issues
with
program/{setup,version}.ini" for why this cleanup is needed.)
There were traces of actually reading that entry from ini-files in commits
like
3f01a5e9e4ec757eb26cc056a161fb7832ccd5d6 "INTEGRATION: CWS nativefixer12
(1.2.2); FILE MERGED", d9d86a2d662f38aa0473211fbf3ef2241b1c9c93
"INTEGRATION:
CWS nativefixer18 (1.3.2); FILE MERGED", and
2521869690771c7af094520edf92ee8d2c5573a1 "INTEGRATION: CWS native36 (1.7.4);
FILE MERGED", but all of them have since been removed with commits like
50c26300e5b5ae9671f18a9e449516604d16105f "Remove lots of dead code",
26c142ca5f2b405b02ab5701dfaeab7bf281a727 "Kill the ancient StarOffice
"patch"
concept", and e0ea85f61a5914508921b5e73119516219afa158 "we don't build
language
packs on Windows". (And all of the original code appears to having been
related
to ancient Windows patch mechanisms.)
Change-Id: I552830faf9006bae951fc60e97804abd9de718bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161979
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 68d19628c0f3..303bf24470dd 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -500,19 +500,6 @@ End
#ifdef WNT
-ProfileItem gid_Brand_Profileitem_Version_Productcode
- ProfileID = gid_Brand_Profile_Version_Ini;
- ModuleID = gid_Module_Root_Brand;
- Section = "Version";
- Order = 8;
- Key = "ProductCode";
- Value = "<productcode>";
-End
-
-#endif
-
-#ifdef WNT
-
ProfileItem gid_Brand_Profileitem_Version_Upgradecode
ProfileID = gid_Brand_Profile_Version_Ini;
ModuleID = gid_Module_Root_Brand;
@@ -831,17 +818,6 @@ ProfileItem gid_Brand_Profileitem_Setup_Findproduct
End
#endif
-#ifdef WNT
-ProfileItem gid_Brand_Profileitem_Setup_Productcode
- ProfileID = gid_Brand_Profile_Setup_Ini;
- ModuleID = gid_Module_Root_Brand;
- Section = "Bootstrap";
- Order = 6;
- Key = "ProductCode";
- Value = "<productcode>";
-End
-#endif
-
#ifdef WNT
ProfileItem gid_Brand_Profileitem_Setup_Upgradecode
ProfileID = gid_Brand_Profile_Setup_Ini;
diff --git a/solenv/bin/modules/installer/scriptitems.pm
b/solenv/bin/modules/installer/scriptitems.pm
index 18ccd81d2c87..040bc068889f 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -625,7 +625,7 @@ sub changing_name_of_language_dependent_keys
################################################################################
# Replacement of setup variables in ConfigurationItems and ProfileItems
-# <productkey>, <buildid>, <sequence_languages>, <productcode>, <upgradecode>,
<productupdate>
+# <productkey>, <buildid>, <sequence_languages>, <upgradecode>, <productupdate>
################################################################################
sub replace_setup_variables
@@ -665,7 +665,6 @@ sub replace_setup_variables
$value =~ s/\<buildid\>/$buildidstring/;
$value =~ s/\<sequence_languages\>/$languagesstring/;
$value =~ s/\<productkey\>/$productkey/;
- $value =~ s/\<productcode\>/$installer::globals::productcode/;
$value =~ s/\<upgradecode\>/$installer::globals::upgradecode/;
$value =~ s/\<alllanguages\>/$languagesstring/;
$value =~ s/\<sourceid\>/$installer::globals::build/;
commit f9ff0df6f3a3339c891f764e5eecda9aa03612c0
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Fri Jan 12 15:00:02 2024 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Mon Jan 22 09:33:19 2024 +0100
Remove (Windows-only) MsiProductVersion from version.ini
(See a31f334d36b5735ba6fc8d0f89e834a73bdcc561 "Windows MAR update issues
with
program/{setup,version}.ini" for why this cleanup is needed.)
The ini-file entry had originally been added with
d295757e7ec2cf0f7d83cf903ecb7c115a354bb9 "INTEGRATION: CWS nativefixer11
(1.23.2); FILE MERGED", and setting its value with
b993422e59287924d7d85afc75eb9cffc66311db "INTEGRATION: CWS nativefixer11
(1.21.38); FILE MERGED" and 127dd8d32a87cecdc678d4b8288142f65a7a1fc9
"INTEGRATION: CWS nativefixer11 (1.45.2); FILE MERGED", but it doesn't
appear to
ever have been actually used for anything, other than being recorded in the
ini-file. Lets remove it completely for good.
Change-Id: I5f0372360416c2c6949ee2d5f0cc7e6babd8ba79
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161978
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 5b8b907f2a9c..68d19628c0f3 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -533,19 +533,6 @@ ProfileItem gid_Brand_Profileitem_Version_Alllanguages
Value = "<alllanguages>";
End
-#ifdef WNT
-
-ProfileItem gid_Brand_Profileitem_Version_Msiproductversion
- ProfileID = gid_Brand_Profile_Version_Ini;
- ModuleID = gid_Module_Root_Brand;
- Section = "Version";
- Order = 14;
- Key = "MsiProductVersion";
- Value = "<msiproductversion>";
-End
-
-#endif
-
ProfileItem gid_Brand_Profileitem_Version_Updateurl
ProfileID = gid_Brand_Profile_Version_Ini;
ModuleID = gid_Module_Root_Brand;
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index a22385924b92..33c0c5b6e459 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -1325,7 +1325,6 @@ sub run {
# Creating the important dynamic idt files
installer::windows::msiglobal::set_msiproductversion($allvariableshashref);
-
installer::windows::msiglobal::put_msiproductversion_into_bootstrapfile($filesinproductlanguageresolvedarrayref);
# Add cabinet assignments to files
installer::windows::file::assign_cab_to_files($filesinproductlanguageresolvedarrayref);
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 6d4282709ab9..38146abb51d2 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1417,34 +1417,6 @@ sub set_msiproductversion
}
}
-#################################################################################
-# Including the msi product version into the bootstrap.ini, Windows only
-#################################################################################
-
-sub put_msiproductversion_into_bootstrapfile
-{
- my ($filesref) = @_;
-
- for ( my $i = 0; $i <= $#{$filesref}; $i++ )
- {
- my $onefile = ${$filesref}[$i];
-
- if ( $onefile->{'gid'} eq "gid_Brand_Profile_Version_Ini" )
- {
- my $file = installer::files::read_file($onefile->{'sourcepath'});
-
- for ( my $j = 0; $j <= $#{$file}; $j++ )
- {
- ${$file}[$j] =~
s/\<msiproductversion\>/$installer::globals::msiproductversion/;
- }
-
- installer::files::save_file($onefile->{'sourcepath'}, $file);
-
- last;
- }
- }
-}
-
####################################################################################
# Updating the file Property.idt dynamically
# Content:
