[Libreoffice-commits] core.git: Branch 'feature/cib_contract57' - 3 commits - instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo solenv/bin
Thorsten Behrens
Thorsten.Behrens at CIB.de
Wed May 31 12:10:09 UTC 2017
instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt | 4 +-
instsetoo_native/inc_openoffice/windows/msi_templates/codes.txt | 4 +-
instsetoo_native/inc_sdkoo/windows/msi_templates/codes.txt | 6 +--
solenv/bin/modules/installer/windows/msiglobal.pm | 20 ++++++++--
4 files changed, 23 insertions(+), 11 deletions(-)
New commits:
commit 3ee8eab53a24e5387ee8ec90f233a986199bc824
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date: Wed May 31 14:09:25 2017 +0200
Revert "Hack: Fixed ProductCode for MSI packages"
This reverts commit 6d689ed236f105a5f4d4c37f14d0d842ad216df9.
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 9c783e78939a..11340fdb845d 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1362,9 +1362,6 @@ sub set_global_code_variables
$installer::globals::productcode = "\{" . ${$guidref}[0] . "\}";
}
- # HACK: Fixed ProductCode
- $installer::globals::productcode = "{795CAACE-4CCA-479F-8BF7-176B6E12C681}";
-
# UpgradeCode can take english as default, if not defined in specified language
$searchstring = "UPGRADECODE"; # searching in the codes.txt file
commit 55329b7f6cdb24d355a65a24669237687bc5665b
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date: Wed May 31 14:09:17 2017 +0200
Revert "Better fix: Fixed ProductCode"
This reverts commit cae9a016ef7f67e9cc0b69df5442f61749aa06d4.
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt
index 1d122c8eefdf..ed072eda09b5 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt
@@ -35,7 +35,7 @@ da = "{92CA37C8-B2E6-403F-932C-1A33E48BCD7E}"
sv = "{942C29ED-A013-436E-861C-28271FD60AAE}"
no = "{0EF3EE40-3690-472E-A693-5C9AE4FA7D5A}"
pl = "{2A7F7A26-EF8B-4990-8836-688508886215}"
-de = "{795CAACE-4CCA-479F-8BF7-176B6E12C682}"
+de = "{5014304D-99B3-4451-8EB3-97D34658E4E7}"
pt-BR = "{55837A64-5B73-4CDC-8950-AF56E09A7961}"
th = "{2EEACF3C-C38E-4043-8B4D-33A461083348}"
et = "{956362F1-C89B-4008-B15F-968BD4023F3F}"
@@ -47,7 +47,7 @@ tr = "{467D9E65-2614-4D19-B40F-0B12FE6E472F}"
hi = "{61B2E7EA-DC12-4A51-B152-2B95A4FC2ABF}"
ar = "{FF72555B-A96D-49F8-8998-9359E9F9F7E1}"
he = "{F59C6731-12DA-4A46-BE6D-30934E7CD763}"
-multiwestern = "{795CAACE-4CCA-479F-8BF7-176B6E12C682}"
+multiwestern = "{FA30E08E-DD61-4E47-B3D6-51B2814CA881}"
multiasia = "{222033CB-A588-4302-9942-311F160B63B1}"
[UPGRADECODE]
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/codes.txt b/instsetoo_native/inc_openoffice/windows/msi_templates/codes.txt
index 0aedfe37cc3a..f6c7ee1393f0 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/codes.txt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/codes.txt
@@ -35,7 +35,7 @@ da = "{16F54808-4A44-4C87-9A9B-AE038D4E1003}"
sv = "{2D4C8A15-DDBC-48D7-A37E-F095D331EDD1}"
no = "{08B1A917-7FA7-474A-952A-AC0CE00ABDDB}"
pl = "{A069E3EB-E23C-43A7-8D95-80C92971C981}"
-de = "{795CAACE-4CCA-479F-8BF7-176B6E12C681}"
+de = "{C54B62B7-32CA-4A12-90AD-425F68965DF2}"
pt-BR = "{54D3D90D-A34A-47F8-873E-6FEC914F9CDC}"
th = "{B27DED2F-51D7-4C0E-A011-F243E53814A1}"
et = "{C6C1A6A0-0112-4A6C-9EF1-25672676D909}"
@@ -48,7 +48,7 @@ tr = "{F8FB0DCF-96C0-4C03-B748-951C679FD7C6}"
hi = "{CA5E7AB5-DA2A-4F3B-8728-E97164034DD6}"
ar = "{19F11268-068A-488F-B139-848ACA080B94}"
he = "{CDF16F28-D75D-4BE8-AF81-EB85825DA252}"
-multiwestern = "{795CAACE-4CCA-479F-8BF7-176B6E12C681}"
+multiwestern = "{0DECDE88-DD1C-4E9F-8348-19C5BC6FDF26}"
multiasia = "{122A65B5-E37E-453A-924B-E52B808EDA31}"
[UPGRADECODE]
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/codes.txt b/instsetoo_native/inc_sdkoo/windows/msi_templates/codes.txt
index 92d8e360dd7c..b09efda98b99 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/codes.txt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/codes.txt
@@ -35,7 +35,7 @@ da = "{64F8DC46-2087-41B4-B82D-39D55BBC8A48}"
sv = "{9A8E6339-779C-4B0B-A3E5-B4CBBD2E271D}"
no = "{C99FCCE7-9478-4EE0-9B5E-AC46BA2874D7}"
pl = "{B5AD6AF9-16C3-4F57-8F63-DF341762CC5B}"
-de = "{795CAACE-4CCA-479F-8BF7-176B6E12C683}"
+de = "{9695B172-6236-4057-BE81-3B2002B2EABA}"
pt-BR = "{740FB449-BE5F-42C5-8982-24FE4A165992}"
th = "{3D0D7BAC-56EC-4BAB-98BC-DD3D1F276390}"
et = "{F44C6B10-CBEB-402B-A634-A809AE4E4DED}"
@@ -47,7 +47,7 @@ tr = "{3E02284B-AD3B-4716-8908-0D008D795378}"
hi = "{2455F7CF-1D9C-4FCE-A90A-A059C037A758}"
ar = "{6DBB85B9-99A1-45A4-99F2-E174D4825F14}"
he = "{3EC2568D-8AEE-4968-8B3D-075E360D3A53}"
-multiwestern = "{795CAACE-4CCA-479F-8BF7-176B6E12C683}"
+multiwestern = "{0050B5A3-CD83-4155-A72D-740BBF0D9E34}"
multiasia = "{1C121AF5-5B2C-4A87-AB4B-2AA85A6DCAE7}"
[UPGRADECODE]
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 1aabeb30df66..9c783e78939a 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1345,10 +1345,25 @@ sub set_global_code_variables
$onelanguage = ${$languagesref}[0];
}
- # ProductCode has to be specified in each language
- my $searchstring = "PRODUCTCODE";
- my $codeblock = installer::windows::idtglobal::get_language_block_from_language_file($searchstring, $codefile);
- $installer::globals::productcode = installer::windows::idtglobal::get_code_from_code_block($codeblock, $onelanguage);
+ # ProductCode must not change, if Windows patches shall be applied
+ if ( $installer::globals::updatedatabase )
+ {
+ $installer::globals::productcode = $alloldproperties->{'ProductCode'};
+ }
+ elsif ( $installer::globals::prepare_winpatch )
+ {
+ # ProductCode has to be specified in each language
+ my $searchstring = "PRODUCTCODE";
+ my $codeblock = installer::windows::idtglobal::get_language_block_from_language_file($searchstring, $codefile);
+ $installer::globals::productcode = installer::windows::idtglobal::get_code_from_code_block($codeblock, $onelanguage);
+ } else {
+ my $guidref = get_guid_list(1, 1); # only one GUID shall be generated
+ ${$guidref}[0] =~ s/\s*$//; # removing ending spaces
+ $installer::globals::productcode = "\{" . ${$guidref}[0] . "\}";
+ }
+
+ # HACK: Fixed ProductCode
+ $installer::globals::productcode = "{795CAACE-4CCA-479F-8BF7-176B6E12C681}";
# UpgradeCode can take english as default, if not defined in specified language
commit 5a62c66b7a4be8a0fc9359ccb1bb834d4faca9b2
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date: Wed May 31 14:09:02 2017 +0200
Revert "SDK should also use our fixed ProductCode"
This reverts commit 4dfb51d44a60da5513f62feba269a719c3829ed6.
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/codes.txt b/instsetoo_native/inc_sdkoo/windows/msi_templates/codes.txt
index 3b2d885455dc..92d8e360dd7c 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/codes.txt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/codes.txt
@@ -17,7 +17,7 @@
#
[PRODUCTCODE]
-en-US = "{795CAACE-4CCA-479F-8BF7-176B6E12C683}"
+en-US = "{04D01DA9-024B-4C37-A69C-F7BA76A95702}"
pt = "{F859617C-7885-49B3-827A-8C9617C622F6}"
ru = "{1D812984-FD08-415C-9967-CF228C28767C}"
el = "{71057736-397D-44E4-AE0E-39A15F4E3CDE}"
More information about the Libreoffice-commits
mailing list